perf session: Move full_paths config to symbol_conf

Now perf_event_ops has just that, event handlers.

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: <1261957026-15580-8-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c
index bd71b8ceafb78d0c0e6f05e2daa266b2d4758d88..e164b3d45cd4f6d42ab15fd28740eb96af0bc6d1 100644 (file)
--- a/tools/perf/builtin-diff.c
+++ b/tools/perf/builtin-diff.c
@@ -204,7 +204,7 @@ static const struct option options[] = {
        OPT_BOOLEAN('f', "force", &force, "don't complain, do it"),
        OPT_BOOLEAN('m', "modules", &symbol_conf.use_modules,
                    "load module symbols - WARNING: use only with -k and LIVE kernel"),
-       OPT_BOOLEAN('P', "full-paths", &event_ops.full_paths,
+       OPT_BOOLEAN('P', "full-paths", &symbol_conf.full_paths,
                    "Don't shorten the pathnames taking into account the cwd"),
        OPT_STRING('d', "dsos", &symbol_conf.dso_list_str, "dso[,dso...]",
                   "only consider symbols in these dsos"),

diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 08259184cedb4b12d6092b27e652ae05ab27d015..f695084910c03535bf6a203bd239ecc43789c03a 100644 (file)
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -321,7 +321,7 @@ static const struct option options[] = {
                   "pretty printing style key: normal raw"),
        OPT_STRING('s', "sort", &sort_order, "key[,key2...]",
                   "sort by key(s): pid, comm, dso, symbol, parent"),
-       OPT_BOOLEAN('P', "full-paths", &event_ops.full_paths,
+       OPT_BOOLEAN('P', "full-paths", &symbol_conf.full_paths,
                    "Don't shorten the pathnames taking into account the cwd"),
        OPT_STRING('p', "parent", &parent_pattern, "regex",
                   "regex filter to identify parent, see: '--sort parent'"),

diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 4ca427f73994ee7f57b2d540d88015775ca705f6..4f2eeb584da87ea6dd95bb3a3b2c686d110778a4 100644 (file)
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -306,7 +306,7 @@ int perf_session__process_events(struct perf_session *self,
 
        head = self->header.data_offset;
 
-       if (!ops->full_paths) {
+       if (!symbol_conf.full_paths) {
                char bf[PATH_MAX];
 
                if (getcwd(bf, sizeof(bf)) == NULL) {

diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h
index 585937b6f9ee3b0a946d213eac5165ea22a1016f..2ff77fea06efeb8babf1011988744b67be1ca3fa 100644 (file)
--- a/tools/perf/util/session.h
+++ b/tools/perf/util/session.h
@@ -41,7 +41,6 @@ struct perf_event_ops {
        event_op        process_read_event;
        event_op        process_throttle_event;
        event_op        process_unthrottle_event;
-       bool            full_paths;
 };
 
 struct perf_session *perf_session__new(const char *filename, int mode, bool force);

diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h
index 8aded2356f7961458b8a3d18635a0ca4c66d2ae2..9eabd60f819d0150830c35efda3339fcc4bf1c14 100644 (file)
--- a/tools/perf/util/symbol.h
+++ b/tools/perf/util/symbol.h
@@ -58,7 +58,8 @@ struct symbol_conf {
                        sort_by_name,
                        show_nr_samples,
                        use_callchain,
-                       exclude_other;
+                       exclude_other,
+                       full_paths;
        const char      *vmlinux_name,
                        *field_sep;
        char            *dso_list_str,