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

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: 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/20180808180700.152609945@goodmis.org


Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent c32d52b4

tools/lib/traceevent/event-parse.c

+12 −12
Original line number Diff line number Diff line
@@ -438,7 +438,7 @@ __find_func(struct tep_handle *pevent, unsigned long long addr) 
}



struct func_resolver {

	pevent_func_resolver_t *func;

	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,7 +5399,7 @@ 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,

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);

}

tools/lib/traceevent/event-parse.h

+6 −6
Original line number Diff line number Diff line
@@ -454,7 +454,7 @@ struct func_list; 
struct event_handler;

struct func_resolver;



typedef char *(pevent_func_resolver_t)(void *priv,

typedef char *(tep_func_resolver_t)(void *priv,

				    unsigned long long *addrp, char **modp);



struct tep_handle {
@@ -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);

tools/perf/builtin-kmem.c

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

tools/perf/util/sort.c

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

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

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

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE