diff options
-rw-r--r-- | tools/perf/builtin-diff.c | 2 | ||||
-rw-r--r-- | tools/perf/builtin-report.c | 2 | ||||
-rw-r--r-- | tools/perf/util/session.c | 2 | ||||
-rw-r--r-- | tools/perf/util/session.h | 1 | ||||
-rw-r--r-- | tools/perf/util/symbol.h | 3 |
5 files changed, 5 insertions, 5 deletions
diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c index bd71b8ceafb7..e164b3d45cd4 100644 --- a/tools/perf/builtin-diff.c +++ b/tools/perf/builtin-diff.c | |||
@@ -204,7 +204,7 @@ static const struct option options[] = { | |||
204 | OPT_BOOLEAN('f', "force", &force, "don't complain, do it"), | 204 | OPT_BOOLEAN('f', "force", &force, "don't complain, do it"), |
205 | OPT_BOOLEAN('m', "modules", &symbol_conf.use_modules, | 205 | OPT_BOOLEAN('m', "modules", &symbol_conf.use_modules, |
206 | "load module symbols - WARNING: use only with -k and LIVE kernel"), | 206 | "load module symbols - WARNING: use only with -k and LIVE kernel"), |
207 | OPT_BOOLEAN('P', "full-paths", &event_ops.full_paths, | 207 | OPT_BOOLEAN('P', "full-paths", &symbol_conf.full_paths, |
208 | "Don't shorten the pathnames taking into account the cwd"), | 208 | "Don't shorten the pathnames taking into account the cwd"), |
209 | OPT_STRING('d', "dsos", &symbol_conf.dso_list_str, "dso[,dso...]", | 209 | OPT_STRING('d', "dsos", &symbol_conf.dso_list_str, "dso[,dso...]", |
210 | "only consider symbols in these dsos"), | 210 | "only consider symbols in these dsos"), |
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index 08259184cedb..f695084910c0 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c | |||
@@ -321,7 +321,7 @@ static const struct option options[] = { | |||
321 | "pretty printing style key: normal raw"), | 321 | "pretty printing style key: normal raw"), |
322 | OPT_STRING('s', "sort", &sort_order, "key[,key2...]", | 322 | OPT_STRING('s', "sort", &sort_order, "key[,key2...]", |
323 | "sort by key(s): pid, comm, dso, symbol, parent"), | 323 | "sort by key(s): pid, comm, dso, symbol, parent"), |
324 | OPT_BOOLEAN('P', "full-paths", &event_ops.full_paths, | 324 | OPT_BOOLEAN('P', "full-paths", &symbol_conf.full_paths, |
325 | "Don't shorten the pathnames taking into account the cwd"), | 325 | "Don't shorten the pathnames taking into account the cwd"), |
326 | OPT_STRING('p', "parent", &parent_pattern, "regex", | 326 | OPT_STRING('p', "parent", &parent_pattern, "regex", |
327 | "regex filter to identify parent, see: '--sort parent'"), | 327 | "regex filter to identify parent, see: '--sort parent'"), |
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 4ca427f73994..4f2eeb584da8 100644 --- 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, | |||
306 | 306 | ||
307 | head = self->header.data_offset; | 307 | head = self->header.data_offset; |
308 | 308 | ||
309 | if (!ops->full_paths) { | 309 | if (!symbol_conf.full_paths) { |
310 | char bf[PATH_MAX]; | 310 | char bf[PATH_MAX]; |
311 | 311 | ||
312 | if (getcwd(bf, sizeof(bf)) == NULL) { | 312 | if (getcwd(bf, sizeof(bf)) == NULL) { |
diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h index 585937b6f9ee..2ff77fea06ef 100644 --- a/tools/perf/util/session.h +++ b/tools/perf/util/session.h | |||
@@ -41,7 +41,6 @@ struct perf_event_ops { | |||
41 | event_op process_read_event; | 41 | event_op process_read_event; |
42 | event_op process_throttle_event; | 42 | event_op process_throttle_event; |
43 | event_op process_unthrottle_event; | 43 | event_op process_unthrottle_event; |
44 | bool full_paths; | ||
45 | }; | 44 | }; |
46 | 45 | ||
47 | struct perf_session *perf_session__new(const char *filename, int mode, bool force); | 46 | 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 8aded2356f79..9eabd60f819d 100644 --- a/tools/perf/util/symbol.h +++ b/tools/perf/util/symbol.h | |||
@@ -58,7 +58,8 @@ struct symbol_conf { | |||
58 | sort_by_name, | 58 | sort_by_name, |
59 | show_nr_samples, | 59 | show_nr_samples, |
60 | use_callchain, | 60 | use_callchain, |
61 | exclude_other; | 61 | exclude_other, |
62 | full_paths; | ||
62 | const char *vmlinux_name, | 63 | const char *vmlinux_name, |
63 | *field_sep; | 64 | *field_sep; |
64 | char *dso_list_str, | 65 | char *dso_list_str, |