From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756325AbbE2NhV (ORCPT ); Fri, 29 May 2015 09:37:21 -0400 Received: from mga03.intel.com ([134.134.136.65]:46121 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756195AbbE2Ngg (ORCPT ); Fri, 29 May 2015 09:36:36 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,517,1427785200"; d="scan'208";a="717534584" From: Adrian Hunter To: Arnaldo Carvalho de Melo Cc: Ingo Molnar , linux-kernel@vger.kernel.org, Jiri Olsa Subject: [PATCH V6 15/17] perf tools: Intel BTS to always update thread stack trace number Date: Fri, 29 May 2015 16:33:43 +0300 Message-Id: <1432906425-9911-16-git-send-email-adrian.hunter@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1432906425-9911-1-git-send-email-adrian.hunter@intel.com> References: <1432906425-9911-1-git-send-email-adrian.hunter@intel.com> Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The enhanced thread stack is used by higher layers but still requires the trace number. The trace number is used to distinguish discontinuous sections of trace (for example from Snapshot mode or Sample mode), which cause the thread stack to be flushed. Signed-off-by: Adrian Hunter --- tools/perf/util/intel-bts.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/tools/perf/util/intel-bts.c b/tools/perf/util/intel-bts.c index b068860..cd7bde3 100644 --- a/tools/perf/util/intel-bts.c +++ b/tools/perf/util/intel-bts.c @@ -27,6 +27,8 @@ #include "machine.h" #include "session.h" #include "util.h" +#include "thread.h" +#include "thread-stack.h" #include "debug.h" #include "tsc.h" #include "auxtrace.h" @@ -443,19 +445,22 @@ static int intel_bts_process_buffer(struct intel_bts_queue *btsq, static int intel_bts_process_queue(struct intel_bts_queue *btsq, u64 *timestamp) { - struct auxtrace_buffer *buffer = btsq->buffer; + struct auxtrace_buffer *buffer = btsq->buffer, *old_buffer = buffer; struct auxtrace_queue *queue; + struct thread *thread; int err; if (btsq->done) return 1; if (btsq->pid == -1) { - struct thread *thread; - - thread = machine__find_thread(btsq->bts->machine, -1, btsq->tid); + thread = machine__find_thread(btsq->bts->machine, -1, + btsq->tid); if (thread) btsq->pid = thread->pid_; + } else { + thread = machine__findnew_thread(btsq->bts->machine, btsq->pid, + btsq->tid); } queue = &btsq->bts->queues.queue_array[btsq->queue_nr]; @@ -485,6 +490,11 @@ static int intel_bts_process_queue(struct intel_bts_queue *btsq, u64 *timestamp) intel_bts_do_fix_overlap(queue, buffer)) return -ENOMEM; + if (!btsq->bts->synth_opts.callchain && thread && + (!old_buffer || btsq->bts->sampling_mode || + (btsq->bts->snapshot_mode && !buffer->consecutive))) + thread_stack__set_trace_nr(thread, buffer->buffer_nr + 1); + err = intel_bts_process_buffer(btsq, buffer); auxtrace_buffer__drop_data(buffer); -- 1.9.1