Commit e6001980 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf trace: Introduce function to set the base timestamp 

That is used in both live runs, i.e.:

  # trace ls

As when processing events recorded in a perf.data file:

  # trace -i perf.data

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Milian Wolff <milian.wolff@kdab.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-901l6yebnzeqg7z8mbaf49xb@git.kernel.org


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

tools/perf/builtin-trace.c

+11 −5
Original line number Diff line number Diff line
@@ -2400,6 +2400,14 @@ static bool skip_sample(struct trace *trace, struct perf_sample *sample) 
	return false;

}



static void trace__set_base_time(struct trace *trace,

				 struct perf_evsel *evsel __maybe_unused,

				 struct perf_sample *sample)

{

	if (trace->base_time == 0 && !trace->full_time)

		trace->base_time = sample->time;

}



static int trace__process_sample(struct perf_tool *tool,

				 union perf_event *event,

				 struct perf_sample *sample,
@@ -2414,8 +2422,7 @@ static int trace__process_sample(struct perf_tool *tool, 
	if (skip_sample(trace, sample))

		return 0;



	if (!trace->full_time && trace->base_time == 0)

		trace->base_time = sample->time;

	trace__set_base_time(trace, evsel, sample);



	if (handler) {

		++trace->nr_events;
@@ -2553,9 +2560,6 @@ static void trace__handle_event(struct trace *trace, union perf_event *event, st 
	const u32 type = event->header.type;

	struct perf_evsel *evsel;



	if (!trace->full_time && trace->base_time == 0)

		trace->base_time = sample->time;



	if (type != PERF_RECORD_SAMPLE) {

		trace__process_event(trace, trace->host, event, sample);

		return;
@@ -2567,6 +2571,8 @@ static void trace__handle_event(struct trace *trace, union perf_event *event, st 
		return;

	}



	trace__set_base_time(trace, evsel, sample);



	if (evsel->attr.type == PERF_TYPE_TRACEPOINT &&

	    sample->raw_data == NULL) {

		fprintf(trace->output, "%s sample with no payload for tid: %d, cpu %d, raw_size=%d, skipping...\n",

CRA Git | Maintained and supported by SUSTech CRA and CCSE