Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6fed932e authored by Tzvetomir Stoyanov (VMware)'s avatar Tzvetomir Stoyanov (VMware) Committed by Arnaldo Carvalho de Melo
Browse files

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: default avatarTzvetomir 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: default avatarSteven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent fc9b6971

tools/lib/traceevent/event-parse.c

+1 −1
Original line number Diff line number Diff line
@@ -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 {

tools/lib/traceevent/event-parse.h

+5 −5
Original line number Diff line number Diff line
@@ -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;

}

tools/lib/traceevent/event-plugin.c

+2 −2
Original line number Diff line number Diff line
@@ -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

tools/perf/builtin-kmem.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}

tools/perf/util/trace-event-read.c

+1 −1
Original line number Diff line number Diff line
@@ -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);