perf report/top: Add --raw-trace option
The --raw-trace option allows disabling pretty printing by the event's print_fmt or plugin. Besides that, each dynamic sort key now can receive a 'raw' suffix separated by '/' to ask for the raw trace of a specific field. $ perf report -s comm,kmem:kmalloc.gfp_flags ... # Overhead Command gfp_flags # ........ ....... ................... # 99.89% perf GFP_NOFS|GFP_ZERO 0.06% sleep GFP_KERNEL 0.03% perf GFP_KERNEL|GFP_ZERO 0.01% perf GFP_KERNEL Now $ perf report -s comm,kmem:kmalloc.gfp_flags --raw-trace or $ perf report -s comm,kmem:kmalloc.gfp_flags/raw ... # Overhead Command gfp_flags # ........ ....... .......... # 99.89% perf 32848 0.06% sleep 208 0.03% perf 32976 0.01% perf 208 Suggested-and-Acked-by: Jiri Olsa <jolsa@redhat.com> Signed-off-by: Namhyung Kim <namhyung@kernel.org> Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Andi Kleen <andi@firstfloor.org> Cc: David Ahern <dsahern@gmail.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Wang Nan <wangnan0@huawei.com> Link: http://lkml.kernel.org/r/1450804030-29193-9-git-send-email-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
a34bb6a08d
commit
053a3989e1
@ -371,6 +371,9 @@ include::itrace.txt[]
|
|||||||
--socket-filter::
|
--socket-filter::
|
||||||
Only report the samples on the processor socket that match with this filter
|
Only report the samples on the processor socket that match with this filter
|
||||||
|
|
||||||
|
--raw-trace::
|
||||||
|
When displaying traceevent output, do not use print fmt or plugins.
|
||||||
|
|
||||||
include::callchain-overhead-calculation.txt[]
|
include::callchain-overhead-calculation.txt[]
|
||||||
|
|
||||||
SEE ALSO
|
SEE ALSO
|
||||||
|
@ -230,6 +230,9 @@ Default is to monitor all CPUS.
|
|||||||
The various filters must be specified as a comma separated list: --branch-filter any_ret,u,k
|
The various filters must be specified as a comma separated list: --branch-filter any_ret,u,k
|
||||||
Note that this feature may not be available on all processors.
|
Note that this feature may not be available on all processors.
|
||||||
|
|
||||||
|
--raw-trace::
|
||||||
|
When displaying traceevent output, do not use print fmt or plugins.
|
||||||
|
|
||||||
INTERACTIVE PROMPTING KEYS
|
INTERACTIVE PROMPTING KEYS
|
||||||
--------------------------
|
--------------------------
|
||||||
|
|
||||||
|
@ -788,6 +788,8 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused)
|
|||||||
"Show callgraph from reference event"),
|
"Show callgraph from reference event"),
|
||||||
OPT_INTEGER(0, "socket-filter", &report.socket_filter,
|
OPT_INTEGER(0, "socket-filter", &report.socket_filter,
|
||||||
"only show processor socket that match with this filter"),
|
"only show processor socket that match with this filter"),
|
||||||
|
OPT_BOOLEAN(0, "raw-trace", &symbol_conf.raw_trace,
|
||||||
|
"Show raw trace event output (do not use print fmt or plugins)"),
|
||||||
OPT_END()
|
OPT_END()
|
||||||
};
|
};
|
||||||
struct perf_data_file file = {
|
struct perf_data_file file = {
|
||||||
|
@ -1210,6 +1210,8 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)
|
|||||||
OPT_CALLBACK('j', "branch-filter", &opts->branch_stack,
|
OPT_CALLBACK('j', "branch-filter", &opts->branch_stack,
|
||||||
"branch filter mask", "branch stack filter modes",
|
"branch filter mask", "branch stack filter modes",
|
||||||
parse_branch_stack),
|
parse_branch_stack),
|
||||||
|
OPT_BOOLEAN(0, "raw-trace", &symbol_conf.raw_trace,
|
||||||
|
"Show raw trace event output (do not use print fmt or plugins)"),
|
||||||
OPT_END()
|
OPT_END()
|
||||||
};
|
};
|
||||||
const char * const top_usage[] = {
|
const char * const top_usage[] = {
|
||||||
|
@ -459,7 +459,12 @@ static char *get_trace_output(struct hist_entry *he)
|
|||||||
evsel = hists_to_evsel(he->hists);
|
evsel = hists_to_evsel(he->hists);
|
||||||
|
|
||||||
trace_seq_init(&seq);
|
trace_seq_init(&seq);
|
||||||
pevent_event_info(&seq, evsel->tp_format, &rec);
|
if (symbol_conf.raw_trace) {
|
||||||
|
pevent_print_fields(&seq, he->raw_data, he->raw_size,
|
||||||
|
evsel->tp_format);
|
||||||
|
} else {
|
||||||
|
pevent_event_info(&seq, evsel->tp_format, &rec);
|
||||||
|
}
|
||||||
return seq.buffer;
|
return seq.buffer;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1596,6 +1601,7 @@ struct hpp_dynamic_entry {
|
|||||||
struct perf_evsel *evsel;
|
struct perf_evsel *evsel;
|
||||||
struct format_field *field;
|
struct format_field *field;
|
||||||
unsigned dynamic_len;
|
unsigned dynamic_len;
|
||||||
|
bool raw_trace;
|
||||||
};
|
};
|
||||||
|
|
||||||
static int hde_width(struct hpp_dynamic_entry *hde)
|
static int hde_width(struct hpp_dynamic_entry *hde)
|
||||||
@ -1628,6 +1634,9 @@ static void update_dynamic_len(struct hpp_dynamic_entry *hde,
|
|||||||
size_t namelen;
|
size_t namelen;
|
||||||
bool last = false;
|
bool last = false;
|
||||||
|
|
||||||
|
if (hde->raw_trace)
|
||||||
|
return;
|
||||||
|
|
||||||
/* parse pretty print result and update max length */
|
/* parse pretty print result and update max length */
|
||||||
if (!he->trace_output)
|
if (!he->trace_output)
|
||||||
he->trace_output = get_trace_output(he);
|
he->trace_output = get_trace_output(he);
|
||||||
@ -1708,8 +1717,10 @@ static int __sort__hde_entry(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp,
|
|||||||
if (hists_to_evsel(he->hists) != hde->evsel)
|
if (hists_to_evsel(he->hists) != hde->evsel)
|
||||||
return scnprintf(hpp->buf, hpp->size, "%*.*s", len, len, "N/A");
|
return scnprintf(hpp->buf, hpp->size, "%*.*s", len, len, "N/A");
|
||||||
|
|
||||||
field = hde->field;
|
if (hde->raw_trace)
|
||||||
|
goto raw_field;
|
||||||
|
|
||||||
|
field = hde->field;
|
||||||
namelen = strlen(field->name);
|
namelen = strlen(field->name);
|
||||||
str = he->trace_output;
|
str = he->trace_output;
|
||||||
|
|
||||||
@ -1738,6 +1749,7 @@ static int __sort__hde_entry(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp,
|
|||||||
|
|
||||||
if (str == NULL) {
|
if (str == NULL) {
|
||||||
struct trace_seq seq;
|
struct trace_seq seq;
|
||||||
|
raw_field:
|
||||||
trace_seq_init(&seq);
|
trace_seq_init(&seq);
|
||||||
pevent_print_field(&seq, he->raw_data, hde->field);
|
pevent_print_field(&seq, he->raw_data, hde->field);
|
||||||
str = seq.buffer;
|
str = seq.buffer;
|
||||||
@ -1818,10 +1830,11 @@ __alloc_dynamic_entry(struct perf_evsel *evsel, struct format_field *field)
|
|||||||
|
|
||||||
static int add_dynamic_entry(struct perf_evlist *evlist, const char *tok)
|
static int add_dynamic_entry(struct perf_evlist *evlist, const char *tok)
|
||||||
{
|
{
|
||||||
char *str, *event_name, *field_name;
|
char *str, *event_name, *field_name, *raw_opt;
|
||||||
struct perf_evsel *evsel, *pos;
|
struct perf_evsel *evsel, *pos;
|
||||||
struct format_field *field;
|
struct format_field *field;
|
||||||
struct hpp_dynamic_entry *hde;
|
struct hpp_dynamic_entry *hde;
|
||||||
|
bool raw_trace = symbol_conf.raw_trace;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
if (evlist == NULL)
|
if (evlist == NULL)
|
||||||
@ -1839,6 +1852,18 @@ static int add_dynamic_entry(struct perf_evlist *evlist, const char *tok)
|
|||||||
}
|
}
|
||||||
*field_name++ = '\0';
|
*field_name++ = '\0';
|
||||||
|
|
||||||
|
raw_opt = strchr(field_name, '/');
|
||||||
|
if (raw_opt) {
|
||||||
|
*raw_opt++ = '\0';
|
||||||
|
|
||||||
|
if (strcmp(raw_opt, "raw")) {
|
||||||
|
pr_err("Unsupported field option %s\n", raw_opt);
|
||||||
|
ret = -EINVAL;
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
raw_trace = true;
|
||||||
|
}
|
||||||
|
|
||||||
evsel = NULL;
|
evsel = NULL;
|
||||||
evlist__for_each(evlist, pos) {
|
evlist__for_each(evlist, pos) {
|
||||||
if (!strcmp(pos->name, event_name)) {
|
if (!strcmp(pos->name, event_name)) {
|
||||||
@ -1872,6 +1897,7 @@ static int add_dynamic_entry(struct perf_evlist *evlist, const char *tok)
|
|||||||
ret = -ENOMEM;
|
ret = -ENOMEM;
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
hde->raw_trace = raw_trace;
|
||||||
|
|
||||||
perf_hpp__register_sort_field(&hde->hpp);
|
perf_hpp__register_sort_field(&hde->hpp);
|
||||||
|
|
||||||
|
@ -109,7 +109,8 @@ struct symbol_conf {
|
|||||||
branch_callstack,
|
branch_callstack,
|
||||||
has_filter,
|
has_filter,
|
||||||
show_ref_callgraph,
|
show_ref_callgraph,
|
||||||
hide_unresolved;
|
hide_unresolved,
|
||||||
|
raw_trace;
|
||||||
const char *vmlinux_name,
|
const char *vmlinux_name,
|
||||||
*kallsyms_name,
|
*kallsyms_name,
|
||||||
*source_prefix,
|
*source_prefix,
|
||||||
|
Loading…
Reference in New Issue
Block a user