tools/lib/traceevent, tools/perf: Rename struct tep_event_format to struct tep_event
PATCH 2/3 tools/lib/traceevent, tools/perf: Rename struct tep_event_format to struct tep_event
In order to make libtraceevent into a proper library, variables, data structures and functions require a unique prefix to prevent name space conflicts. This renames struct tep_event_format to struct tep_event, which describes more closely the purpose of the struct.
Signed-off-by Tzvetomir Stoyanov <[email protected]>
--- tools/lib/traceevent/event-parse-api.c | 2 +- tools/lib/traceevent/event-parse-local.h | 6 +- tools/lib/traceevent/event-parse.c | 188 +++++++++--------- tools/lib/traceevent/event-parse.h | 62 +++--- tools/lib/traceevent/parse-filter.c | 42 ++-- tools/lib/traceevent/plugin_function.c | 2 +- tools/lib/traceevent/plugin_hrtimer.c | 4 +- tools/lib/traceevent/plugin_kmem.c | 2 +- tools/lib/traceevent/plugin_kvm.c | 14 +- tools/lib/traceevent/plugin_mac80211.c | 4 +- tools/lib/traceevent/plugin_sched_switch.c | 4 +- tools/perf/builtin-trace.c | 2 +- tools/perf/util/evsel.h | 4 +- tools/perf/util/header.c | 2 +- tools/perf/util/python.c | 4 +- .../util/scripting-engines/trace-event-perl.c | 6 +- .../scripting-engines/trace-event-python.c | 8 +- tools/perf/util/trace-event-parse.c | 16 +- tools/perf/util/trace-event.c | 8 +- tools/perf/util/trace-event.h | 16 +- 20 files changed, 198 insertions(+), 198 deletions(-)
tools/lib/traceevent/event-parse-api.c +1 -1
@@ -15,7 +15,7 @@* This returns pointer to the first element of the events array * If @pevent is NULL, NULL is returned. */ -struct tep_event_format *tep_get_first_event (struct tep_handle *tep) +struct tep_event *tep_get_first_event (struct tep_handle *tep) {if (tep && tep->events)return tep->events[0 ];
tools/lib/traceevent/event-parse-local.h +3 -3
@@ -50,9 +50,9 @@ struct tep_handle {unsigned int printk_count; -struct tep_event_format **events; +struct tep_event **events;int nr_events; -struct tep_event_format **sort_events; +struct tep_event **sort_events;enum tep_event_sort_type last_type;int type_offset;
@@ -84,7 +84,7 @@ struct tep_handle {struct tep_function_handler *func_handlers;/* cache */ -struct tep_event_format *last_event; +struct tep_event *last_event;char *trace_clock; };
tools/lib/traceevent/event-parse.c +94 -94
664 lines not on this page · raw message
tools/lib/traceevent/event-parse.h +31 -31
152 lines not on this page · raw message
tools/lib/traceevent/parse-filter.c +21 -21
162 lines not on this page · raw message
tools/lib/traceevent/plugin_function.c +1 -1
@@ -124,7 +124,7 @@ static int add_and_get_index(const char *parent, const char *child, int cpu) }static int function_handler (struct trace_seq *s,struct tep_record *record, -struct tep_event_format *event,void *context) +struct tep_event *event,void *context) {struct tep_handle *pevent = event->pevent;unsigned long long function;
tools/lib/traceevent/plugin_hrtimer.c +2 -2
@@ -27,7 +27,7 @@static int timer_expire_handler (struct trace_seq *s,struct tep_record *record, -struct tep_event_format *event,void *context) +struct tep_event *event,void *context) {trace_seq_printf (s,"hrtimer=" );
@@ -47,7 +47,7 @@ static int timer_expire_handler(struct trace_seq *s,static int timer_start_handler (struct trace_seq *s,struct tep_record *record, -struct tep_event_format *event,void *context) +struct tep_event *event,void *context) {trace_seq_printf (s,"hrtimer=" );
tools/lib/traceevent/plugin_kmem.c +1 -1
@@ -25,7 +25,7 @@#include "trace-seq.h" static int call_site_handler (struct trace_seq *s,struct tep_record *record, -struct tep_event_format *event,void *context) +struct tep_event *event,void *context) {struct tep_format_field *field;unsigned long long val, addr;
tools/lib/traceevent/plugin_kvm.c +7 -7
@@ -249,7 +249,7 @@ static const char *find_exit_reason(unsigned isa, int val) }static int print_exit_reason (struct trace_seq *s,struct tep_record *record, -struct tep_event_format *event,const char *field) +struct tep_event *event,const char *field) {unsigned long long isa;unsigned long long val;
@@ -270,7 +270,7 @@ static int print_exit_reason(struct trace_seq *s, struct tep_record *record, }static int kvm_exit_handler (struct trace_seq *s,struct tep_record *record, -struct tep_event_format *event,void *context) +struct tep_event *event,void *context) {unsigned long long info1 =0 , info2 =0 ;
@@ -293,7 +293,7 @@ static int kvm_exit_handler(struct trace_seq *s, struct tep_record *record,static int kvm_emulate_insn_handler (struct trace_seq *s,struct tep_record *record, -struct tep_event_format *event,void *context) +struct tep_event *event,void *context) {unsigned long long rip, csbase, len, flags, failed;int llen;
@@ -332,7 +332,7 @@ static int kvm_emulate_insn_handler(struct trace_seq *s,static int kvm_nested_vmexit_inject_handler (struct trace_seq *s,struct tep_record *record, -struct tep_event_format *event,void *context) +struct tep_event *event,void *context) {if (print_exit_reason (s, record, event,"exit_code" ) <0 )return -1 ;
@@ -346,7 +346,7 @@ static int kvm_nested_vmexit_inject_handler(struct trace_seq *s, struct tep_reco }static int kvm_nested_vmexit_handler (struct trace_seq *s,struct tep_record *record, -struct tep_event_format *event,void *context) +struct tep_event *event,void *context) {tep_print_num_field (s,"rip %llx " , event,"rip" , record,1 );
@@ -372,7 +372,7 @@ union kvm_mmu_page_role { };static int kvm_mmu_print_role (struct trace_seq *s,struct tep_record *record, -struct tep_event_format *event,void *context) +struct tep_event *event,void *context) {unsigned long long val;static const char *access_str[] = {
@@ -419,7 +419,7 @@ static int kvm_mmu_print_role(struct trace_seq *s, struct tep_record *record,static int kvm_mmu_get_page_handler (struct trace_seq *s,struct tep_record *record, -struct tep_event_format *event,void *context) +struct tep_event *event,void *context) {unsigned long long val;
tools/lib/traceevent/plugin_mac80211.c +2 -2
@@ -26,7 +26,7 @@#define INDENT 65 -static void print_string (struct trace_seq *s,struct tep_event_format *event, +static void print_string (struct trace_seq *s,struct tep_event *event,const char *name,const void *data) {struct tep_format_field *f =tep_find_field (event, name);
@@ -60,7 +60,7 @@ static void print_string(struct trace_seq *s, struct tep_event_format *event,static int drv_bss_info_changed (struct trace_seq *s,struct tep_record *record, -struct tep_event_format *event,void *context) +struct tep_event *event,void *context) {void *data = record->data;
tools/lib/traceevent/plugin_sched_switch.c +2 -2
@@ -67,7 +67,7 @@ static void write_and_save_comm(struct tep_format_field *field,static int sched_wakeup_handler (struct trace_seq *s,struct tep_record *record, -struct tep_event_format *event,void *context) +struct tep_event *event,void *context) {struct tep_format_field *field;unsigned long long val;
@@ -96,7 +96,7 @@ static int sched_wakeup_handler(struct trace_seq *s,static int sched_switch_handler (struct trace_seq *s,struct tep_record *record, -struct tep_event_format *event,void *context) +struct tep_event *event,void *context) {struct tep_format_field *field;unsigned long long val;
tools/perf/builtin-trace.c +1 -1
@@ -804,7 +804,7 @@ static struct syscall_fmt *syscall_fmt__find(const char *name) }struct syscall { -struct tep_event_format *tp_format; +struct tep_event *tp_format;int nr_args;struct tep_format_field *args;const char *name;
tools/perf/util/evsel.h +2 -2
@@ -102,7 +102,7 @@ struct perf_evsel {char *name;double scale;const char *unit; -struct tep_event_format *tp_format; +struct tep_event *tp_format;off_t id_offset;struct perf_stat_evsel *stats;void *priv;
@@ -211,7 +211,7 @@ static inline struct perf_evsel *perf_evsel__newtp(const char *sys, const char *struct perf_evsel *perf_evsel__new_cycles (bool precise); -struct tep_event_format *event_format__new (const char *sys,const char *name); +struct tep_event *event_format__new (const char *sys,const char *name);void perf_evsel__init (struct perf_evsel *evsel,struct perf_event_attr *attr,int idx);
tools/perf/util/header.c +1 -1
@@ -3209,7 +3209,7 @@ static int read_attr(int fd, struct perf_header *ph,static int perf_evsel__prepare_tracepoint_event (struct perf_evsel *evsel,struct tep_handle *pevent) { -struct tep_event_format *event; +struct tep_event *event;char bf[128 ];/* already prepared */
tools/perf/util/python.c +2 -2
@@ -385,7 +385,7 @@ get_tracepoint_field(struct pyrf_event *pevent, PyObject *attr_name)struct tep_format_field *field;if (!evsel->tp_format) { -struct tep_event_format *tp_format; +struct tep_event *tp_format; tp_format =trace_event__tp_format_id (evsel->attr.config);if (!tp_format)
@@ -1222,7 +1222,7 @@ static struct {static PyObject *pyrf__tracepoint (struct pyrf_evsel *pevsel,PyObject *args,PyObject *kwargs) { -struct tep_event_format *tp_format; +struct tep_event *tp_format;static char *kwlist[] = {"sys" ,"name" ,NULL };char *sys =NULL ;char *name =NULL ;
tools/perf/util/scripting-engines/trace-event-perl.c +3 -3
@@ -189,7 +189,7 @@ static void define_flag_field(const char *ev_name,LEAVE ; } -static void define_event_symbols (struct tep_event_format *event, +static void define_event_symbols (struct tep_event *event,const char *ev_name,struct tep_print_arg *args) {
@@ -338,7 +338,7 @@ static void perl_process_tracepoint(struct perf_sample *sample, struct addr_location *al) {struct thread *thread = al->thread; -struct tep_event_format *event = evsel->tp_format; +struct tep_event *event = evsel->tp_format;struct tep_format_field *field;static char handler[256 ];unsigned long long val;
@@ -537,7 +537,7 @@ static int perl_stop_script(void)static int perl_generate_script (struct tep_handle *pevent,const char *outfile) { -struct tep_event_format *event =NULL ; +struct tep_event *event =NULL ;struct tep_format_field *f;char fname[PATH_MAX ];int not_first, count;
tools/perf/util/scripting-engines/trace-event-python.c +4 -4
@@ -264,7 +264,7 @@ static void define_field(enum tep_print_arg_type field_type,Py_DECREF (t); } -static void define_event_symbols (struct tep_event_format *event, +static void define_event_symbols (struct tep_event *event,const char *ev_name,struct tep_print_arg *args) {
@@ -332,7 +332,7 @@ static void define_event_symbols(struct tep_event_format *event,define_event_symbols (event, ev_name, args->next); } -static PyObject *get_field_numeric_entry (struct tep_event_format *event, +static PyObject *get_field_numeric_entry (struct tep_event *event,struct tep_format_field *field,void *data) {bool is_array = field->flags &TEP_FIELD_IS_ARRAY ;
@@ -790,7 +790,7 @@ static void python_process_tracepoint(struct perf_sample *sample,struct perf_evsel *evsel, struct addr_location *al) { - struct tep_event_format *event = evsel->tp_format; + struct tep_event *event = evsel->tp_format;PyObject *handler, *context, *t, *obj =NULL , *callchain;PyObject *dict =NULL , *all_entries_dict =NULL ;static char handler_name[256 ];
@@ -1590,7 +1590,7 @@ static int python_stop_script(void)static int python_generate_script (struct tep_handle *pevent,const char *outfile) { -struct tep_event_format *event =NULL ; +struct tep_event *event =NULL ;struct tep_format_field *f;char fname[PATH_MAX ];int not_first, count;
tools/perf/util/trace-event-parse.c +8 -8
@@ -33,7 +33,7 @@ static int get_common_field(struct scripting_context *context, int *offset, int *size, const char *type) { struct tep_handle *pevent = context->pevent; -struct tep_event_format *event; +struct tep_event *event;struct tep_format_field *field;if (!*size) {
@@ -95,7 +95,7 @@ int common_pc(struct scripting_context *context) }unsigned long long -raw_field_value (struct tep_event_format *event,const char *name,void *data) +raw_field_value (struct tep_event *event,const char *name,void *data) {struct tep_format_field *field;unsigned long long val;
@@ -109,12 +109,12 @@ raw_field_value(struct tep_event_format *event, const char *name, void *data)return val; } -unsigned long long read_size (struct tep_event_format *event,void *ptr,int size) +unsigned long long read_size (struct tep_event *event,void *ptr,int size) {return tep_read_number (event->pevent, ptr, size); } -void event_format__fprintf (struct tep_event_format *event, +void event_format__fprintf (struct tep_event *event,int cpu,void *data,int size,FILE *fp) {struct tep_record record;
@@ -131,7 +131,7 @@ void event_format__fprintf(struct tep_event_format *event,trace_seq_destroy (&s); } -void event_format__print (struct tep_event_format *event, +void event_format__print (struct tep_event *event,int cpu,void *data,int size) {return event_format__fprintf (event, cpu, data, size, stdout);
@@ -190,12 +190,12 @@ int parse_event_file(struct tep_handle *pevent,return tep_parse_event (pevent, buf, size, sys); } -struct tep_event_format *trace_find_next_event (struct tep_handle *pevent, -struct tep_event_format *event) +struct tep_event *trace_find_next_event (struct tep_handle *pevent, +struct tep_event *event) {static int idx;int events_count; -struct tep_event_format *all_events; +struct tep_event *all_events; all_events =tep_get_first_event (pevent); events_count =tep_get_events_count (pevent);
tools/perf/util/trace-event.c +4 -4
@@ -72,12 +72,12 @@ void trace_event__cleanup(struct trace_event *t)/* * Returns pointer with encoded error via <linux/err.h> interface. */ -static struct tep_event_format * +static struct tep_event *tp_format (const char *sys,const char *name) {char *tp_dir =get_events_file (sys);struct tep_handle *pevent = tevent.pevent; -struct tep_event_format *event =NULL ; +struct tep_event *event =NULL ;char path[PATH_MAX ];size_t size;char *data;
@@ -102,7 +102,7 @@ tp_format(const char *sys, const char *name)/* * Returns pointer with encoded error via <linux/err.h> interface. */ -struct tep_event_format * +struct tep_event *trace_event__tp_format (const char *sys,const char *name) {if (!tevent_initialized &&trace_event__init2 ())
@@ -111,7 +111,7 @@ trace_event__tp_format(const char *sys, const char *name)return tp_format (sys, name); } -struct tep_event_format *trace_event__tp_format_id (int id) +struct tep_event *trace_event__tp_format_id (int id) {if (!tevent_initialized &&trace_event__init2 ())return ERR_PTR (-ENOMEM );
tools/perf/util/trace-event.h +8 -8
@@ -22,17 +22,17 @@ int trace_event__init(struct trace_event *t);void trace_event__cleanup (struct trace_event *t);int trace_event__register_resolver (struct machine *machine,tep_func_resolver_t *func); -struct tep_event_format * +struct tep_event *trace_event__tp_format (const char *sys,const char *name); -struct tep_event_format *trace_event__tp_format_id (int id); +struct tep_event *trace_event__tp_format_id (int id);int bigendian (void ); -void event_format__fprintf (struct tep_event_format *event, +void event_format__fprintf (struct tep_event *event,int cpu,void *data,int size,FILE *fp); -void event_format__print (struct tep_event_format *event, +void event_format__print (struct tep_event *event,int cpu,void *data,int size);int parse_ftrace_file (struct tep_handle *pevent,char *buf,unsigned long size);
@@ -40,7 +40,7 @@ int parse_event_file(struct tep_handle *pevent, char *buf, unsigned long size, char *sys);unsigned long long -raw_field_value (struct tep_event_format *event,const char *name,void *data); +raw_field_value (struct tep_event *event,const char *name,void *data);void parse_proc_kallsyms (struct tep_handle *pevent,char *file,unsigned int size);void parse_ftrace_printk (struct tep_handle *pevent,char *file,unsigned int size);
@@ -48,9 +48,9 @@ void parse_saved_cmdline(struct tep_handle *pevent, char *file, unsigned int sizssize_t trace_report (int fd,struct trace_event *tevent,bool repipe); -struct tep_event_format *trace_find_next_event (struct tep_handle *pevent, -struct tep_event_format *event); -unsigned long long read_size (struct tep_event_format *event,void *ptr,int size); +struct tep_event *trace_find_next_event (struct tep_handle *pevent, +struct tep_event *event); +unsigned long long read_size (struct tep_event *event,void *ptr,int size);unsigned long long eval_flag (const char *flag);int read_tracing_data (int fd,struct list_head *pattrs);
Signature · 1 line
2.17.2