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

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

perf inject: Re-pipe AUX area tracing events 



New AUX area tracing events must be re-piped by default.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.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/1429608114-18194-1-git-send-email-adrian.hunter@intel.com


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

tools/perf/builtin-inject.c

+58 −5
Original line number Diff line number Diff line
@@ -38,14 +38,11 @@ struct event_entry { 
	union perf_event event[0];

};



static int perf_event__repipe_synth(struct perf_tool *tool,

				    union perf_event *event)

static int output_bytes(struct perf_inject *inject, void *buf, size_t sz)

{

	struct perf_inject *inject = container_of(tool, struct perf_inject, tool);

	ssize_t size;



	size = perf_data_file__write(&inject->output, event,

				     event->header.size);

	size = perf_data_file__write(&inject->output, buf, sz);

	if (size < 0)

		return -errno;
@@ -53,6 +50,34 @@ static int perf_event__repipe_synth(struct perf_tool *tool, 
	return 0;

}



static int copy_bytes(struct perf_inject *inject, int fd, off_t size)

{

	char buf[4096];

	ssize_t ssz;

	int ret;



	while (size > 0) {

		ssz = read(fd, buf, min(size, (off_t)sizeof(buf)));

		if (ssz < 0)

			return -errno;

		ret = output_bytes(inject, buf, ssz);

		if (ret)

			return ret;

		size -= ssz;

	}



	return 0;

}



static int perf_event__repipe_synth(struct perf_tool *tool,

				    union perf_event *event)

{

	struct perf_inject *inject = container_of(tool, struct perf_inject,

						  tool);



	return output_bytes(inject, event, event->header.size);

}



static int perf_event__repipe_oe_synth(struct perf_tool *tool,

				       union perf_event *event,

				       struct ordered_events *oe __maybe_unused)
@@ -86,6 +111,31 @@ static int perf_event__repipe_attr(struct perf_tool *tool, 
	return perf_event__repipe_synth(tool, event);

}



static s64 perf_event__repipe_auxtrace(struct perf_tool *tool,

				       union perf_event *event,

				       struct perf_session *session

				       __maybe_unused)

{

	struct perf_inject *inject = container_of(tool, struct perf_inject,

						  tool);

	int ret;



	if (perf_data_file__is_pipe(session->file) || !session->one_mmap) {

		ret = output_bytes(inject, event, event->header.size);

		if (ret < 0)

			return ret;

		ret = copy_bytes(inject, perf_data_file__fd(session->file),

				 event->auxtrace.size);

	} else {

		ret = output_bytes(inject, event,

				   event->header.size + event->auxtrace.size);

	}

	if (ret < 0)

		return ret;



	return event->auxtrace.size;

}



static int perf_event__repipe(struct perf_tool *tool,

			      union perf_event *event,

			      struct perf_sample *sample __maybe_unused,
@@ -413,6 +463,9 @@ int cmd_inject(int argc, const char **argv, const char *prefix __maybe_unused) 
			.unthrottle	= perf_event__repipe,

			.attr		= perf_event__repipe_attr,

			.tracing_data	= perf_event__repipe_op2_synth,

			.auxtrace_info	= perf_event__repipe_op2_synth,

			.auxtrace	= perf_event__repipe_auxtrace,

			.auxtrace_error	= perf_event__repipe_op2_synth,

			.finished_round	= perf_event__repipe_oe_synth,

			.build_id	= perf_event__repipe_op2_synth,

			.id_index	= perf_event__repipe_op2_synth,