Commit 2292083f authored by Alexey Bayduraev's avatar Alexey Bayduraev Committed by Arnaldo Carvalho de Melo
Browse files

perf report: Output data file name in raw trace dump 



Print path and name of a data file into raw dump (-D)
<file_offset>@<path/file>:

  0x2226a@perf.data [0x30]: event: 9
or
  0x15cc36@perf.data/data.7 [0x30]: event: 9

Reviewed-by: default avatarRiccardo Mancini <rickyman7@gmail.com>
Signed-off-by: default avatarAlexey Bayduraev <alexey.v.bayduraev@linux.intel.com>
Tested-by: default avatarJiri Olsa <jolsa@kernel.org>
Tested-by: default avatarRiccardo Mancini <rickyman7@gmail.com>
Acked-by: default avatarAndi Kleen <ak@linux.intel.com>
Acked-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Antonov <alexander.antonov@linux.intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexei Budankov <abudankov@huawei.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/e8378fd4910c10751b001be880705653989283c2.1642440724.git.alexey.v.bayduraev@linux.intel.com


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

tools/perf/builtin-inject.c

+2 −1
Original line number Diff line number Diff line
@@ -111,7 +111,8 @@ static int perf_event__repipe_op2_synth(struct perf_session *session, 


static int perf_event__repipe_op4_synth(struct perf_session *session,

					union perf_event *event,

					u64 data __maybe_unused)

					u64 data __maybe_unused,

					const char *str __maybe_unused)

{

	return perf_event__repipe_synth(session->tool, event);

}

tools/perf/builtin-kvm.c

+1 −1
Original line number Diff line number Diff line
@@ -771,7 +771,7 @@ static s64 perf_kvm__mmap_read_idx(struct perf_kvm_stat *kvm, int idx, 
			return -1;

		}



		err = perf_session__queue_event(kvm->session, event, timestamp, 0);

		err = perf_session__queue_event(kvm->session, event, timestamp, 0, NULL);

		/*

		 * FIXME: Here we can't consume the event, as perf_session__queue_event will

		 *        point to it, and it'll get possibly overwritten by the kernel.

tools/perf/builtin-top.c

+1 −1
Original line number Diff line number Diff line
@@ -888,7 +888,7 @@ static void perf_top__mmap_read_idx(struct perf_top *top, int idx) 
		if (ret && ret != -1)

			break;



		ret = ordered_events__queue(top->qe.in, event, last_timestamp, 0);

		ret = ordered_events__queue(top->qe.in, event, last_timestamp, 0, NULL);

		if (ret)

			break;

tools/perf/builtin-trace.c

+1 −1
Original line number Diff line number Diff line
@@ -3782,7 +3782,7 @@ static int trace__deliver_event(struct trace *trace, union perf_event *event) 
	if (err && err != -1)

		return err;



	err = ordered_events__queue(&trace->oe.data, event, trace->oe.last, 0);

	err = ordered_events__queue(&trace->oe.data, event, trace->oe.last, 0, NULL);

	if (err)

		return err;

tools/perf/util/ordered-events.c

+2 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ void ordered_events__delete(struct ordered_events *oe, struct ordered_event *eve 
}



int ordered_events__queue(struct ordered_events *oe, union perf_event *event,

			  u64 timestamp, u64 file_offset)

			  u64 timestamp, u64 file_offset, const char *file_path)

{

	struct ordered_event *oevent;
@@ -217,6 +217,7 @@ int ordered_events__queue(struct ordered_events *oe, union perf_event *event, 
		return -ENOMEM;



	oevent->file_offset = file_offset;

	oevent->file_path = file_path;

	return 0;

}