From 39956e78010645ee9d121e6a6eb6d9892e3fc92e Mon Sep 17 00:00:00 2001 From: Jiri Olsa Date: Tue, 3 Dec 2013 14:09:39 +0100 Subject: [PATCH] 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: Namhyung Kim Signed-off-by: Jiri Olsa Cc: Corey Ashford Cc: David Ahern Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Namhyung Kim Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Steven Rostedt Link: http://lkml.kernel.org/r/1386076182-14484-26-git-send-email-jolsa@redhat.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/lib/traceevent/plugin_function.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/tools/lib/traceevent/plugin_function.c b/tools/lib/traceevent/plugin_function.c index 8deb22e69361..87acf9c77948 100644 --- a/tools/lib/traceevent/plugin_function.c +++ b/tools/lib/traceevent/plugin_function.c @@ -25,7 +25,6 @@ #include "event-utils.h" static struct func_stack { - int index; int size; char **stack; } *fstack; @@ -57,7 +56,7 @@ static void add_child(struct func_stack *stack, const char *child, int pos) 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; @@ -97,7 +96,7 @@ static int function_handler(struct trace_seq *s, struct pevent_record *record, unsigned long long pfunction; const char *func; const char *parent; - int i, index; + int index; if (pevent_get_field_val(s, event, "ip", record, &function, 1)) return trace_seq_putc(s, '!'); @@ -109,10 +108,9 @@ static int function_handler(struct trace_seq *s, struct pevent_record *record, 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, " "); + trace_seq_printf(s, "%*s", index*3, ""); if (func) trace_seq_printf(s, "%s", func); -- 2.11.0