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

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

perf script python: Removing event cache as it's no longer needed 



We don't need to maintain cache of 'struct event_format' objects.
Currently the 'struct perf_evsel' holds this reference already.

Adding events_defined bitmap to keep track of defined events, which is
much cheaper than array of pointers.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Acked-by: default avatarNamhyung Kim <namhyung@gmail.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1414363445-22370-3-git-send-email-jolsa@kernel.org


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

tools/perf/util/scripting-engines/trace-event-python.c

+6 −28
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <string.h>

#include <stdbool.h>

#include <errno.h>

#include <linux/bitmap.h>



#include "../../perf.h"

#include "../debug.h"
@@ -46,7 +47,7 @@ PyMODINIT_FUNC initperf_trace_context(void); 
#define FTRACE_MAX_EVENT				\

	((1 << (sizeof(unsigned short) * 8)) - 1)



struct event_format *events[FTRACE_MAX_EVENT];

static DECLARE_BITMAP(events_defined, FTRACE_MAX_EVENT);



#define MAX_FIELDS	64

#define N_COMMON_FIELDS	7
@@ -255,31 +256,6 @@ static void define_event_symbols(struct event_format *event, 
		define_event_symbols(event, ev_name, args->next);

}



static inline struct event_format *find_cache_event(struct perf_evsel *evsel)

{

	static char ev_name[256];

	struct event_format *event;

	int type = evsel->attr.config;



	/*

 	 * XXX: Do we really need to cache this since now we have evsel->tp_format

 	 * cached already? Need to re-read this "cache" routine that as well calls

 	 * define_event_symbols() :-\

 	 */

	if (events[type])

		return events[type];



	events[type] = event = evsel->tp_format;

	if (!event)

		return NULL;



	sprintf(ev_name, "%s__%s", event->system, event->name);



	define_event_symbols(event, ev_name, event->print_fmt.args);



	return event;

}



static PyObject *get_field_numeric_entry(struct event_format *event,

		struct format_field *field, void *data)

{
@@ -403,12 +379,12 @@ static void python_process_tracepoint(struct perf_sample *sample, 
				      struct thread *thread,

				      struct addr_location *al)

{

	struct event_format *event = evsel->tp_format;

	PyObject *handler, *context, *t, *obj, *callchain;

	PyObject *dict = NULL;

	static char handler_name[256];

	struct format_field *field;

	unsigned long s, ns;

	struct event_format *event;

	unsigned n = 0;

	int pid;

	int cpu = sample->cpu;
@@ -420,7 +396,6 @@ static void python_process_tracepoint(struct perf_sample *sample, 
	if (!t)

		Py_FatalError("couldn't create Python tuple");



	event = find_cache_event(evsel);

	if (!event)

		die("ug! no event found for type %d", (int)evsel->attr.config);
@@ -428,6 +403,9 @@ static void python_process_tracepoint(struct perf_sample *sample, 


	sprintf(handler_name, "%s__%s", event->system, event->name);



	if (!test_and_set_bit(event->id, events_defined))

		define_event_symbols(event, handler_name, event->print_fmt.args);



	handler = get_handler(handler_name);

	if (!handler) {

		dict = PyDict_New();