1 files changed, 17 insertions, 17 deletions

diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c
index e0a6e9a6a053..920b1d58a068 100644
--- a/tools/perf/util/trace-event-parse.c
+++ b/tools/perf/util/trace-event-parse.c
@@ -32,7 +32,7 @@
 static int get_common_field(struct scripting_context *context,
                             int *offset, int *size, const char *type)
 {
-        struct pevent *pevent = context->pevent;
+        struct tep_handle *pevent = context->pevent;
         struct event_format *event;
         struct format_field *field;
 
@@ -41,14 +41,14 @@ static int get_common_field(struct scripting_context *context,
                         return 0;
 
                 event = pevent->events[0];
-                field = pevent_find_common_field(event, type);
+                field = tep_find_common_field(event, type);
                 if (!field)
                         return 0;
                 *offset = field->offset;
                 *size = field->size;
         }
 
-        return pevent_read_number(pevent, context->event_data + *offset, *size);
+        return tep_read_number(pevent, context->event_data + *offset, *size);
 }
 
 int common_lock_depth(struct scripting_context *context)
@@ -99,24 +99,24 @@ raw_field_value(struct event_format *event, const char *name, void *data)
         struct format_field *field;
         unsigned long long val;
 
-        field = pevent_find_any_field(event, name);
+        field = tep_find_any_field(event, name);
         if (!field)
                 return 0ULL;
 
-        pevent_read_number_field(field, data, &val);
+        tep_read_number_field(field, data, &val);
 
         return val;
 }
 
 unsigned long long read_size(struct event_format *event, void *ptr, int size)
 {
-        return pevent_read_number(event->pevent, ptr, size);
+        return tep_read_number(event->pevent, ptr, size);
 }
 
 void event_format__fprintf(struct event_format *event,
                            int cpu, void *data, int size, FILE *fp)
 {
-        struct pevent_record record;
+        struct tep_record record;
         struct trace_seq s;
 
         memset(&record, 0, sizeof(record));
@@ -125,7 +125,7 @@ void event_format__fprintf(struct event_format *event,
         record.data = data;
 
         trace_seq_init(&s);
-        pevent_event_info(&s, event, &record);
+        tep_event_info(&s, event, &record);
         trace_seq_do_fprintf(&s, fp);
         trace_seq_destroy(&s);
 }
@@ -136,7 +136,7 @@ void event_format__print(struct event_format *event,
         return event_format__fprintf(event, cpu, data, size, stdout);
 }
 
-void parse_ftrace_printk(struct pevent *pevent,
+void parse_ftrace_printk(struct tep_handle *pevent,
                          char *file, unsigned int size __maybe_unused)
 {
         unsigned long long addr;
@@ -157,11 +157,11 @@ void parse_ftrace_printk(struct pevent *pevent,
                 /* fmt still has a space, skip it */
                 printk = strdup(fmt+1);
                 line = strtok_r(NULL, "\n", &next);
-                pevent_register_print_string(pevent, printk, addr);
+                tep_register_print_string(pevent, printk, addr);
         }
 }
 
-void parse_saved_cmdline(struct pevent *pevent,
+void parse_saved_cmdline(struct tep_handle *pevent,
                          char *file, unsigned int size __maybe_unused)
 {
         char *comm;
@@ -172,24 +172,24 @@ void parse_saved_cmdline(struct pevent *pevent,
         line = strtok_r(file, "\n", &next);
         while (line) {
                 sscanf(line, "%d %ms", &pid, &comm);
-                pevent_register_comm(pevent, comm, pid);
+                tep_register_comm(pevent, comm, pid);
                 free(comm);
                 line = strtok_r(NULL, "\n", &next);
         }
 }
 
-int parse_ftrace_file(struct pevent *pevent, char *buf, unsigned long size)
+int parse_ftrace_file(struct tep_handle *pevent, char *buf, unsigned long size)
 {
-        return pevent_parse_event(pevent, buf, size, "ftrace");
+        return tep_parse_event(pevent, buf, size, "ftrace");
 }
 
-int parse_event_file(struct pevent *pevent,
+int parse_event_file(struct tep_handle *pevent,
                      char *buf, unsigned long size, char *sys)
 {
-        return pevent_parse_event(pevent, buf, size, sys);
+        return tep_parse_event(pevent, buf, size, sys);
 }
 
-struct event_format *trace_find_next_event(struct pevent *pevent,
+struct event_format *trace_find_next_event(struct tep_handle *pevent,
                                            struct event_format *event)
 {
         static int idx;