Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent b32cea65

tools/lib/traceevent/plugin_function.c

+4 −6
Original line number Diff line number Diff line
@@ -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);