Commit bb39ccb2 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 format_flags to enum tep_format_flags 



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_". This renames enum format_flags
to enum tep_format_flags and adds prefix TEP_ to all of its members.

Signed-off-by: default avatarTzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
Cc: linux-trace-devel@vger.kernel.org
Link: http://lkml.kernel.org/r/20180919185722.803127871@goodmis.org


Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 2c92f982

tools/lib/traceevent/event-parse.c

+24 −24
Original line number Diff line number Diff line
@@ -1301,7 +1301,7 @@ static int event_read_id(void) 


static int field_is_string(struct tep_format_field *field)

{

	if ((field->flags & FIELD_IS_ARRAY) &&

	if ((field->flags & TEP_FIELD_IS_ARRAY) &&

	    (strstr(field->type, "char") || strstr(field->type, "u8") ||

	     strstr(field->type, "s8")))

		return 1;
@@ -1328,7 +1328,7 @@ static int field_is_long(struct tep_format_field *field) 


static unsigned int type_size(const char *name)

{

	/* This covers all FIELD_IS_STRING types. */

	/* This covers all TEP_FIELD_IS_STRING types. */

	static struct {

		const char *type;

		unsigned int size;
@@ -1416,7 +1416,7 @@ static int event_read_fields(struct tep_event_format *event, struct tep_format_f 
			     type == EVENT_OP && strcmp(token, ".") == 0)) {



				if (strcmp(token, "*") == 0)

					field->flags |= FIELD_IS_POINTER;

					field->flags |= TEP_FIELD_IS_POINTER;



				if (field->type) {

					char *new_type;
@@ -1455,7 +1455,7 @@ static int event_read_fields(struct tep_event_format *event, struct tep_format_f 
			char *new_brackets;

			int len;



			field->flags |= FIELD_IS_ARRAY;

			field->flags |= TEP_FIELD_IS_ARRAY;



			type = read_token(&token);
@@ -1544,11 +1544,11 @@ static int event_read_fields(struct tep_event_format *event, struct tep_format_f 
		}



		if (field_is_string(field))

			field->flags |= FIELD_IS_STRING;

			field->flags |= TEP_FIELD_IS_STRING;

		if (field_is_dynamic(field))

			field->flags |= FIELD_IS_DYNAMIC;

			field->flags |= TEP_FIELD_IS_DYNAMIC;

		if (field_is_long(field))

			field->flags |= FIELD_IS_LONG;

			field->flags |= TEP_FIELD_IS_LONG;



		if (test_type_token(type, token,  EVENT_OP, ";"))

			goto fail;
@@ -1597,7 +1597,7 @@ static int event_read_fields(struct tep_event_format *event, struct tep_format_f 
				goto fail;



			if (strtoul(token, NULL, 0))

				field->flags |= FIELD_IS_SIGNED;

				field->flags |= TEP_FIELD_IS_SIGNED;



			free_token(token);

			if (read_expected(EVENT_OP, ";") < 0)
@@ -1609,14 +1609,14 @@ static int event_read_fields(struct tep_event_format *event, struct tep_format_f 


		free_token(token);



		if (field->flags & FIELD_IS_ARRAY) {

		if (field->flags & TEP_FIELD_IS_ARRAY) {

			if (field->arraylen)

				field->elementsize = field->size / field->arraylen;

			else if (field->flags & FIELD_IS_DYNAMIC)

			else if (field->flags & TEP_FIELD_IS_DYNAMIC)

				field->elementsize = size_dynamic;

			else if (field->flags & FIELD_IS_STRING)

			else if (field->flags & TEP_FIELD_IS_STRING)

				field->elementsize = 1;

			else if (field->flags & FIELD_IS_LONG)

			else if (field->flags & TEP_FIELD_IS_LONG)

				field->elementsize = event->pevent ?

						     event->pevent->long_size :

						     sizeof(long);
@@ -2089,11 +2089,11 @@ process_entry(struct tep_event_format *event __maybe_unused, struct print_arg *a 


	if (is_flag_field) {

		arg->field.field = tep_find_any_field(event, arg->field.name);

		arg->field.field->flags |= FIELD_IS_FLAG;

		arg->field.field->flags |= TEP_FIELD_IS_FLAG;

		is_flag_field = 0;

	} else if (is_symbolic_field) {

		arg->field.field = tep_find_any_field(event, arg->field.name);

		arg->field.field->flags |= FIELD_IS_SYMBOLIC;

		arg->field.field->flags |= TEP_FIELD_IS_SYMBOLIC;

		is_symbolic_field = 0;

	}
@@ -3901,7 +3901,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size, 
		 * and the size is the same as long_size, assume that it

		 * is a pointer.

		 */

		if (!(field->flags & FIELD_IS_ARRAY) &&

		if (!(field->flags & TEP_FIELD_IS_ARRAY) &&

		    field->size == pevent->long_size) {



			/* Handle heterogeneous recording and processing
@@ -4794,16 +4794,16 @@ void tep_print_field(struct trace_seq *s, void *data, 
	unsigned int offset, len, i;

	struct tep_handle *pevent = field->event->pevent;



	if (field->flags & FIELD_IS_ARRAY) {

	if (field->flags & TEP_FIELD_IS_ARRAY) {

		offset = field->offset;

		len = field->size;

		if (field->flags & FIELD_IS_DYNAMIC) {

		if (field->flags & TEP_FIELD_IS_DYNAMIC) {

			val = tep_read_number(pevent, data + offset, len);

			offset = val;

			len = offset >> 16;

			offset &= 0xffff;

		}

		if (field->flags & FIELD_IS_STRING &&

		if (field->flags & TEP_FIELD_IS_STRING &&

		    is_printable_array(data + offset, len)) {

			trace_seq_printf(s, "%s", (char *)data + offset);

		} else {
@@ -4815,21 +4815,21 @@ void tep_print_field(struct trace_seq *s, void *data, 
						 *((unsigned char *)data + offset + i));

			}

			trace_seq_putc(s, ']');

			field->flags &= ~FIELD_IS_STRING;

			field->flags &= ~TEP_FIELD_IS_STRING;

		}

	} else {

		val = tep_read_number(pevent, data + field->offset,

				      field->size);

		if (field->flags & FIELD_IS_POINTER) {

		if (field->flags & TEP_FIELD_IS_POINTER) {

			trace_seq_printf(s, "0x%llx", val);

		} else if (field->flags & FIELD_IS_SIGNED) {

		} else if (field->flags & TEP_FIELD_IS_SIGNED) {

			switch (field->size) {

			case 4:

				/*

				 * If field is long then print it in hex.

				 * A long usually stores pointers.

				 */

				if (field->flags & FIELD_IS_LONG)

				if (field->flags & TEP_FIELD_IS_LONG)

					trace_seq_printf(s, "0x%x", (int)val);

				else

					trace_seq_printf(s, "%d", (int)val);
@@ -4844,7 +4844,7 @@ void tep_print_field(struct trace_seq *s, void *data, 
				trace_seq_printf(s, "%lld", val);

			}

		} else {

			if (field->flags & FIELD_IS_LONG)

			if (field->flags & TEP_FIELD_IS_LONG)

				trace_seq_printf(s, "0x%llx", val);

			else

				trace_seq_printf(s, "%llu", val);
@@ -6288,7 +6288,7 @@ void *tep_get_field_raw(struct trace_seq *s, struct tep_event_format *event, 
		len = &dummy;



	offset = field->offset;

	if (field->flags & FIELD_IS_DYNAMIC) {

	if (field->flags & TEP_FIELD_IS_DYNAMIC) {

		offset = tep_read_number(event->pevent,

					    data + offset, field->size);

		*len = offset >> 16;

tools/lib/traceevent/event-parse.h

+9 −9
Original line number Diff line number Diff line
@@ -130,15 +130,15 @@ struct tep_plugin_option { 
#define TEP_PLUGIN_OPTIONS_NAME MAKE_STR(TEP_PLUGIN_OPTIONS)

#define TEP_PLUGIN_ALIAS_NAME MAKE_STR(TEP_PLUGIN_ALIAS)



enum format_flags {

	FIELD_IS_ARRAY		= 1,

	FIELD_IS_POINTER	= 2,

	FIELD_IS_SIGNED		= 4,

	FIELD_IS_STRING		= 8,

	FIELD_IS_DYNAMIC	= 16,

	FIELD_IS_LONG		= 32,

	FIELD_IS_FLAG		= 64,

	FIELD_IS_SYMBOLIC	= 128,

enum tep_format_flags {

	TEP_FIELD_IS_ARRAY	= 1,

	TEP_FIELD_IS_POINTER	= 2,

	TEP_FIELD_IS_SIGNED	= 4,

	TEP_FIELD_IS_STRING	= 8,

	TEP_FIELD_IS_DYNAMIC	= 16,

	TEP_FIELD_IS_LONG	= 32,

	TEP_FIELD_IS_FLAG	= 64,

	TEP_FIELD_IS_SYMBOLIC	= 128,

};



struct tep_format_field {

tools/lib/traceevent/parse-filter.c

+4 −4
Original line number Diff line number Diff line
@@ -1716,7 +1716,7 @@ get_value(struct tep_event_format *event, 


	tep_read_number_field(field, record->data, &val);



	if (!(field->flags & FIELD_IS_SIGNED))

	if (!(field->flags & TEP_FIELD_IS_SIGNED))

		return val;



	switch (field->size) {
@@ -1867,11 +1867,11 @@ static const char *get_field_str(struct filter_arg *arg, struct tep_record *reco 
	char hex[64];



	/* If the field is not a string convert it */

	if (arg->str.field->flags & FIELD_IS_STRING) {

	if (arg->str.field->flags & TEP_FIELD_IS_STRING) {

		val = record->data + arg->str.field->offset;

		size = arg->str.field->size;



		if (arg->str.field->flags & FIELD_IS_DYNAMIC) {

		if (arg->str.field->flags & TEP_FIELD_IS_DYNAMIC) {

			addr = *(unsigned int *)val;

			val = record->data + (addr & 0xffff);

			size = addr >> 16;
@@ -1893,7 +1893,7 @@ static const char *get_field_str(struct filter_arg *arg, struct tep_record *reco 
		pevent = event->pevent;

		addr = get_value(event, arg->str.field, record);



		if (arg->str.field->flags & (FIELD_IS_POINTER | FIELD_IS_LONG))

		if (arg->str.field->flags & (TEP_FIELD_IS_POINTER | TEP_FIELD_IS_LONG))

			/* convert to a kernel symbol */

			val = tep_find_function(pevent, addr);

tools/perf/builtin-trace.c

+1 −1
Original line number Diff line number Diff line
@@ -1293,7 +1293,7 @@ static int syscall__set_arg_fmts(struct syscall *sc) 
			  strcmp(field->name, "path") == 0 ||

			  strcmp(field->name, "pathname") == 0))

			sc->arg_fmt[idx].scnprintf = SCA_FILENAME;

		else if (field->flags & FIELD_IS_POINTER)

		else if (field->flags & TEP_FIELD_IS_POINTER)

			sc->arg_fmt[idx].scnprintf = syscall_arg__scnprintf_hex;

		else if (strcmp(field->type, "pid_t") == 0)

			sc->arg_fmt[idx].scnprintf = SCA_PID;

tools/perf/tests/evsel-tp-sched.c

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ static int perf_evsel__test_field(struct perf_evsel *evsel, const char *name, 
		return -1;

	}



	is_signed = !!(field->flags | FIELD_IS_SIGNED);

	is_signed = !!(field->flags | TEP_FIELD_IS_SIGNED);

	if (should_be_signed && !is_signed) {

		pr_debug("%s: \"%s\" signedness(%d) is wrong, should be %d\n",

			 evsel->name, name, is_signed, should_be_signed);

CRA Git | Maintained and supported by SUSTech CRA and CCSE