diff options
author | Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com> | 2018-08-08 14:02:57 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-08-13 14:22:18 -0400 |
commit | 6fed932e9242b55a32dd75da7c2448b9b0c48a73 (patch) | |
tree | 7db20d860fec2ea9b2f9181ab84a2638fd443995 | |
parent | fc9b69710e0e5833c5d3e56c37cb56cfe89217c3 (diff) |
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>
-rw-r--r-- | tools/lib/traceevent/event-parse.c | 2 | ||||
-rw-r--r-- | tools/lib/traceevent/event-parse.h | 10 | ||||
-rw-r--r-- | tools/lib/traceevent/event-plugin.c | 4 | ||||
-rw-r--r-- | tools/perf/builtin-kmem.c | 2 | ||||
-rw-r--r-- | tools/perf/util/trace-event-read.c | 2 | ||||
-rw-r--r-- | tools/perf/util/trace-event.c | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c index 2667c18db27c..cfb86b789da6 100644 --- 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, | |||
5515 | } | 5515 | } |
5516 | 5516 | ||
5517 | if (use_usec_format) { | 5517 | if (use_usec_format) { |
5518 | if (pevent->flags & PEVENT_NSEC_OUTPUT) { | 5518 | if (pevent->flags & TEP_NSEC_OUTPUT) { |
5519 | usecs = nsecs; | 5519 | usecs = nsecs; |
5520 | p = 9; | 5520 | p = 9; |
5521 | } else { | 5521 | } else { |
diff --git a/tools/lib/traceevent/event-parse.h b/tools/lib/traceevent/event-parse.h index 97abeaced9c3..97deb15f5355 100644 --- a/tools/lib/traceevent/event-parse.h +++ b/tools/lib/traceevent/event-parse.h | |||
@@ -373,10 +373,10 @@ enum pevent_func_arg_type { | |||
373 | PEVENT_FUNC_ARG_MAX_TYPES | 373 | PEVENT_FUNC_ARG_MAX_TYPES |
374 | }; | 374 | }; |
375 | 375 | ||
376 | enum pevent_flag { | 376 | enum tep_flag { |
377 | PEVENT_NSEC_OUTPUT = 1, /* output in NSECS */ | 377 | TEP_NSEC_OUTPUT = 1, /* output in NSECS */ |
378 | PEVENT_DISABLE_SYS_PLUGINS = 1 << 1, | 378 | TEP_DISABLE_SYS_PLUGINS = 1 << 1, |
379 | PEVENT_DISABLE_PLUGINS = 1 << 2, | 379 | TEP_DISABLE_PLUGINS = 1 << 2, |
380 | }; | 380 | }; |
381 | 381 | ||
382 | #define PEVENT_ERRORS \ | 382 | #define PEVENT_ERRORS \ |
@@ -751,7 +751,7 @@ static inline void tep_set_long_size(struct tep_handle *pevent, int long_size) | |||
751 | pevent->long_size = long_size; | 751 | pevent->long_size = long_size; |
752 | } | 752 | } |
753 | 753 | ||
754 | static inline int pevent_get_page_size(struct tep_handle *pevent) | 754 | static inline int tep_get_page_size(struct tep_handle *pevent) |
755 | { | 755 | { |
756 | return pevent->page_size; | 756 | return pevent->page_size; |
757 | } | 757 | } |
diff --git a/tools/lib/traceevent/event-plugin.c b/tools/lib/traceevent/event-plugin.c index 39859cee7712..c837a73c03e6 100644 --- 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, | |||
390 | char *envdir; | 390 | char *envdir; |
391 | int ret; | 391 | int ret; |
392 | 392 | ||
393 | if (pevent->flags & PEVENT_DISABLE_PLUGINS) | 393 | if (pevent->flags & TEP_DISABLE_PLUGINS) |
394 | return; | 394 | return; |
395 | 395 | ||
396 | /* | 396 | /* |
@@ -398,7 +398,7 @@ load_plugins(struct tep_handle *pevent, const char *suffix, | |||
398 | * check that first. | 398 | * check that first. |
399 | */ | 399 | */ |
400 | #ifdef PLUGIN_DIR | 400 | #ifdef PLUGIN_DIR |
401 | if (!(pevent->flags & PEVENT_DISABLE_SYS_PLUGINS)) | 401 | if (!(pevent->flags & TEP_DISABLE_SYS_PLUGINS)) |
402 | load_plugins_dir(pevent, suffix, PLUGIN_DIR, | 402 | load_plugins_dir(pevent, suffix, PLUGIN_DIR, |
403 | load_plugin, data); | 403 | load_plugin, data); |
404 | #endif | 404 | #endif |
diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c index 73c073ade71c..b63bca4b0c2a 100644 --- a/tools/perf/builtin-kmem.c +++ b/tools/perf/builtin-kmem.c | |||
@@ -1974,7 +1974,7 @@ int cmd_kmem(int argc, const char **argv) | |||
1974 | goto out_delete; | 1974 | goto out_delete; |
1975 | } | 1975 | } |
1976 | 1976 | ||
1977 | kmem_page_size = pevent_get_page_size(evsel->tp_format->pevent); | 1977 | kmem_page_size = tep_get_page_size(evsel->tp_format->pevent); |
1978 | symbol_conf.use_callchain = true; | 1978 | symbol_conf.use_callchain = true; |
1979 | } | 1979 | } |
1980 | 1980 | ||
diff --git a/tools/perf/util/trace-event-read.c b/tools/perf/util/trace-event-read.c index d970163f0145..3dfc1db6b25b 100644 --- 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) | |||
439 | 439 | ||
440 | pevent = tevent->pevent; | 440 | pevent = tevent->pevent; |
441 | 441 | ||
442 | tep_set_flag(pevent, PEVENT_NSEC_OUTPUT); | 442 | tep_set_flag(pevent, TEP_NSEC_OUTPUT); |
443 | tep_set_file_bigendian(pevent, file_bigendian); | 443 | tep_set_file_bigendian(pevent, file_bigendian); |
444 | tep_set_host_bigendian(pevent, host_bigendian); | 444 | tep_set_host_bigendian(pevent, host_bigendian); |
445 | 445 | ||
diff --git a/tools/perf/util/trace-event.c b/tools/perf/util/trace-event.c index 3102e8be81f5..58bb72f266f3 100644 --- a/tools/perf/util/trace-event.c +++ b/tools/perf/util/trace-event.c | |||
@@ -47,7 +47,7 @@ static int trace_event__init2(void) | |||
47 | return -1; | 47 | return -1; |
48 | 48 | ||
49 | pevent = tevent.pevent; | 49 | pevent = tevent.pevent; |
50 | tep_set_flag(pevent, PEVENT_NSEC_OUTPUT); | 50 | tep_set_flag(pevent, TEP_NSEC_OUTPUT); |
51 | tep_set_file_bigendian(pevent, be); | 51 | tep_set_file_bigendian(pevent, be); |
52 | tep_set_host_bigendian(pevent, be); | 52 | tep_set_host_bigendian(pevent, be); |
53 | tevent_initialized = true; | 53 | tevent_initialized = true; |