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

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

perf intel-pt: Adjust overlap-checking to support sampling mode 



Adjust overlap-checking to support sampling mode.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: http://lkml.kernel.org/r/1520431349-30689-10-git-send-email-adrian.hunter@intel.com


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

tools/perf/util/intel-pt.c

+4 −3
Original line number Diff line number Diff line
@@ -230,6 +230,7 @@ static int intel_pt_get_trace(struct intel_pt_buffer *b, void *data) 
	struct auxtrace_buffer *buffer = ptq->buffer;

	struct auxtrace_buffer *old_buffer = ptq->old_buffer;

	struct auxtrace_queue *queue;

	bool might_overlap;



	if (ptq->stop) {

		b->len = 0;
@@ -256,7 +257,8 @@ static int intel_pt_get_trace(struct intel_pt_buffer *b, void *data) 
			return -ENOMEM;

	}



	if (ptq->pt->snapshot_mode && !buffer->consecutive && old_buffer &&

	might_overlap = ptq->pt->snapshot_mode || ptq->pt->sampling_mode;

	if (might_overlap && !buffer->consecutive && old_buffer &&

	    intel_pt_do_fix_overlap(ptq->pt, old_buffer, buffer))

		return -ENOMEM;
@@ -269,8 +271,7 @@ static int intel_pt_get_trace(struct intel_pt_buffer *b, void *data) 
	}

	b->ref_timestamp = buffer->reference;



	if (!old_buffer || ptq->pt->sampling_mode || (ptq->pt->snapshot_mode &&

						      !buffer->consecutive)) {

	if (!old_buffer || (might_overlap && !buffer->consecutive)) {

		b->consecutive = false;

		b->trace_nr = buffer->buffer_nr + 1;

	} else {