Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bfd8f72c authored by Andi Kleen's avatar Andi Kleen Committed by Arnaldo Carvalho de Melo
Browse files

perf record: Synthesize unit/scale/... in event update 



Move the code to synthesize event updates for scale/unit/cpus to a
common utility file, and use it both from stat and record.

This allows to access scale and other extra qualifiers from perf script.

Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Link: http://lkml.kernel.org/r/20171117214300.32746-2-andi@firstfloor.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 4ca69ca9

tools/perf/builtin-record.c

+9 −0
Original line number Diff line number Diff line
@@ -372,6 +372,8 @@ static int record__open(struct record *rec) 
			ui__error("%s\n", msg);

			goto out;

		}



		pos->supported = true;

	}



	if (perf_evlist__apply_filters(evlist, &pos)) {
@@ -784,6 +786,13 @@ static int record__synthesize(struct record *rec, bool tail) 
					 perf_event__synthesize_guest_os, tool);

	}



	err = perf_event__synthesize_extra_attr(&rec->tool,

						rec->evlist,

						process_synthesized_event,

						data->is_pipe);

	if (err)

		goto out;



	err = __machine__synthesize_threads(machine, tool, &opts->target, rec->evlist->threads,

					    process_synthesized_event, opts->sample_address,

					    opts->proc_map_timeout, 1);

tools/perf/builtin-stat.c

+4 −58
Original line number Diff line number Diff line
@@ -458,19 +458,8 @@ static void workload_exec_failed_signal(int signo __maybe_unused, siginfo_t *inf 
	workload_exec_errno = info->si_value.sival_int;

}



static bool has_unit(struct perf_evsel *counter)

{

	return counter->unit && *counter->unit;

}



static bool has_scale(struct perf_evsel *counter)

{

	return counter->scale != 1;

}



static int perf_stat_synthesize_config(bool is_pipe)

{

	struct perf_evsel *counter;

	int err;



	if (is_pipe) {
@@ -482,53 +471,10 @@ static int perf_stat_synthesize_config(bool is_pipe) 
		}

	}



	/*

	 * Synthesize other events stuff not carried within

	 * attr event - unit, scale, name

	 */

	evlist__for_each_entry(evsel_list, counter) {

		if (!counter->supported)

			continue;



		/*

		 * Synthesize unit and scale only if it's defined.

		 */

		if (has_unit(counter)) {

			err = perf_event__synthesize_event_update_unit(NULL, counter, process_synthesized_event);

			if (err < 0) {

				pr_err("Couldn't synthesize evsel unit.\n");

				return err;

			}

		}



		if (has_scale(counter)) {

			err = perf_event__synthesize_event_update_scale(NULL, counter, process_synthesized_event);

			if (err < 0) {

				pr_err("Couldn't synthesize evsel scale.\n");

				return err;

			}

		}



		if (counter->own_cpus) {

			err = perf_event__synthesize_event_update_cpus(NULL, counter, process_synthesized_event);

			if (err < 0) {

				pr_err("Couldn't synthesize evsel scale.\n");

				return err;

			}

		}



		/*

		 * Name is needed only for pipe output,

		 * perf.data carries event names.

		 */

		if (is_pipe) {

			err = perf_event__synthesize_event_update_name(NULL, counter, process_synthesized_event);

			if (err < 0) {

				pr_err("Couldn't synthesize evsel name.\n");

				return err;

			}

		}

	}

	err = perf_event__synthesize_extra_attr(NULL,

						evsel_list,

						process_synthesized_event,

						is_pipe);



	err = perf_event__synthesize_thread_map2(NULL, evsel_list->threads,

						process_synthesized_event,

tools/perf/util/header.c

+68 −0
Original line number Diff line number Diff line
@@ -3258,6 +3258,74 @@ int perf_event__synthesize_attrs(struct perf_tool *tool, 
	return err;

}



static bool has_unit(struct perf_evsel *counter)

{

	return counter->unit && *counter->unit;

}



static bool has_scale(struct perf_evsel *counter)

{

	return counter->scale != 1;

}



int perf_event__synthesize_extra_attr(struct perf_tool *tool,

				      struct perf_evlist *evsel_list,

				      perf_event__handler_t process,

				      bool is_pipe)

{

	struct perf_evsel *counter;

	int err;



	/*

	 * Synthesize other events stuff not carried within

	 * attr event - unit, scale, name

	 */

	evlist__for_each_entry(evsel_list, counter) {

		if (!counter->supported)

			continue;



		/*

		 * Synthesize unit and scale only if it's defined.

		 */

		if (has_unit(counter)) {

			err = perf_event__synthesize_event_update_unit(tool, counter, process);

			if (err < 0) {

				pr_err("Couldn't synthesize evsel unit.\n");

				return err;

			}

		}



		if (has_scale(counter)) {

			err = perf_event__synthesize_event_update_scale(tool, counter, process);

			if (err < 0) {

				pr_err("Couldn't synthesize evsel counter.\n");

				return err;

			}

		}



		if (counter->own_cpus) {

			err = perf_event__synthesize_event_update_cpus(tool, counter, process);

			if (err < 0) {

				pr_err("Couldn't synthesize evsel cpus.\n");

				return err;

			}

		}



		/*

		 * Name is needed only for pipe output,

		 * perf.data carries event names.

		 */

		if (is_pipe) {

			err = perf_event__synthesize_event_update_name(tool, counter, process);

			if (err < 0) {

				pr_err("Couldn't synthesize evsel name.\n");

				return err;

			}

		}

	}

	return 0;

}



int perf_event__process_attr(struct perf_tool *tool __maybe_unused,

			     union perf_event *event,

			     struct perf_evlist **pevlist)

tools/perf/util/header.h

+5 −0
Original line number Diff line number Diff line
@@ -107,6 +107,11 @@ int perf_event__synthesize_features(struct perf_tool *tool, 
				    struct perf_evlist *evlist,

				    perf_event__handler_t process);



int perf_event__synthesize_extra_attr(struct perf_tool *tool,

				      struct perf_evlist *evsel_list,

				      perf_event__handler_t process,

				      bool is_pipe);



int perf_event__process_feature(struct perf_tool *tool,

				union perf_event *event,

				struct perf_session *session);