[PATCH 19/29] tools lib traceevent: Several cleanups for function plugin

Jiri Olsa
2013-11-28T11:34:43Z

Several cleanups suggested by Namhyung:
* removing index field from struct func_stack as
it's not needed
* renaming get_index into add_and_get_index
* using '%*X' format string capability instead of
the loop

Suggested-by: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.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: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: David Ahern <dsahern@gmail.com>
---
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 8deb22e..87acf9c 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);
--
1.8.3.1