tools lib traceevent, perf tools: Rename pevent alloc / free APIs

In order to make libtraceevent into a proper library, variables, data
structures and functions require a unique prefix to prevent name space
conflicts. That prefix will be "tep_" and not "pevent_". This changes
APIs: pevent_alloc, pevent_free, pevent_event_info and pevent_func_resolver_t

Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Yordan Karadzhov (VMware) <y.karadz@gmail.com>
Cc: linux-trace-devel@vger.kernel.org
Link: http://lkml.kernel.org/r/20180808180700.152609945@goodmis.org
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index 57ed9348d1aa511ccb78233f38d0304e7bcb30d6..040180f6ed743d4f620d7198be1927ac7a16491d 100644 (file)
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -438,9 +438,9 @@ __find_func(struct tep_handle *pevent, unsigned long long addr)
 }
 
 struct func_resolver {
-       pevent_func_resolver_t *func;
-       void                   *priv;
-       struct func_map        map;
+       tep_func_resolver_t     *func;
+       void                    *priv;
+       struct func_map         map;
 };
 
 /**
@@ -454,7 +454,7 @@ struct func_resolver {
  * pevent->funclist.
  */
 int pevent_set_function_resolver(struct tep_handle *pevent,
-                                pevent_func_resolver_t *func, void *priv)
+                                tep_func_resolver_t *func, void *priv)
 {
        struct func_resolver *resolver = malloc(sizeof(*resolver));
 
@@ -5399,8 +5399,8 @@ int pevent_cmdline_pid(struct tep_handle *pevent, struct cmdline *cmdline)
  * This parses the raw @data using the given @event information and
  * writes the print format into the trace_seq.
  */
-void pevent_event_info(struct trace_seq *s, struct event_format *event,
-                      struct tep_record *record)
+void tep_event_info(struct trace_seq *s, struct event_format *event,
+                   struct tep_record *record)
 {
        int print_pretty = 1;
 
@@ -5556,7 +5556,7 @@ void pevent_print_event_data(struct tep_handle *pevent, struct trace_seq *s,
        if (len < 20)
                trace_seq_printf(s, "%.*s", 20 - len, spaces);
 
-       pevent_event_info(s, event, record);
+       tep_event_info(s, event, record);
 }
 
 void pevent_print_event(struct tep_handle *pevent, struct trace_seq *s,
@@ -6754,9 +6754,9 @@ not_found:
 }
 
 /**
- * pevent_alloc - create a pevent handle
+ * tep_alloc - create a pevent handle
  */
-struct tep_handle *pevent_alloc(void)
+struct tep_handle *tep_alloc(void)
 {
        struct tep_handle *pevent = calloc(1, sizeof(*pevent));
 
@@ -6811,10 +6811,10 @@ void pevent_free_format(struct event_format *event)
 }
 
 /**
- * pevent_free - free a pevent handle
+ * tep_free - free a pevent handle
  * @pevent: the pevent handle to free
  */
-void pevent_free(struct tep_handle *pevent)
+void tep_free(struct tep_handle *pevent)
 {
        struct cmdline_list *cmdlist, *cmdnext;
        struct func_list *funclist, *funcnext;
@@ -6901,5 +6901,5 @@ void pevent_free(struct tep_handle *pevent)
 
 void pevent_unref(struct tep_handle *pevent)
 {
-       pevent_free(pevent);
+       tep_free(pevent);
 }

diff --git a/tools/lib/traceevent/event-parse.h b/tools/lib/traceevent/event-parse.h
index b4b698c3833e34b2fca60e6c7ec4a4efc2e82eb1..c229240666b73bb217b590e053d83669d9139017 100644 (file)
--- a/tools/lib/traceevent/event-parse.h
+++ b/tools/lib/traceevent/event-parse.h
@@ -454,8 +454,8 @@ struct func_list;
 struct event_handler;
 struct func_resolver;
 
-typedef char *(pevent_func_resolver_t)(void *priv,
-                                      unsigned long long *addrp, char **modp);
+typedef char *(tep_func_resolver_t)(void *priv,
+                                   unsigned long long *addrp, char **modp);
 
 struct tep_handle {
        int ref_count;
@@ -616,7 +616,7 @@ enum trace_flag_type {
 };
 
 int pevent_set_function_resolver(struct tep_handle *pevent,
-                                pevent_func_resolver_t *func, void *priv);
+                                tep_func_resolver_t *func, void *priv);
 void pevent_reset_function_resolver(struct tep_handle *pevent);
 int pevent_register_comm(struct tep_handle *pevent, const char *comm, int pid);
 int pevent_register_trace_clock(struct tep_handle *pevent, const char *trace_clock);
@@ -722,7 +722,7 @@ void pevent_print_field(struct trace_seq *s, void *data,
                        struct format_field *field);
 void pevent_print_fields(struct trace_seq *s, void *data,
                         int size __maybe_unused, struct event_format *event);
-void pevent_event_info(struct trace_seq *s, struct event_format *event,
+void tep_event_info(struct trace_seq *s, struct event_format *event,
                       struct tep_record *record);
 int pevent_strerror(struct tep_handle *pevent, enum pevent_errno errnum,
                    char *buf, size_t buflen);
@@ -791,8 +791,8 @@ static inline void pevent_set_latency_format(struct tep_handle *pevent, int lat)
        pevent->latency_format = lat;
 }
 
-struct tep_handle *pevent_alloc(void);
-void pevent_free(struct tep_handle *pevent);
+struct tep_handle *tep_alloc(void);
+void tep_free(struct tep_handle *pevent);
 void pevent_ref(struct tep_handle *pevent);
 void pevent_unref(struct tep_handle *pevent);
 

diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c
index b23e861fa6ae692b939b7444c9d31a2ffe228080..73c073ade71cae835612f9a2a10df850e17be15d 100644 (file)
--- a/tools/perf/builtin-kmem.c
+++ b/tools/perf/builtin-kmem.c
@@ -747,7 +747,7 @@ static int parse_gfp_flags(struct perf_evsel *evsel, struct perf_sample *sample,
        }
 
        trace_seq_init(&seq);
-       pevent_event_info(&seq, evsel->tp_format, &record);
+       tep_event_info(&seq, evsel->tp_format, &record);
 
        str = strtok_r(seq.buffer, " ", &pos);
        while (str) {

diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index 2c9924ab872d8d2830e8084b51d41dcb0bfad738..08cdaf2be1af440b2b3cb8d10d314cfc0bbf3e69 100644 (file)
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -613,7 +613,7 @@ static char *get_trace_output(struct hist_entry *he)
                pevent_print_fields(&seq, he->raw_data, he->raw_size,
                                    evsel->tp_format);
        } else {
-               pevent_event_info(&seq, evsel->tp_format, &rec);
+               tep_event_info(&seq, evsel->tp_format, &rec);
        }
        /*
         * Trim the buffer, it starts at 4KB and we're not going to

diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c
index 29af1fb0b8880a341ce8a2e5ebce27920ecba1c9..630d0e81fe876cf5eb3174a6da1d150d974167d3 100644 (file)
--- a/tools/perf/util/trace-event-parse.c
+++ b/tools/perf/util/trace-event-parse.c
@@ -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);
 }

diff --git a/tools/perf/util/trace-event.c b/tools/perf/util/trace-event.c
index 7c0cd9a0f57548628d428f79bf221f374543952f..11066ed43ca4c761174d8a603aef6f3a3609392a 100644 (file)
--- a/tools/perf/util/trace-event.c
+++ b/tools/perf/util/trace-event.c
@@ -28,7 +28,7 @@ static bool tevent_initialized;
 
 int trace_event__init(struct trace_event *t)
 {
-       struct tep_handle *pevent = pevent_alloc();
+       struct tep_handle *pevent = tep_alloc();
 
        if (pevent) {
                t->plugin_list = traceevent_load_plugins(pevent);
@@ -55,7 +55,7 @@ static int trace_event__init2(void)
 }
 
 int trace_event__register_resolver(struct machine *machine,
-                                  pevent_func_resolver_t *func)
+                                  tep_func_resolver_t *func)
 {
        if (!tevent_initialized && trace_event__init2())
                return -1;
@@ -66,7 +66,7 @@ int trace_event__register_resolver(struct machine *machine,
 void trace_event__cleanup(struct trace_event *t)
 {
        traceevent_unload_plugins(t->plugin_list, t->pevent);
-       pevent_free(t->pevent);
+       tep_free(t->pevent);
 }
 
 /*

diff --git a/tools/perf/util/trace-event.h b/tools/perf/util/trace-event.h
index b8f2516e9a65b14254bcb08d119dc39e0828a1e6..40204ec3a7a284d238b3b929bf6c5c5b15876ac5 100644 (file)
--- a/tools/perf/util/trace-event.h
+++ b/tools/perf/util/trace-event.h
@@ -20,7 +20,7 @@ struct trace_event {
 int trace_event__init(struct trace_event *t);
 void trace_event__cleanup(struct trace_event *t);
 int trace_event__register_resolver(struct machine *machine,
-                                  pevent_func_resolver_t *func);
+                                  tep_func_resolver_t *func);
 struct event_format*
 trace_event__tp_format(const char *sys, const char *name);