tools lib traceevent, perf tools: Rename 'enum pevent_flag' to 'enum tep_flag'

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
pevent_get_page_size API and enum pevent_flag to enum tep_flag

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/20180808180701.623942406@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 2667c18db27c650cc508e7a18c4566bf166398c7..cfb86b789da692135a95e4cfd016bb210e334dba 100644 (file)
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -5515,7 +5515,7 @@ void tep_print_event_time(struct tep_handle *pevent, struct trace_seq *s,
        }
 
        if (use_usec_format) {
-               if (pevent->flags & PEVENT_NSEC_OUTPUT) {
+               if (pevent->flags & TEP_NSEC_OUTPUT) {
                        usecs = nsecs;
                        p = 9;
                } else {

diff --git a/tools/lib/traceevent/event-parse.h b/tools/lib/traceevent/event-parse.h
index 97abeaced9c3c5ce5b0e1002904ac30da5618d1f..97deb15f53555fedf7d892b3de1b4ea589d81eda 100644 (file)
--- a/tools/lib/traceevent/event-parse.h
+++ b/tools/lib/traceevent/event-parse.h
@@ -373,10 +373,10 @@ enum pevent_func_arg_type {
        PEVENT_FUNC_ARG_MAX_TYPES
 };
 
-enum pevent_flag {
-       PEVENT_NSEC_OUTPUT              = 1,    /* output in NSECS */
-       PEVENT_DISABLE_SYS_PLUGINS      = 1 << 1,
-       PEVENT_DISABLE_PLUGINS          = 1 << 2,
+enum tep_flag {
+       TEP_NSEC_OUTPUT         = 1,    /* output in NSECS */
+       TEP_DISABLE_SYS_PLUGINS = 1 << 1,
+       TEP_DISABLE_PLUGINS     = 1 << 2,
 };
 
 #define PEVENT_ERRORS                                                        \
@@ -751,7 +751,7 @@ static inline void tep_set_long_size(struct tep_handle *pevent, int long_size)
        pevent->long_size = long_size;
 }
 
-static inline int pevent_get_page_size(struct tep_handle *pevent)
+static inline int tep_get_page_size(struct tep_handle *pevent)
 {
        return pevent->page_size;
 }

diff --git a/tools/lib/traceevent/event-plugin.c b/tools/lib/traceevent/event-plugin.c
index 39859cee7712ca4387c29fd8b6a2d798b3b05297..c837a73c03e66c5cdfa968a15810548f6cf1f0f4 100644 (file)
--- a/tools/lib/traceevent/event-plugin.c
+++ b/tools/lib/traceevent/event-plugin.c
@@ -390,7 +390,7 @@ load_plugins(struct tep_handle *pevent, const char *suffix,
        char *envdir;
        int ret;
 
-       if (pevent->flags & PEVENT_DISABLE_PLUGINS)
+       if (pevent->flags & TEP_DISABLE_PLUGINS)
                return;
 
        /*
@@ -398,7 +398,7 @@ load_plugins(struct tep_handle *pevent, const char *suffix,
         * check that first.
         */
 #ifdef PLUGIN_DIR
-       if (!(pevent->flags & PEVENT_DISABLE_SYS_PLUGINS))
+       if (!(pevent->flags & TEP_DISABLE_SYS_PLUGINS))
                load_plugins_dir(pevent, suffix, PLUGIN_DIR,
                                 load_plugin, data);
 #endif

diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c
index 73c073ade71cae835612f9a2a10df850e17be15d..b63bca4b0c2a6ec466caac6aa094bc2d41e823ee 100644 (file)
--- a/tools/perf/builtin-kmem.c
+++ b/tools/perf/builtin-kmem.c
@@ -1974,7 +1974,7 @@ int cmd_kmem(int argc, const char **argv)
                        goto out_delete;
                }
 
-               kmem_page_size = pevent_get_page_size(evsel->tp_format->pevent);
+               kmem_page_size = tep_get_page_size(evsel->tp_format->pevent);
                symbol_conf.use_callchain = true;
        }
 

diff --git a/tools/perf/util/trace-event-read.c b/tools/perf/util/trace-event-read.c
index d970163f01457ee0f0c1f7d71b9b6b60e00a6896..3dfc1db6b25b62c192971d1ccc7dc4e83d03f662 100644 (file)
--- a/tools/perf/util/trace-event-read.c
+++ b/tools/perf/util/trace-event-read.c
@@ -439,7 +439,7 @@ ssize_t trace_report(int fd, struct trace_event *tevent, bool __repipe)
 
        pevent = tevent->pevent;
 
-       tep_set_flag(pevent, PEVENT_NSEC_OUTPUT);
+       tep_set_flag(pevent, TEP_NSEC_OUTPUT);
        tep_set_file_bigendian(pevent, file_bigendian);
        tep_set_host_bigendian(pevent, host_bigendian);
 

diff --git a/tools/perf/util/trace-event.c b/tools/perf/util/trace-event.c
index 3102e8be81f51957f8338cc6a792b5f39ed26247..58bb72f266f3758c2f8da29a65b572afbe26be3f 100644 (file)
--- a/tools/perf/util/trace-event.c
+++ b/tools/perf/util/trace-event.c
@@ -47,7 +47,7 @@ static int trace_event__init2(void)
                return -1;
 
        pevent = tevent.pevent;
-       tep_set_flag(pevent, PEVENT_NSEC_OUTPUT);
+       tep_set_flag(pevent, TEP_NSEC_OUTPUT);
        tep_set_file_bigendian(pevent, be);
        tep_set_host_bigendian(pevent, be);
        tevent_initialized = true;