diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2009-12-15 20:04:39 -0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-12-16 08:53:48 +0100 |
| commit | 75be6cf48738aec68aac49b428423569492cfba3 (patch) | |
| tree | d7f5ceb028361e8b725ba6f3b8219e66c7b89790 /tools/perf/builtin-probe.c | |
| parent | 7ef17aafc98406d01ebbf7fe98ef1332b70d20bb (diff) | |
perf symbols: Make symbol_conf global
This simplifies a lot of functions, less stuff to be done by
tool writers.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1260914682-29652-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/builtin-probe.c')
| -rw-r--r-- | tools/perf/builtin-probe.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c index 520b064b46d8..7e741f54d798 100644 --- a/tools/perf/builtin-probe.c +++ b/tools/perf/builtin-probe.c @@ -57,7 +57,6 @@ static struct { int nr_probe; struct probe_point probes[MAX_PROBES]; struct strlist *dellist; - struct symbol_conf conf; struct perf_session *psession; struct map *kmap; } session; @@ -151,7 +150,7 @@ static const struct option options[] = { OPT_BOOLEAN('v', "verbose", &verbose, "be more verbose (show parsed arguments, etc)"), #ifndef NO_LIBDWARF - OPT_STRING('k', "vmlinux", &session.conf.vmlinux_name, + OPT_STRING('k', "vmlinux", &symbol_conf.vmlinux_name, "file", "vmlinux pathname"), #endif OPT_BOOLEAN('l', "list", &session.list_events, @@ -224,13 +223,12 @@ int cmd_probe(int argc, const char **argv, const char *prefix __used) } /* Initialize symbol maps for vmlinux */ - session.conf.sort_by_name = true; - if (session.conf.vmlinux_name == NULL) - session.conf.try_vmlinux_path = true; - if (symbol__init(&session.conf) < 0) + symbol_conf.sort_by_name = true; + if (symbol_conf.vmlinux_name == NULL) + symbol_conf.try_vmlinux_path = true; + if (symbol__init() < 0) die("Failed to init symbol map."); - session.psession = perf_session__new(NULL, O_WRONLY, false, - &session.conf); + session.psession = perf_session__new(NULL, O_WRONLY, false); if (session.psession == NULL) die("Failed to init perf_session."); session.kmap = map_groups__find_by_name(&session.psession->kmaps, |