perf annotate stdio: Use annotation_options consistently
Accross all the routines, this way we can have eventually have a consistent set of defaults for all UIs. Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: David Ahern <dsahern@gmail.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Wang Nan <wangnan0@huawei.com> Link: https://lkml.kernel.org/n/tip-6qgtixurjgdk5u0n3rw78ges@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
@@ -243,10 +243,9 @@ static void perf_top__show_details(struct perf_top *top)
|
||||
goto out_unlock;
|
||||
|
||||
printf("Showing %s for %s\n", perf_evsel__name(top->sym_evsel), symbol->name);
|
||||
printf(" Events Pcnt (>=%d%%)\n", top->sym_pcnt_filter);
|
||||
printf(" Events Pcnt (>=%d%%)\n", top->annotation_opts.min_pcnt);
|
||||
|
||||
more = symbol__annotate_printf(symbol, he->ms.map, top->sym_evsel,
|
||||
0, top->sym_pcnt_filter, top->print_entries, 4);
|
||||
more = symbol__annotate_printf(symbol, he->ms.map, top->sym_evsel, &top->annotation_opts);
|
||||
|
||||
if (top->evlist->enabled) {
|
||||
if (top->zero)
|
||||
@@ -406,7 +405,7 @@ static void perf_top__print_mapped_keys(struct perf_top *top)
|
||||
|
||||
fprintf(stdout, "\t[f] profile display filter (count). \t(%d)\n", top->count_filter);
|
||||
|
||||
fprintf(stdout, "\t[F] annotate display filter (percent). \t(%d%%)\n", top->sym_pcnt_filter);
|
||||
fprintf(stdout, "\t[F] annotate display filter (percent). \t(%d%%)\n", top->annotation_opts.min_pcnt);
|
||||
fprintf(stdout, "\t[s] annotate symbol. \t(%s)\n", name?: "NULL");
|
||||
fprintf(stdout, "\t[S] stop annotation.\n");
|
||||
|
||||
@@ -509,7 +508,7 @@ static bool perf_top__handle_keypress(struct perf_top *top, int c)
|
||||
prompt_integer(&top->count_filter, "Enter display event count filter");
|
||||
break;
|
||||
case 'F':
|
||||
prompt_percent(&top->sym_pcnt_filter,
|
||||
prompt_percent(&top->annotation_opts.min_pcnt,
|
||||
"Enter details display event filter (percent)");
|
||||
break;
|
||||
case 'K':
|
||||
@@ -1259,7 +1258,7 @@ int cmd_top(int argc, const char **argv)
|
||||
.overwrite = 1,
|
||||
},
|
||||
.max_stack = sysctl__max_stack(),
|
||||
.sym_pcnt_filter = 5,
|
||||
.annotation_opts = annotation__default_options,
|
||||
.nr_threads_synthesize = UINT_MAX,
|
||||
};
|
||||
struct record_opts *opts = &top.record_opts;
|
||||
@@ -1385,6 +1384,9 @@ int cmd_top(int argc, const char **argv)
|
||||
if (status < 0)
|
||||
return status;
|
||||
|
||||
top.annotation_opts.min_pcnt = 5;
|
||||
top.annotation_opts.context = 4;
|
||||
|
||||
top.evlist = perf_evlist__new();
|
||||
if (top.evlist == NULL)
|
||||
return -ENOMEM;
|
||||
|
Reference in New Issue
Block a user