Commit 97fbf3f0 authored by Tzvetomir Stoyanov's avatar Tzvetomir Stoyanov Committed by Arnaldo Carvalho de Melo
Browse files

tools lib traceevent, perf tools: Rename 'struct tep_event_format' to 'struct tep_event' 



In order to make libtraceevent into a proper library, variables, data
structures and functions require a unique prefix to prevent name space
conflicts.

This renames 'struct tep_event_format' to 'struct tep_event', which
describes more closely the purpose of the struct.

Signed-off-by: default avatarTzvetomir Stoyanov <tstoyanov@vmware.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/20181130154647.436403995@goodmis.org


Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
[ Fixup conflict with 6e33c250a88f ("tools lib traceevent: Fix compile warnings in tools/lib/traceevent/event-parse.c") ]
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 4c784894

tools/lib/traceevent/event-parse-api.c

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 * This returns pointer to the first element of the events array

 * If @tep is NULL, NULL is returned.

 */

struct tep_event_format *tep_get_first_event(struct tep_handle *tep)

struct tep_event *tep_get_first_event(struct tep_handle *tep)

{

	if (tep && tep->events)

		return tep->events[0];

tools/lib/traceevent/event-parse-local.h

+3 −3
Original line number Diff line number Diff line
@@ -50,9 +50,9 @@ struct tep_handle { 
	unsigned int printk_count;





	struct tep_event_format **events;

	struct tep_event **events;

	int nr_events;

	struct tep_event_format **sort_events;

	struct tep_event **sort_events;

	enum tep_event_sort_type last_type;



	int type_offset;
@@ -84,7 +84,7 @@ struct tep_handle { 
	struct tep_function_handler *func_handlers;



	/* cache */

	struct tep_event_format *last_event;

	struct tep_event *last_event;



	char *trace_clock;

};

tools/lib/traceevent/event-parse.c

+94 −94
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ struct tep_function_handler { 


static unsigned long long

process_defined_func(struct trace_seq *s, void *data, int size,

		     struct tep_event_format *event, struct tep_print_arg *arg);

		     struct tep_event *event, struct tep_print_arg *arg);



static void free_func_handle(struct tep_function_handler *func);
@@ -739,15 +739,15 @@ void tep_print_printk(struct tep_handle *pevent) 
	}

}



static struct tep_event_format *alloc_event(void)

static struct tep_event *alloc_event(void)

{

	return calloc(1, sizeof(struct tep_event_format));

	return calloc(1, sizeof(struct tep_event));

}



static int add_event(struct tep_handle *pevent, struct tep_event_format *event)

static int add_event(struct tep_handle *pevent, struct tep_event *event)

{

	int i;

	struct tep_event_format **events = realloc(pevent->events, sizeof(event) *

	struct tep_event **events = realloc(pevent->events, sizeof(event) *

					    (pevent->nr_events + 1));

	if (!events)

		return -1;
@@ -1355,7 +1355,7 @@ static unsigned int type_size(const char *name) 
	return 0;

}



static int event_read_fields(struct tep_event_format *event, struct tep_format_field **fields)

static int event_read_fields(struct tep_event *event, struct tep_format_field **fields)

{

	struct tep_format_field *field = NULL;

	enum tep_event_type type;
@@ -1642,7 +1642,7 @@ static int event_read_fields(struct tep_event_format *event, struct tep_format_f 
	return -1;

}



static int event_read_format(struct tep_event_format *event)

static int event_read_format(struct tep_event *event)

{

	char *token;

	int ret;
@@ -1675,11 +1675,11 @@ static int event_read_format(struct tep_event_format *event) 
}



static enum tep_event_type

process_arg_token(struct tep_event_format *event, struct tep_print_arg *arg,

process_arg_token(struct tep_event *event, struct tep_print_arg *arg,

		  char **tok, enum tep_event_type type);



static enum tep_event_type

process_arg(struct tep_event_format *event, struct tep_print_arg *arg, char **tok)

process_arg(struct tep_event *event, struct tep_print_arg *arg, char **tok)

{

	enum tep_event_type type;

	char *token;
@@ -1691,14 +1691,14 @@ process_arg(struct tep_event_format *event, struct tep_print_arg *arg, char **to 
}



static enum tep_event_type

process_op(struct tep_event_format *event, struct tep_print_arg *arg, char **tok);

process_op(struct tep_event *event, struct tep_print_arg *arg, char **tok);



/*

 * For __print_symbolic() and __print_flags, we need to completely

 * evaluate the first argument, which defines what to print next.

 */

static enum tep_event_type

process_field_arg(struct tep_event_format *event, struct tep_print_arg *arg, char **tok)

process_field_arg(struct tep_event *event, struct tep_print_arg *arg, char **tok)

{

	enum tep_event_type type;
@@ -1712,7 +1712,7 @@ process_field_arg(struct tep_event_format *event, struct tep_print_arg *arg, cha 
}



static enum tep_event_type

process_cond(struct tep_event_format *event, struct tep_print_arg *top, char **tok)

process_cond(struct tep_event *event, struct tep_print_arg *top, char **tok)

{

	struct tep_print_arg *arg, *left, *right;

	enum tep_event_type type;
@@ -1768,7 +1768,7 @@ process_cond(struct tep_event_format *event, struct tep_print_arg *top, char **t 
}



static enum tep_event_type

process_array(struct tep_event_format *event, struct tep_print_arg *top, char **tok)

process_array(struct tep_event *event, struct tep_print_arg *top, char **tok)

{

	struct tep_print_arg *arg;

	enum tep_event_type type;
@@ -1870,7 +1870,7 @@ static int set_op_prio(struct tep_print_arg *arg) 


/* Note, *tok does not get freed, but will most likely be saved */

static enum tep_event_type

process_op(struct tep_event_format *event, struct tep_print_arg *arg, char **tok)

process_op(struct tep_event *event, struct tep_print_arg *arg, char **tok)

{

	struct tep_print_arg *left, *right = NULL;

	enum tep_event_type type;
@@ -2071,7 +2071,7 @@ process_op(struct tep_event_format *event, struct tep_print_arg *arg, char **tok 
}



static enum tep_event_type

process_entry(struct tep_event_format *event __maybe_unused, struct tep_print_arg *arg,

process_entry(struct tep_event *event __maybe_unused, struct tep_print_arg *arg,

	      char **tok)

{

	enum tep_event_type type;
@@ -2110,7 +2110,7 @@ process_entry(struct tep_event_format *event __maybe_unused, struct tep_print_ar 
	return TEP_EVENT_ERROR;

}



static int alloc_and_process_delim(struct tep_event_format *event, char *next_token,

static int alloc_and_process_delim(struct tep_event *event, char *next_token,

				   struct tep_print_arg **print_arg)

{

	struct tep_print_arg *field;
@@ -2445,7 +2445,7 @@ static char *arg_eval (struct tep_print_arg *arg) 
}



static enum tep_event_type

process_fields(struct tep_event_format *event, struct tep_print_flag_sym **list, char **tok)

process_fields(struct tep_event *event, struct tep_print_flag_sym **list, char **tok)

{

	enum tep_event_type type;

	struct tep_print_arg *arg = NULL;
@@ -2526,7 +2526,7 @@ process_fields(struct tep_event_format *event, struct tep_print_flag_sym **list, 
}



static enum tep_event_type

process_flags(struct tep_event_format *event, struct tep_print_arg *arg, char **tok)

process_flags(struct tep_event *event, struct tep_print_arg *arg, char **tok)

{

	struct tep_print_arg *field;

	enum tep_event_type type;
@@ -2579,7 +2579,7 @@ process_flags(struct tep_event_format *event, struct tep_print_arg *arg, char ** 
}



static enum tep_event_type

process_symbols(struct tep_event_format *event, struct tep_print_arg *arg, char **tok)

process_symbols(struct tep_event *event, struct tep_print_arg *arg, char **tok)

{

	struct tep_print_arg *field;

	enum tep_event_type type;
@@ -2618,7 +2618,7 @@ process_symbols(struct tep_event_format *event, struct tep_print_arg *arg, char 
}



static enum tep_event_type

process_hex_common(struct tep_event_format *event, struct tep_print_arg *arg,

process_hex_common(struct tep_event *event, struct tep_print_arg *arg,

		   char **tok, enum tep_print_arg_type type)

{

	memset(arg, 0, sizeof(*arg));
@@ -2641,20 +2641,20 @@ process_hex_common(struct tep_event_format *event, struct tep_print_arg *arg, 
}



static enum tep_event_type

process_hex(struct tep_event_format *event, struct tep_print_arg *arg, char **tok)

process_hex(struct tep_event *event, struct tep_print_arg *arg, char **tok)

{

	return process_hex_common(event, arg, tok, TEP_PRINT_HEX);

}



static enum tep_event_type

process_hex_str(struct tep_event_format *event, struct tep_print_arg *arg,

process_hex_str(struct tep_event *event, struct tep_print_arg *arg,

		char **tok)

{

	return process_hex_common(event, arg, tok, TEP_PRINT_HEX_STR);

}



static enum tep_event_type

process_int_array(struct tep_event_format *event, struct tep_print_arg *arg, char **tok)

process_int_array(struct tep_event *event, struct tep_print_arg *arg, char **tok)

{

	memset(arg, 0, sizeof(*arg));

	arg->type = TEP_PRINT_INT_ARRAY;
@@ -2682,7 +2682,7 @@ process_int_array(struct tep_event_format *event, struct tep_print_arg *arg, cha 
}



static enum tep_event_type

process_dynamic_array(struct tep_event_format *event, struct tep_print_arg *arg, char **tok)

process_dynamic_array(struct tep_event *event, struct tep_print_arg *arg, char **tok)

{

	struct tep_format_field *field;

	enum tep_event_type type;
@@ -2746,7 +2746,7 @@ process_dynamic_array(struct tep_event_format *event, struct tep_print_arg *arg, 
}



static enum tep_event_type

process_dynamic_array_len(struct tep_event_format *event, struct tep_print_arg *arg,

process_dynamic_array_len(struct tep_event *event, struct tep_print_arg *arg,

			  char **tok)

{

	struct tep_format_field *field;
@@ -2782,7 +2782,7 @@ process_dynamic_array_len(struct tep_event_format *event, struct tep_print_arg * 
}



static enum tep_event_type

process_paren(struct tep_event_format *event, struct tep_print_arg *arg, char **tok)

process_paren(struct tep_event *event, struct tep_print_arg *arg, char **tok)

{

	struct tep_print_arg *item_arg;

	enum tep_event_type type;
@@ -2845,7 +2845,7 @@ process_paren(struct tep_event_format *event, struct tep_print_arg *arg, char ** 




static enum tep_event_type

process_str(struct tep_event_format *event __maybe_unused, struct tep_print_arg *arg,

process_str(struct tep_event *event __maybe_unused, struct tep_print_arg *arg,

	    char **tok)

{

	enum tep_event_type type;
@@ -2874,7 +2874,7 @@ process_str(struct tep_event_format *event __maybe_unused, struct tep_print_arg 
}



static enum tep_event_type

process_bitmask(struct tep_event_format *event __maybe_unused, struct tep_print_arg *arg,

process_bitmask(struct tep_event *event __maybe_unused, struct tep_print_arg *arg,

		char **tok)

{

	enum tep_event_type type;
@@ -2935,7 +2935,7 @@ static void remove_func_handler(struct tep_handle *pevent, char *func_name) 
}



static enum tep_event_type

process_func_handler(struct tep_event_format *event, struct tep_function_handler *func,

process_func_handler(struct tep_event *event, struct tep_function_handler *func,

		     struct tep_print_arg *arg, char **tok)

{

	struct tep_print_arg **next_arg;
@@ -2993,7 +2993,7 @@ process_func_handler(struct tep_event_format *event, struct tep_function_handler 
}



static enum tep_event_type

process_function(struct tep_event_format *event, struct tep_print_arg *arg,

process_function(struct tep_event *event, struct tep_print_arg *arg,

		 char *token, char **tok)

{

	struct tep_function_handler *func;
@@ -3049,7 +3049,7 @@ process_function(struct tep_event_format *event, struct tep_print_arg *arg, 
}



static enum tep_event_type

process_arg_token(struct tep_event_format *event, struct tep_print_arg *arg,

process_arg_token(struct tep_event *event, struct tep_print_arg *arg,

		  char **tok, enum tep_event_type type)

{

	char *token;
@@ -3137,7 +3137,7 @@ process_arg_token(struct tep_event_format *event, struct tep_print_arg *arg, 
	return type;

}



static int event_read_print_args(struct tep_event_format *event, struct tep_print_arg **list)

static int event_read_print_args(struct tep_event *event, struct tep_print_arg **list)

{

	enum tep_event_type type = TEP_EVENT_ERROR;

	struct tep_print_arg *arg;
@@ -3195,7 +3195,7 @@ static int event_read_print_args(struct tep_event_format *event, struct tep_prin 
	return args;

}



static int event_read_print(struct tep_event_format *event)

static int event_read_print(struct tep_event *event)

{

	enum tep_event_type type;

	char *token;
@@ -3261,7 +3261,7 @@ static int event_read_print(struct tep_event_format *event) 
 * This only searchs the common fields and not all field.

 */

struct tep_format_field *

tep_find_common_field(struct tep_event_format *event, const char *name)

tep_find_common_field(struct tep_event *event, const char *name)

{

	struct tep_format_field *format;
@@ -3283,7 +3283,7 @@ tep_find_common_field(struct tep_event_format *event, const char *name) 
 * This does not search common fields.

 */

struct tep_format_field *

tep_find_field(struct tep_event_format *event, const char *name)

tep_find_field(struct tep_event *event, const char *name)

{

	struct tep_format_field *format;
@@ -3306,7 +3306,7 @@ tep_find_field(struct tep_event_format *event, const char *name) 
 * the non-common ones if a common one was not found.

 */

struct tep_format_field *

tep_find_any_field(struct tep_event_format *event, const char *name)

tep_find_any_field(struct tep_event *event, const char *name)

{

	struct tep_format_field *format;
@@ -3375,7 +3375,7 @@ int tep_read_number_field(struct tep_format_field *field, const void *data, 
static int get_common_info(struct tep_handle *pevent,

			   const char *type, int *offset, int *size)

{

	struct tep_event_format *event;

	struct tep_event *event;

	struct tep_format_field *field;



	/*
@@ -3462,11 +3462,11 @@ static int events_id_cmp(const void *a, const void *b); 
 *

 * Returns an event that has a given @id.

 */

struct tep_event_format *tep_find_event(struct tep_handle *pevent, int id)

struct tep_event *tep_find_event(struct tep_handle *pevent, int id)

{

	struct tep_event_format **eventptr;

	struct tep_event_format key;

	struct tep_event_format *pkey = &key;

	struct tep_event **eventptr;

	struct tep_event key;

	struct tep_event *pkey = &key;



	/* Check cache first */

	if (pevent->last_event && pevent->last_event->id == id)
@@ -3494,11 +3494,11 @@ struct tep_event_format *tep_find_event(struct tep_handle *pevent, int id) 
 * This returns an event with a given @name and under the system

 * @sys. If @sys is NULL the first event with @name is returned.

 */

struct tep_event_format *

struct tep_event *

tep_find_event_by_name(struct tep_handle *pevent,

		       const char *sys, const char *name)

{

	struct tep_event_format *event = NULL;

	struct tep_event *event = NULL;

	int i;



	if (pevent->last_event &&
@@ -3523,7 +3523,7 @@ tep_find_event_by_name(struct tep_handle *pevent, 
}



static unsigned long long

eval_num_arg(void *data, int size, struct tep_event_format *event, struct tep_print_arg *arg)

eval_num_arg(void *data, int size, struct tep_event *event, struct tep_print_arg *arg)

{

	struct tep_handle *pevent = event->pevent;

	unsigned long long val = 0;
@@ -3863,7 +3863,7 @@ static void print_bitmask_to_seq(struct tep_handle *pevent, 
}



static void print_str_arg(struct trace_seq *s, void *data, int size,

			  struct tep_event_format *event, const char *format,

			  struct tep_event *event, const char *format,

			  int len_arg, struct tep_print_arg *arg)

{

	struct tep_handle *pevent = event->pevent;
@@ -4118,7 +4118,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size, 


static unsigned long long

process_defined_func(struct trace_seq *s, void *data, int size,

		     struct tep_event_format *event, struct tep_print_arg *arg)

		     struct tep_event *event, struct tep_print_arg *arg)

{

	struct tep_function_handler *func_handle = arg->func.func;

	struct func_params *param;
@@ -4213,7 +4213,7 @@ static void free_args(struct tep_print_arg *args) 
	}

}



static struct tep_print_arg *make_bprint_args(char *fmt, void *data, int size, struct tep_event_format *event)

static struct tep_print_arg *make_bprint_args(char *fmt, void *data, int size, struct tep_event *event)

{

	struct tep_handle *pevent = event->pevent;

	struct tep_format_field *field, *ip_field;
@@ -4390,7 +4390,7 @@ static struct tep_print_arg *make_bprint_args(char *fmt, void *data, int size, s 


static char *

get_bprint_format(void *data, int size __maybe_unused,

		  struct tep_event_format *event)

		  struct tep_event *event)

{

	struct tep_handle *pevent = event->pevent;

	unsigned long long addr;
@@ -4425,7 +4425,7 @@ get_bprint_format(void *data, int size __maybe_unused, 
}



static void print_mac_arg(struct trace_seq *s, int mac, void *data, int size,

			  struct tep_event_format *event, struct tep_print_arg *arg)

			  struct tep_event *event, struct tep_print_arg *arg)

{

	unsigned char *buf;

	const char *fmt = "%.2x:%.2x:%.2x:%.2x:%.2x:%.2x";
@@ -4578,7 +4578,7 @@ static void print_ip6_addr(struct trace_seq *s, char i, unsigned char *buf) 
 * %pISpc print an IP address based on sockaddr; p adds port.

 */

static int print_ipv4_arg(struct trace_seq *s, const char *ptr, char i,

			  void *data, int size, struct tep_event_format *event,

			  void *data, int size, struct tep_event *event,

			  struct tep_print_arg *arg)

{

	unsigned char *buf;
@@ -4615,7 +4615,7 @@ static int print_ipv4_arg(struct trace_seq *s, const char *ptr, char i, 
}



static int print_ipv6_arg(struct trace_seq *s, const char *ptr, char i,

			  void *data, int size, struct tep_event_format *event,

			  void *data, int size, struct tep_event *event,

			  struct tep_print_arg *arg)

{

	char have_c = 0;
@@ -4665,7 +4665,7 @@ static int print_ipv6_arg(struct trace_seq *s, const char *ptr, char i, 
}



static int print_ipsa_arg(struct trace_seq *s, const char *ptr, char i,

			  void *data, int size, struct tep_event_format *event,

			  void *data, int size, struct tep_event *event,

			  struct tep_print_arg *arg)

{

	char have_c = 0, have_p = 0;
@@ -4747,7 +4747,7 @@ static int print_ipsa_arg(struct trace_seq *s, const char *ptr, char i, 
}



static int print_ip_arg(struct trace_seq *s, const char *ptr,

			void *data, int size, struct tep_event_format *event,

			void *data, int size, struct tep_event *event,

			struct tep_print_arg *arg)

{

	char i = *ptr;  /* 'i' or 'I' */
@@ -4854,7 +4854,7 @@ void tep_print_field(struct trace_seq *s, void *data, 
}



void tep_print_fields(struct trace_seq *s, void *data,

		      int size __maybe_unused, struct tep_event_format *event)

		      int size __maybe_unused, struct tep_event *event)

{

	struct tep_format_field *field;
@@ -4866,7 +4866,7 @@ void tep_print_fields(struct trace_seq *s, void *data, 
	}

}



static void pretty_print(struct trace_seq *s, void *data, int size, struct tep_event_format *event)

static void pretty_print(struct trace_seq *s, void *data, int size, struct tep_event *event)

{

	struct tep_handle *pevent = event->pevent;

	struct tep_print_fmt *print_fmt = &event->print_fmt;
@@ -5229,7 +5229,7 @@ int tep_data_type(struct tep_handle *pevent, struct tep_record *rec) 
 *

 * This returns the event form a given @type;

 */

struct tep_event_format *tep_data_event_from_type(struct tep_handle *pevent, int type)

struct tep_event *tep_data_event_from_type(struct tep_handle *pevent, int type)

{

	return tep_find_event(pevent, type);

}
@@ -5387,7 +5387,7 @@ int tep_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 tep_event_info(struct trace_seq *s, struct tep_event_format *event,

void tep_event_info(struct trace_seq *s, struct tep_event *event,

		    struct tep_record *record)

{

	int print_pretty = 1;
@@ -5428,7 +5428,7 @@ static bool is_timestamp_in_us(char *trace_clock, bool use_trace_clock) 
 * Returns the associated event for a given record, or NULL if non is

 * is found.

 */

struct tep_event_format *

struct tep_event *

tep_find_event_by_record(struct tep_handle *pevent, struct tep_record *record)

{

	int type;
@@ -5453,7 +5453,7 @@ tep_find_event_by_record(struct tep_handle *pevent, struct tep_record *record) 
 * Writes the tasks comm, pid and CPU to @s.

 */

void tep_print_event_task(struct tep_handle *pevent, struct trace_seq *s,

			  struct tep_event_format *event,

			  struct tep_event *event,

			  struct tep_record *record)

{

	void *data = record->data;
@@ -5481,7 +5481,7 @@ void tep_print_event_task(struct tep_handle *pevent, struct trace_seq *s, 
 * Writes the timestamp of the record into @s.

 */

void tep_print_event_time(struct tep_handle *pevent, struct trace_seq *s,

			  struct tep_event_format *event,

			  struct tep_event *event,

			  struct tep_record *record,

			  bool use_trace_clock)

{
@@ -5531,7 +5531,7 @@ void tep_print_event_time(struct tep_handle *pevent, struct trace_seq *s, 
 * Writes the parsing of the record's data to @s.

 */

void tep_print_event_data(struct tep_handle *pevent, struct trace_seq *s,

			  struct tep_event_format *event,

			  struct tep_event *event,

			  struct tep_record *record)

{

	static const char *spaces = "                    "; /* 20 spaces */
@@ -5550,7 +5550,7 @@ void tep_print_event_data(struct tep_handle *pevent, struct trace_seq *s, 
void tep_print_event(struct tep_handle *pevent, struct trace_seq *s,

		     struct tep_record *record, bool use_trace_clock)

{

	struct tep_event_format *event;

	struct tep_event *event;



	event = tep_find_event_by_record(pevent, record);

	if (!event) {
@@ -5572,8 +5572,8 @@ void tep_print_event(struct tep_handle *pevent, struct trace_seq *s, 


static int events_id_cmp(const void *a, const void *b)

{

	struct tep_event_format * const * ea = a;

	struct tep_event_format * const * eb = b;

	struct tep_event * const * ea = a;

	struct tep_event * const * eb = b;



	if ((*ea)->id < (*eb)->id)

		return -1;
@@ -5586,8 +5586,8 @@ static int events_id_cmp(const void *a, const void *b) 


static int events_name_cmp(const void *a, const void *b)

{

	struct tep_event_format * const * ea = a;

	struct tep_event_format * const * eb = b;

	struct tep_event * const * ea = a;

	struct tep_event * const * eb = b;

	int res;



	res = strcmp((*ea)->name, (*eb)->name);
@@ -5603,8 +5603,8 @@ static int events_name_cmp(const void *a, const void *b) 


static int events_system_cmp(const void *a, const void *b)

{

	struct tep_event_format * const * ea = a;

	struct tep_event_format * const * eb = b;

	struct tep_event * const * ea = a;

	struct tep_event * const * eb = b;

	int res;



	res = strcmp((*ea)->system, (*eb)->system);
@@ -5618,9 +5618,9 @@ static int events_system_cmp(const void *a, const void *b) 
	return events_id_cmp(a, b);

}



struct tep_event_format **tep_list_events(struct tep_handle *pevent, enum tep_event_sort_type sort_type)

struct tep_event **tep_list_events(struct tep_handle *pevent, enum tep_event_sort_type sort_type)

{

	struct tep_event_format **events;

	struct tep_event **events;

	int (*sort)(const void *a, const void *b);



	events = pevent->sort_events;
@@ -5703,7 +5703,7 @@ get_event_fields(const char *type, const char *name, 
 * Returns an allocated array of fields. The last item in the array is NULL.

 * The array must be freed with free().

 */

struct tep_format_field **tep_event_common_fields(struct tep_event_format *event)

struct tep_format_field **tep_event_common_fields(struct tep_event *event)

{

	return get_event_fields("common", event->name,

				event->format.nr_common,
@@ -5717,7 +5717,7 @@ struct tep_format_field **tep_event_common_fields(struct tep_event_format *event 
 * Returns an allocated array of fields. The last item in the array is NULL.

 * The array must be freed with free().

 */

struct tep_format_field **tep_event_fields(struct tep_event_format *event)

struct tep_format_field **tep_event_fields(struct tep_event *event)

{

	return get_event_fields("event", event->name,

				event->format.nr_fields,
@@ -5959,7 +5959,7 @@ int tep_parse_header_page(struct tep_handle *pevent, char *buf, unsigned long si 
	return 0;

}



static int event_matches(struct tep_event_format *event,

static int event_matches(struct tep_event *event,

			 int id, const char *sys_name,

			 const char *event_name)

{
@@ -5982,7 +5982,7 @@ static void free_handler(struct event_handler *handle) 
	free(handle);

}



static int find_event_handle(struct tep_handle *pevent, struct tep_event_format *event)

static int find_event_handle(struct tep_handle *pevent, struct tep_event *event)

{

	struct event_handler *handle, **next;
@@ -6023,11 +6023,11 @@ static int find_event_handle(struct tep_handle *pevent, struct tep_event_format 
 *

 * /sys/kernel/debug/tracing/events/.../.../format

 */

enum tep_errno __tep_parse_format(struct tep_event_format **eventp,

enum tep_errno __tep_parse_format(struct tep_event **eventp,

				  struct tep_handle *pevent, const char *buf,

				  unsigned long size, const char *sys)

{

	struct tep_event_format *event;

	struct tep_event *event;

	int ret;



	init_input_buf(buf, size);
@@ -6132,12 +6132,12 @@ enum tep_errno __tep_parse_format(struct tep_event_format **eventp, 


static enum tep_errno

__parse_event(struct tep_handle *pevent,

	      struct tep_event_format **eventp,

	      struct tep_event **eventp,

	      const char *buf, unsigned long size,

	      const char *sys)

{

	int ret = __tep_parse_format(eventp, pevent, buf, size, sys);

	struct tep_event_format *event = *eventp;

	struct tep_event *event = *eventp;



	if (event == NULL)

		return ret;
@@ -6174,7 +6174,7 @@ __parse_event(struct tep_handle *pevent, 
 * /sys/kernel/debug/tracing/events/.../.../format

 */

enum tep_errno tep_parse_format(struct tep_handle *pevent,

				struct tep_event_format **eventp,

				struct tep_event **eventp,

				const char *buf,

				unsigned long size, const char *sys)

{
@@ -6198,7 +6198,7 @@ enum tep_errno tep_parse_format(struct tep_handle *pevent, 
enum tep_errno tep_parse_event(struct tep_handle *pevent, const char *buf,

			       unsigned long size, const char *sys)

{

	struct tep_event_format *event = NULL;

	struct tep_event *event = NULL;

	return __parse_event(pevent, &event, buf, size, sys);

}
@@ -6235,7 +6235,7 @@ int get_field_val(struct trace_seq *s, struct tep_format_field *field, 
 *

 * On failure, it returns NULL.

 */

void *tep_get_field_raw(struct trace_seq *s, struct tep_event_format *event,

void *tep_get_field_raw(struct trace_seq *s, struct tep_event *event,

			const char *name, struct tep_record *record,

			int *len, int err)

{
@@ -6282,7 +6282,7 @@ void *tep_get_field_raw(struct trace_seq *s, struct tep_event_format *event, 
 *

 * Returns 0 on success -1 on field not found.

 */

int tep_get_field_val(struct trace_seq *s, struct tep_event_format *event,

int tep_get_field_val(struct trace_seq *s, struct tep_event *event,

		      const char *name, struct tep_record *record,

		      unsigned long long *val, int err)

{
@@ -6307,7 +6307,7 @@ int tep_get_field_val(struct trace_seq *s, struct tep_event_format *event, 
 *

 * Returns 0 on success -1 on field not found.

 */

int tep_get_common_field_val(struct trace_seq *s, struct tep_event_format *event,

int tep_get_common_field_val(struct trace_seq *s, struct tep_event *event,

			     const char *name, struct tep_record *record,

			     unsigned long long *val, int err)

{
@@ -6332,7 +6332,7 @@ int tep_get_common_field_val(struct trace_seq *s, struct tep_event_format *event 
 *

 * Returns 0 on success -1 on field not found.

 */

int tep_get_any_field_val(struct trace_seq *s, struct tep_event_format *event,

int tep_get_any_field_val(struct trace_seq *s, struct tep_event *event,

			  const char *name, struct tep_record *record,

			  unsigned long long *val, int err)

{
@@ -6358,7 +6358,7 @@ int tep_get_any_field_val(struct trace_seq *s, struct tep_event_format *event, 
 * Returns: 0 on success, -1 field not found, or 1 if buffer is full.

 */

int tep_print_num_field(struct trace_seq *s, const char *fmt,

			struct tep_event_format *event, const char *name,

			struct tep_event *event, const char *name,

			struct tep_record *record, int err)

{

	struct tep_format_field *field = tep_find_field(event, name);
@@ -6390,7 +6390,7 @@ int tep_print_num_field(struct trace_seq *s, const char *fmt, 
 * Returns: 0 on success, -1 field not found, or 1 if buffer is full.

 */

int tep_print_func_field(struct trace_seq *s, const char *fmt,

			 struct tep_event_format *event, const char *name,

			 struct tep_event *event, const char *name,

			 struct tep_record *record, int err)

{

	struct tep_format_field *field = tep_find_field(event, name);
@@ -6550,11 +6550,11 @@ int tep_unregister_print_function(struct tep_handle *pevent, 
	return -1;

}



static struct tep_event_format *search_event(struct tep_handle *pevent, int id,

static struct tep_event *search_event(struct tep_handle *pevent, int id,

				      const char *sys_name,

				      const char *event_name)

{

	struct tep_event_format *event;

	struct tep_event *event;



	if (id >= 0) {

		/* search by id */
@@ -6594,7 +6594,7 @@ int tep_register_event_handler(struct tep_handle *pevent, int id, 
			       const char *sys_name, const char *event_name,

			       tep_event_handler_func func, void *context)

{

	struct tep_event_format *event;

	struct tep_event *event;

	struct event_handler *handle;



	event = search_event(pevent, id, sys_name, event_name);
@@ -6678,7 +6678,7 @@ int tep_unregister_event_handler(struct tep_handle *pevent, int id, 
				 const char *sys_name, const char *event_name,

				 tep_event_handler_func func, void *context)

{

	struct tep_event_format *event;

	struct tep_event *event;

	struct event_handler *handle;

	struct event_handler **next;
@@ -6763,7 +6763,7 @@ static void free_formats(struct tep_format *format) 
	free_format_fields(format->fields);

}



void tep_free_format(struct tep_event_format *event)

void tep_free_format(struct tep_event *event)

{

	free(event->name);

	free(event->system);

tools/lib/traceevent/event-parse.h

+31 −31

File changed.

Preview size limit exceeded, changes collapsed.

tools/lib/traceevent/parse-filter.c

+21 −21

File changed.

Preview size limit exceeded, changes collapsed.