diff options
author | Feng Tang <feng.tang@intel.com> | 2012-10-29 23:56:02 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2012-10-29 09:45:34 -0400 |
commit | 70cb4e963f77dae90ae2aa3dd9385a43737c469f (patch) | |
tree | 41b94acf8d0f01e93f6c214b9ee1bdae11b41538 /tools/perf/builtin-kmem.c | |
parent | cdd059d731eeb466f51a404ee6cbfafb0fc7c20b (diff) |
perf tools: Add a global variable "const char *input_name"
Currently many perf commands annotate/evlist/report/script/lock etc all
support "-i" option to chose a specific perf data, and all of them
create a local "input_name" to save the file name for that perf data.
Since most of these commands need it, we can add a global variable for
it, also it can some other benefits:
1. When calling script browser inside hists/annotation browser, it needs
to know the perf data file name to run that script.
2. For further feature like runtime switching to another perf data file,
this variable can also help.
Signed-off-by: Feng Tang <feng.tang@intel.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1351569369-26732-2-git-send-email-feng.tang@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/builtin-kmem.c')
-rw-r--r-- | tools/perf/builtin-kmem.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c index 14bf82f63659..0b4b796167be 100644 --- a/tools/perf/builtin-kmem.c +++ b/tools/perf/builtin-kmem.c | |||
@@ -477,7 +477,7 @@ static void sort_result(void) | |||
477 | __sort_result(&root_caller_stat, &root_caller_sorted, &caller_sort); | 477 | __sort_result(&root_caller_stat, &root_caller_sorted, &caller_sort); |
478 | } | 478 | } |
479 | 479 | ||
480 | static int __cmd_kmem(const char *input_name) | 480 | static int __cmd_kmem(void) |
481 | { | 481 | { |
482 | int err = -EINVAL; | 482 | int err = -EINVAL; |
483 | struct perf_session *session; | 483 | struct perf_session *session; |
@@ -743,7 +743,6 @@ static int __cmd_record(int argc, const char **argv) | |||
743 | int cmd_kmem(int argc, const char **argv, const char *prefix __maybe_unused) | 743 | int cmd_kmem(int argc, const char **argv, const char *prefix __maybe_unused) |
744 | { | 744 | { |
745 | const char * const default_sort_order = "frag,hit,bytes"; | 745 | const char * const default_sort_order = "frag,hit,bytes"; |
746 | const char *input_name = NULL; | ||
747 | const struct option kmem_options[] = { | 746 | const struct option kmem_options[] = { |
748 | OPT_STRING('i', "input", &input_name, "file", "input file name"), | 747 | OPT_STRING('i', "input", &input_name, "file", "input file name"), |
749 | OPT_CALLBACK_NOOPT(0, "caller", NULL, NULL, | 748 | OPT_CALLBACK_NOOPT(0, "caller", NULL, NULL, |
@@ -779,7 +778,7 @@ int cmd_kmem(int argc, const char **argv, const char *prefix __maybe_unused) | |||
779 | if (list_empty(&alloc_sort)) | 778 | if (list_empty(&alloc_sort)) |
780 | setup_sorting(&alloc_sort, default_sort_order); | 779 | setup_sorting(&alloc_sort, default_sort_order); |
781 | 780 | ||
782 | return __cmd_kmem(input_name); | 781 | return __cmd_kmem(); |
783 | } else | 782 | } else |
784 | usage_with_options(kmem_usage, kmem_options); | 783 | usage_with_options(kmem_usage, kmem_options); |
785 | 784 | ||