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

Commit be45d40e authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

tools lib traceevent: Factor out and export print_event_field[s]() 



The print_event_field() and print_event_fields() functions print basic
information of a given field or event without the print format.  They'll
be used by dynamic sort keys later.

Committer note:

Rename it to pevent_print_field[s]() to get proper namespacing, as
discussed with Steven Rostedt.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Acked-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1450876121-22494-1-git-send-email-namhyung@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 72392834

tools/lib/traceevent/event-parse.c

+68 −61
Original line number Diff line number Diff line
@@ -4735,22 +4735,18 @@ static int is_printable_array(char *p, unsigned int len) 
	return 1;

}



static void print_event_fields(struct trace_seq *s, void *data,

			       int size __maybe_unused,

			       struct event_format *event)

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

			struct format_field *field)

{

	struct format_field *field;

	unsigned long long val;

	unsigned int offset, len, i;

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



	field = event->format.fields;

	while (field) {

		trace_seq_printf(s, " %s=", field->name);

	if (field->flags & FIELD_IS_ARRAY) {

		offset = field->offset;

		len = field->size;

		if (field->flags & FIELD_IS_DYNAMIC) {

				val = pevent_read_number(event->pevent, data + offset, len);

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

			offset = val;

			len = offset >> 16;

			offset &= 0xffff;
@@ -4770,7 +4766,7 @@ static void print_event_fields(struct trace_seq *s, void *data, 
			field->flags &= ~FIELD_IS_STRING;

		}

	} else {

			val = pevent_read_number(event->pevent, data + field->offset,

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

					 field->size);

		if (field->flags & FIELD_IS_POINTER) {

			trace_seq_printf(s, "0x%llx", val);
@@ -4802,6 +4798,17 @@ static void print_event_fields(struct trace_seq *s, void *data, 
				trace_seq_printf(s, "%llu", val);

		}

	}

}



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

			 int size __maybe_unused, struct event_format *event)

{

	struct format_field *field;



	field = event->format.fields;

	while (field) {

		trace_seq_printf(s, " %s=", field->name);

		pevent_print_field(s, data, field);

		field = field->next;

	}

}
@@ -4827,7 +4834,7 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event 


	if (event->flags & EVENT_FL_FAILED) {

		trace_seq_printf(s, "[FAILED TO PARSE]");

		print_event_fields(s, data, size, event);

		pevent_print_fields(s, data, size, event);

		return;

	}
@@ -5301,7 +5308,7 @@ void pevent_event_info(struct trace_seq *s, struct event_format *event, 
	int print_pretty = 1;



	if (event->pevent->print_raw || (event->flags & EVENT_FL_PRINTRAW))

		print_event_fields(s, record->data, record->size, event);

		pevent_print_fields(s, record->data, record->size, event);

	else {



		if (event->handler && !(event->flags & EVENT_FL_NOHANDLE))

tools/lib/traceevent/event-parse.h

+4 −0
Original line number Diff line number Diff line
@@ -705,6 +705,10 @@ struct cmdline *pevent_data_pid_from_comm(struct pevent *pevent, const char *com 
					  struct cmdline *next);

int pevent_cmdline_pid(struct pevent *pevent, struct cmdline *cmdline);



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,

		       struct pevent_record *record);

int pevent_strerror(struct pevent *pevent, enum pevent_errno errnum,