diff options
| author | Frederic Weisbecker <fweisbec@gmail.com> | 2012-05-22 16:30:49 +0200 | 
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2012-05-22 12:32:29 -0300 | 
| commit | 8784eb7497b928de33a715e26da2bd51d424bec1 (patch) | |
| tree | 8d3a57c649bbbf8d963b332ba5164240ee5699f3 | |
| parent | e326e7524531c5c6de4a8cf8eeed60b4a9f47637 (diff) | |
| download | olio-linux-3.10-8784eb7497b928de33a715e26da2bd51d424bec1.tar.xz olio-linux-3.10-8784eb7497b928de33a715e26da2bd51d424bec1.zip  | |
perf script: Rename struct event to struct event_format in perl engine
While migrating to the libtraceevent, the perl scripting engine
missed this structure rename.
This fixes:
     util/scripting-engines/trace-event-perl.c: In function "find_cache_event":
     util/scripting-engines/trace-event-perl.c:244: error: assignment from incompatible pointer type
     util/scripting-engines/trace-event-perl.c:248: error: dereferencing pointer to incomplete type
     util/scripting-engines/trace-event-perl.c:248: error: dereferencing pointer to incomplete type
     util/scripting-engines/trace-event-perl.c:250: error: dereferencing pointer to incomplete type
     util/scripting-engines/trace-event-perl.c: In function "perl_process_tracepoint":
     util/scripting-engines/trace-event-perl.c:286: error: dereferencing pointer to incomplete type
     util/scripting-engines/trace-event-perl.c:286: error: dereferencing pointer to incomplete type
     util/scripting-engines/trace-event-perl.c:307: error: dereferencing pointer to incomplete type
     util/scripting-engines/trace-event-perl.c: In function "perl_generate_script":
     util/scripting-engines/trace-event-perl.c:498: error: passing argument 1 of "trace_find_next_event" from incompatible pointer type
     util/scripting-engines/../trace-event.h:56: note: expected "struct event_format *" but argument is of type "struct event *"
     util/scripting-engines/trace-event-perl.c:498: error: assignment from incompatible pointer type
     util/scripting-engines/trace-event-perl.c:499: error: dereferencing pointer to incomplete type
     util/scripting-engines/trace-event-perl.c:499: error: dereferencing pointer to incomplete type
     util/scripting-engines/trace-event-perl.c:513: error: dereferencing pointer to incomplete type
     util/scripting-engines/trace-event-perl.c:532: error: dereferencing pointer to incomplete type
     util/scripting-engines/trace-event-perl.c:556: error: dereferencing pointer to incomplete type
     util/scripting-engines/trace-event-perl.c:569: error: dereferencing pointer to incomplete type
     util/scripting-engines/trace-event-perl.c:570: error: dereferencing pointer to incomplete type
     util/scripting-engines/trace-event-perl.c:579: error: dereferencing pointer to incomplete type
     util/scripting-engines/trace-event-perl.c:580: error: dereferencing pointer to incomplete type
Reported-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Frederic Weisbecker <fweisbec@redhat.com>
Cc: Frederic Weisbecker <fweisbec@redhat.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Tom Zanussi <tzanussi@gmail.com>
Link: http://lkml.kernel.org/r/1337697049-30251-2-git-send-email-fweisbec@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
| -rw-r--r-- | tools/perf/util/scripting-engines/trace-event-perl.c | 12 | 
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/perf/util/scripting-engines/trace-event-perl.c b/tools/perf/util/scripting-engines/trace-event-perl.c index d50658b7d9e..4c1b3d72a1d 100644 --- a/tools/perf/util/scripting-engines/trace-event-perl.c +++ b/tools/perf/util/scripting-engines/trace-event-perl.c @@ -56,7 +56,7 @@ INTERP my_perl;  #define FTRACE_MAX_EVENT				\  	((1 << (sizeof(unsigned short) * 8)) - 1) -struct event *events[FTRACE_MAX_EVENT]; +struct event_format *events[FTRACE_MAX_EVENT];  extern struct scripting_context *scripting_context; @@ -181,7 +181,7 @@ static void define_flag_field(const char *ev_name,  	LEAVE;  } -static void define_event_symbols(struct event *event, +static void define_event_symbols(struct event_format *event,  				 const char *ev_name,  				 struct print_arg *args)  { @@ -233,10 +233,10 @@ static void define_event_symbols(struct event *event,  		define_event_symbols(event, ev_name, args->next);  } -static inline struct event *find_cache_event(int type) +static inline struct event_format *find_cache_event(int type)  {  	static char ev_name[256]; -	struct event *event; +	struct event_format *event;  	if (events[type])  		return events[type]; @@ -262,7 +262,7 @@ static void perl_process_tracepoint(union perf_event *pevent __unused,  	static char handler[256];  	unsigned long long val;  	unsigned long s, ns; -	struct event *event; +	struct event_format *event;  	int type;  	int pid;  	int cpu = sample->cpu; @@ -450,7 +450,7 @@ static int perl_stop_script(void)  static int perl_generate_script(const char *outfile)  { -	struct event *event = NULL; +	struct event_format *event = NULL;  	struct format_field *f;  	char fname[PATH_MAX];  	int not_first, count;  |