Commit 39956e78 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo

tools lib traceevent: Several cleanups for function plugin

Several cleanups suggested by Namhyung:

  * Remove index field from struct func_stack as it's not needed.

  * Rename get_index into add_and_get_index.

  * Use '%*X' format string capability instead of the loop
Suggested-by: default avatarNamhyung Kim <namhyung@kernel.org>
Signed-off-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1386076182-14484-26-git-send-email-jolsa@redhat.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent b32cea65
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
#include "event-utils.h" #include "event-utils.h"
static struct func_stack { static struct func_stack {
int index;
int size; int size;
char **stack; char **stack;
} *fstack; } *fstack;
...@@ -57,7 +56,7 @@ static void add_child(struct func_stack *stack, const char *child, int pos) ...@@ -57,7 +56,7 @@ static void add_child(struct func_stack *stack, const char *child, int pos)
stack->stack[pos] = strdup(child); stack->stack[pos] = strdup(child);
} }
static int get_index(const char *parent, const char *child, int cpu) static int add_and_get_index(const char *parent, const char *child, int cpu)
{ {
int i; int i;
...@@ -97,7 +96,7 @@ static int function_handler(struct trace_seq *s, struct pevent_record *record, ...@@ -97,7 +96,7 @@ static int function_handler(struct trace_seq *s, struct pevent_record *record,
unsigned long long pfunction; unsigned long long pfunction;
const char *func; const char *func;
const char *parent; const char *parent;
int i, index; int index;
if (pevent_get_field_val(s, event, "ip", record, &function, 1)) if (pevent_get_field_val(s, event, "ip", record, &function, 1))
return trace_seq_putc(s, '!'); return trace_seq_putc(s, '!');
...@@ -109,10 +108,9 @@ static int function_handler(struct trace_seq *s, struct pevent_record *record, ...@@ -109,10 +108,9 @@ static int function_handler(struct trace_seq *s, struct pevent_record *record,
parent = pevent_find_function(pevent, pfunction); parent = pevent_find_function(pevent, pfunction);
index = get_index(parent, func, record->cpu); index = add_and_get_index(parent, func, record->cpu);
for (i = 0; i < index; i++) trace_seq_printf(s, "%*s", index*3, "");
trace_seq_printf(s, " ");
if (func) if (func)
trace_seq_printf(s, "%s", func); trace_seq_printf(s, "%s", func);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment