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

Commit be6d842a authored by David Ahern's avatar David Ahern Committed by Arnaldo Carvalho de Melo
Browse files

perf script: Change process_event prototype 



Prepare for handling of samples for any event type.

Acked-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
LKML-Reference: <1299734608-5223-2-git-send-email-daahern@cisco.com>
Signed-off-by: default avatarDavid Ahern <daahern@cisco.com>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent cfd748ae

tools/perf/builtin-script.c

+16 −9
Original line number Diff line number Diff line
@@ -20,6 +20,20 @@ static u64 last_timestamp; 
static u64			nr_unordered;

extern const struct option	record_options[];



static void process_event(union perf_event *event __unused,

			  struct perf_sample *sample,

			  struct perf_session *session __unused,

			  struct thread *thread)

{

	/*

	 * FIXME: better resolve from pid from the struct trace_entry

	 * field, although it should be the same than this perf

	 * event pid

	 */

	print_event(sample->cpu, sample->raw_data, sample->raw_size,

		    sample->time, thread->comm);

}



static int default_start_script(const char *script __unused,

				int argc __unused,

				const char **argv __unused)
@@ -40,7 +54,7 @@ static int default_generate_script(const char *outfile __unused) 
static struct scripting_ops default_scripting_ops = {

	.start_script		= default_start_script,

	.stop_script		= default_stop_script,

	.process_event		= print_event,

	.process_event		= process_event,

	.generate_script	= default_generate_script,

};
@@ -86,14 +100,7 @@ static int process_sample_event(union perf_event *event, 
			last_timestamp = sample->time;

			return 0;

		}

		/*

		 * FIXME: better resolve from pid from the struct trace_entry

		 * field, although it should be the same than this perf

		 * event pid

		 */

		scripting_ops->process_event(sample->cpu, sample->raw_data,

					     sample->raw_size,

					     sample->time, thread->comm);

		scripting_ops->process_event(event, sample, session, thread);

	}



	session->hists.stats.total_period += sample->period;

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

+8 −3
Original line number Diff line number Diff line
@@ -245,9 +245,10 @@ static inline struct event *find_cache_event(int type) 
	return event;

}



static void perl_process_event(int cpu, void *data,

			       int size __unused,

			       unsigned long long nsecs, char *comm)

static void perl_process_event(union perf_event *pevent __unused,

			       struct perf_sample *sample,

			       struct perf_session *session __unused,

			       struct thread *thread)

{

	struct format_field *field;

	static char handler[256];
@@ -256,6 +257,10 @@ static void perl_process_event(int cpu, void *data, 
	struct event *event;

	int type;

	int pid;

	int cpu = sample->cpu;

	void *data = sample->raw_data;

	unsigned long long nsecs = sample->time;

	char *comm = thread->comm;



	dSP;

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

+8 −3
Original line number Diff line number Diff line
@@ -204,9 +204,10 @@ static inline struct event *find_cache_event(int type) 
	return event;

}



static void python_process_event(int cpu, void *data,

				 int size __unused,

				 unsigned long long nsecs, char *comm)

static void python_process_event(union perf_event *pevent __unused,

				 struct perf_sample *sample,

				 struct perf_session *session __unused,

				 struct thread *thread)

{

	PyObject *handler, *retval, *context, *t, *obj, *dict = NULL;

	static char handler_name[256];
@@ -217,6 +218,10 @@ static void python_process_event(int cpu, void *data, 
	unsigned n = 0;

	int type;

	int pid;

	int cpu = sample->cpu;

	void *data = sample->raw_data;

	unsigned long long nsecs = sample->time;

	char *comm = thread->comm;



	t = PyTuple_New(MAX_FIELDS);

	if (!t)

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

+4 −5
Original line number Diff line number Diff line
@@ -36,11 +36,10 @@ static int stop_script_unsupported(void) 
	return 0;

}



static void process_event_unsupported(int cpu __unused,

				      void *data __unused,

				      int size __unused,

				      unsigned long long nsecs __unused,

				      char *comm __unused)

static void process_event_unsupported(union perf_event *event __unused,

				      struct perf_sample *sample __unused,

				      struct perf_session *session __unused,

				      struct thread *thread __unused)

{

}

tools/perf/util/trace-event.h

+5 −2
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 


#include <stdbool.h>

#include "parse-events.h"

#include "session.h"



#define __unused __attribute__((unused))
@@ -278,8 +279,10 @@ struct scripting_ops { 
	const char *name;

	int (*start_script) (const char *script, int argc, const char **argv);

	int (*stop_script) (void);

	void (*process_event) (int cpu, void *data, int size,

			       unsigned long long nsecs, char *comm);

	void (*process_event) (union perf_event *event,

			       struct perf_sample *sample,

			       struct perf_session *session,

			       struct thread *thread);

	int (*generate_script) (const char *outfile);

};