Messages in this thread Patch in this message | | | From | Tom Zanussi <> | Subject | [PATCH v12 19/30] tracing: Add hist trigger 'syscall' modifier | Date | Mon, 23 Nov 2015 13:51:34 -0600 |
| |
Allow users to have syscall id fields displayed as syscall names in the output by appending '.syscall' to field names:
# echo hist:keys=aaa.syscall ... \ [ if filter] > event/trigger
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Tested-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> --- kernel/trace/trace.c | 3 ++- kernel/trace/trace_events_hist.c | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 3c2beab..c42f741 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -3849,7 +3849,8 @@ static const char readme_msg[] = "\t .hex display a number as a hex value\n" "\t .sym display an address as a symbol\n" "\t .sym-offset display an address as a symbol and offset\n" - "\t .execname display a common_pid as a program name\n\n" + "\t .execname display a common_pid as a program name\n" + "\t .syscall display a syscall id as a syscall name\n\n" "\t The 'pause' parameter can be used to pause an existing hist\n" "\t trigger or to start a hist trigger but not log any events\n" "\t until told to do so. 'continue' can be used to start or\n" diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c index 4a8e97c..5e4f704 100644 --- a/kernel/trace/trace_events_hist.c +++ b/kernel/trace/trace_events_hist.c @@ -85,6 +85,7 @@ enum hist_field_flags { HIST_FIELD_SYM = 16, HIST_FIELD_SYM_OFFSET = 32, HIST_FIELD_EXECNAME = 64, + HIST_FIELD_SYSCALL = 128, }; struct hist_trigger_attrs { @@ -462,6 +463,8 @@ static int create_key_field(struct hist_trigger_data *hist_data, else if (!strcmp(field_str, "execname") && !strcmp(field_name, "common_pid")) flags |= HIST_FIELD_EXECNAME; + else if (!strcmp(field_str, "syscall")) + flags |= HIST_FIELD_SYSCALL; else { ret = -EINVAL; goto out; @@ -836,6 +839,16 @@ hist_trigger_entry_print(struct seq_file *m, uval = *(u64 *)(key + key_field->offset); seq_printf(m, "%s: %-16s[%10llu]", key_field->field->name, comm, uval); + } else if (key_field->flags & HIST_FIELD_SYSCALL) { + const char *syscall_name; + + uval = *(u64 *)(key + key_field->offset); + syscall_name = get_syscall_name(uval); + if (!syscall_name) + syscall_name = "unknown_syscall"; + + seq_printf(m, "%s: %-30s[%3llu]", + key_field->field->name, syscall_name, uval); } else if (key_field->flags & HIST_FIELD_STRING) { seq_printf(m, "%s: %-50s", key_field->field->name, (char *)(key + key_field->offset)); @@ -957,6 +970,8 @@ static const char *get_hist_field_flags(struct hist_field *hist_field) flags_str = "sym-offset"; else if (hist_field->flags & HIST_FIELD_EXECNAME) flags_str = "execname"; + else if (hist_field->flags & HIST_FIELD_SYSCALL) + flags_str = "syscall"; return flags_str; } -- 1.9.3
| |