summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2013-02-06 17:20:02 -0300
committerArnaldo Carvalho de Melo <acme@redhat.com>2013-02-06 18:09:28 -0300
commite35ef355ad3dd26bff79c8711f070ac69501dfa3 (patch)
tree85753af82f43029a73e5f1fd14c4c569d971f90c /tools
parent91b988048bea24eae386da3141d247ccea795a81 (diff)
downloadlinux-3.10-e35ef355ad3dd26bff79c8711f070ac69501dfa3.tar.gz
linux-3.10-e35ef355ad3dd26bff79c8711f070ac69501dfa3.tar.bz2
linux-3.10-e35ef355ad3dd26bff79c8711f070ac69501dfa3.zip
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>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/builtin-evlist.c4
-rw-r--r--tools/perf/util/evsel.c2
-rw-r--r--tools/perf/util/evsel.h1
3 files changed, 4 insertions, 3 deletions
diff --git a/tools/perf/builtin-evlist.c b/tools/perf/builtin-evlist.c
index 85a5e35dd14..05bd9dfe875 100644
--- a/tools/perf/builtin-evlist.c
+++ b/tools/perf/builtin-evlist.c
@@ -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);
}
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index a5470150460..9c82f98f26d 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -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))
diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index 8512f6a8a6e..52021c3087d 100644
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -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,