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

Commit 0ad21f68 authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Add support for PERF_RECORD_ITRACE_START 



Add support for the PERF_RECORD_ITRACE_START event type.  This event can
be used to determine the pid and tid that are running when Instruction
Tracing starts.  Generally that information would come from a
sched_switch event but, at the start, no sched_switch events may yet
have been recorded.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1430404667-10593-8-git-send-email-adrian.hunter@intel.com


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

tools/perf/builtin-inject.c

+1 −0
Original line number Diff line number Diff line
@@ -559,6 +559,7 @@ int cmd_inject(int argc, const char **argv, const char *prefix __maybe_unused) 
			.exit		= perf_event__repipe,

			.lost		= perf_event__repipe,

			.aux		= perf_event__repipe,

			.itrace_start	= perf_event__repipe,

			.read		= perf_event__repipe_sample,

			.throttle	= perf_event__repipe,

			.unthrottle	= perf_event__repipe,

tools/perf/util/event.c

+18 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ static const char *perf_event__names[] = { 
	[PERF_RECORD_READ]			= "READ",

	[PERF_RECORD_SAMPLE]			= "SAMPLE",

	[PERF_RECORD_AUX]			= "AUX",

	[PERF_RECORD_ITRACE_START]		= "ITRACE_START",

	[PERF_RECORD_HEADER_ATTR]		= "ATTR",

	[PERF_RECORD_HEADER_EVENT_TYPE]		= "EVENT_TYPE",

	[PERF_RECORD_HEADER_TRACING_DATA]	= "TRACING_DATA",
@@ -704,6 +705,14 @@ int perf_event__process_aux(struct perf_tool *tool __maybe_unused, 
	return machine__process_aux_event(machine, event);

}



int perf_event__process_itrace_start(struct perf_tool *tool __maybe_unused,

				     union perf_event *event,

				     struct perf_sample *sample __maybe_unused,

				     struct machine *machine)

{

	return machine__process_itrace_start_event(machine, event);

}



size_t perf_event__fprintf_mmap(union perf_event *event, FILE *fp)

{

	return fprintf(fp, " %d/%d: [%#" PRIx64 "(%#" PRIx64 ") @ %#" PRIx64 "]: %c %s\n",
@@ -776,6 +785,12 @@ size_t perf_event__fprintf_aux(union perf_event *event, FILE *fp) 
		       event->aux.flags & PERF_AUX_FLAG_OVERWRITE ? "O" : "");

}



size_t perf_event__fprintf_itrace_start(union perf_event *event, FILE *fp)

{

	return fprintf(fp, " pid: %u tid: %u\n",

		       event->itrace_start.pid, event->itrace_start.tid);

}



size_t perf_event__fprintf(union perf_event *event, FILE *fp)

{

	size_t ret = fprintf(fp, "PERF_RECORD_%s",
@@ -798,6 +813,9 @@ size_t perf_event__fprintf(union perf_event *event, FILE *fp) 
	case PERF_RECORD_AUX:

		ret += perf_event__fprintf_aux(event, fp);

		break;

	case PERF_RECORD_ITRACE_START:

		ret += perf_event__fprintf_itrace_start(event, fp);

		break;

	default:

		ret += fprintf(fp, "\n");

	}

tools/perf/util/event.h

+11 −0
Original line number Diff line number Diff line
@@ -330,6 +330,11 @@ struct aux_event { 
	u64	flags;

};



struct itrace_start_event {

	struct perf_event_header header;

	u32 pid, tid;

};



union perf_event {

	struct perf_event_header	header;

	struct mmap_event		mmap;
@@ -349,6 +354,7 @@ union perf_event { 
	struct auxtrace_event		auxtrace;

	struct auxtrace_error_event	auxtrace_error;

	struct aux_event		aux;

	struct itrace_start_event	itrace_start;

};



void perf_event__print_totals(void);
@@ -388,6 +394,10 @@ int perf_event__process_aux(struct perf_tool *tool, 
			    union perf_event *event,

			    struct perf_sample *sample,

			    struct machine *machine);

int perf_event__process_itrace_start(struct perf_tool *tool,

				     union perf_event *event,

				     struct perf_sample *sample,

				     struct machine *machine);

int perf_event__process_mmap(struct perf_tool *tool,

			     union perf_event *event,

			     struct perf_sample *sample,
@@ -446,6 +456,7 @@ size_t perf_event__fprintf_mmap(union perf_event *event, FILE *fp); 
size_t perf_event__fprintf_mmap2(union perf_event *event, FILE *fp);

size_t perf_event__fprintf_task(union perf_event *event, FILE *fp);

size_t perf_event__fprintf_aux(union perf_event *event, FILE *fp);

size_t perf_event__fprintf_itrace_start(union perf_event *event, FILE *fp);

size_t perf_event__fprintf(union perf_event *event, FILE *fp);



u64 kallsyms__get_function_start(const char *kallsyms_filename,

tools/perf/util/machine.c

+11 −0
Original line number Diff line number Diff line
@@ -494,6 +494,14 @@ int machine__process_aux_event(struct machine *machine __maybe_unused, 
	return 0;

}



int machine__process_itrace_start_event(struct machine *machine __maybe_unused,

					union perf_event *event)

{

	if (dump_trace)

		perf_event__fprintf_itrace_start(event, stdout);

	return 0;

}



struct map *machine__new_module(struct machine *machine, u64 start,

				const char *filename)

{
@@ -1341,6 +1349,9 @@ int machine__process_event(struct machine *machine, union perf_event *event, 
		ret = machine__process_lost_event(machine, event, sample); break;

	case PERF_RECORD_AUX:

		ret = machine__process_aux_event(machine, event); break;

	case PERF_RECORD_ITRACE_START:

		ret = machine__process_itrace_start_event(machine, event);

		break;

	default:

		ret = -1;

		break;

tools/perf/util/machine.h

+2 −0
Original line number Diff line number Diff line
@@ -83,6 +83,8 @@ int machine__process_lost_event(struct machine *machine, union perf_event *event 
				struct perf_sample *sample);

int machine__process_aux_event(struct machine *machine,

			       union perf_event *event);

int machine__process_itrace_start_event(struct machine *machine,

					union perf_event *event);

int machine__process_mmap_event(struct machine *machine, union perf_event *event,

				struct perf_sample *sample);

int machine__process_mmap2_event(struct machine *machine, union perf_event *event,