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

Commit e35ef355 authored Feb 06, 2013 by Arnaldo Carvalho de Melo

perf evlist: Pass the event_group info via perf_attr_details

So that we avoid dragging symbol.o into the python binding.

Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-izjubje7ltd1srji5wb0ygwi@git.kernel.org


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 91b98804

tools/perf/builtin-evlist.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ int cmd_evlist(int argc, const char *argv, const char prefix __maybe_unused)
		OPT_BOOLEAN('F', "freq", &details.freq, "Show the sample frequency"),
		OPT_BOOLEAN('v', "verbose", &details.verbose,
		"Show all event attr details"),
		OPT_BOOLEAN('g', "group", &symbol_conf.event_group,
		OPT_BOOLEAN('g', "group", &details.event_group,
		"Show event group information"),
		OPT_END()
		};
		@@ -52,7 +52,7 @@ int cmd_evlist(int argc, const char *argv, const char prefix __maybe_unused)
		if (argc)
		usage_with_options(evlist_usage, options);

		if (symbol_conf.event_group && (details.verbose \|\| details.freq)) {
		if (details.event_group && (details.verbose \|\| details.freq)) {
		pr_err("--group option is not compatible with other options\n");
		usage_with_options(evlist_usage, options);
		}

tools/perf/util/evsel.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1391,7 +1391,7 @@ int perf_evsel__fprintf(struct perf_evsel *evsel,
		bool first = true;
		int printed = 0;

		if (symbol_conf.event_group) {
		if (details->event_group) {
		struct perf_evsel *pos;

		if (!perf_evsel__is_group_leader(evsel))

tools/perf/util/evsel.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -254,6 +254,7 @@ static inline bool perf_evsel__is_group_leader(const struct perf_evsel *evsel)
		struct perf_attr_details {
		bool freq;
		bool verbose;
		bool event_group;
		};

		int perf_evsel__fprintf(struct perf_evsel *evsel,