From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12310 invoked by alias); 14 Jan 2014 08:04:48 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 12113 invoked by uid 89); 14 Jan 2014 08:04:48 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.1 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mga03.intel.com Received: from mga03.intel.com (HELO mga03.intel.com) (143.182.124.21) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 14 Jan 2014 08:04:47 +0000 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by azsmga101.ch.intel.com with ESMTP; 14 Jan 2014 00:04:42 -0800 X-ExtLoop1: 1 Received: from irvmail001.ir.intel.com ([163.33.26.43]) by fmsmga001.fm.intel.com with ESMTP; 14 Jan 2014 00:04:41 -0800 Received: from ulvlx001.iul.intel.com (ulvlx001.iul.intel.com [172.28.207.17]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id s0E84ebD013301; Tue, 14 Jan 2014 08:04:40 GMT Received: from ulvlx001.iul.intel.com (localhost [127.0.0.1]) by ulvlx001.iul.intel.com with ESMTP id s0E84eR2009394; Tue, 14 Jan 2014 09:04:40 +0100 Received: (from mmetzger@localhost) by ulvlx001.iul.intel.com with œ id s0E84eEJ009390; Tue, 14 Jan 2014 09:04:40 +0100 From: Markus Metzger To: jan.kratochvil@redhat.com, palves@redhat.com Cc: gdb-patches@sourceware.org Subject: [PATCH v10 12/28] btrace: add replay position to btrace thread info Date: Tue, 14 Jan 2014 08:05:00 -0000 Message-Id: <1389686678-9039-13-git-send-email-markus.t.metzger@intel.com> In-Reply-To: <1389686678-9039-1-git-send-email-markus.t.metzger@intel.com> References: <1389686678-9039-1-git-send-email-markus.t.metzger@intel.com> X-IsSubscribed: yes X-SW-Source: 2014-01/txt/msg00417.txt.bz2 Add a branch trace instruction iterator pointing to the current replay position to the branch trace thread info struct. Free the iterator when btrace is cleared. Start at the replay position for the instruction and function-call histories. 2014-01-14 Markus Metzger * btrace.h (replay) : New. (btrace_is_replaying): New. * btrace.c (btrace_clear): Free replay iterator. (btrace_is_replaying): New. * record-btrace.c (record_btrace_is_replaying): New. (record_btrace_info): Print insn number if replaying. (record_btrace_insn_history): Start at replay position. (record_btrace_call_history): Start at replay position. (init_record_btrace_ops): Init to_record_is_replaying. --- gdb/btrace.c | 10 +++++++ gdb/btrace.h | 6 ++++ gdb/record-btrace.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++------ 3 files changed, 88 insertions(+), 8 deletions(-) diff --git a/gdb/btrace.c b/gdb/btrace.c index 1d060d3e..632ebe1 100644 --- a/gdb/btrace.c +++ b/gdb/btrace.c @@ -781,9 +781,11 @@ btrace_clear (struct thread_info *tp) xfree (btinfo->insn_history); xfree (btinfo->call_history); + xfree (btinfo->replay); btinfo->insn_history = NULL; btinfo->call_history = NULL; + btinfo->replay = NULL; } /* See btrace.h. */ @@ -1339,3 +1341,11 @@ btrace_set_call_history (struct btrace_thread_info *btinfo, btinfo->call_history->begin = *begin; btinfo->call_history->end = *end; } + +/* See btrace.h. */ + +int +btrace_is_replaying (struct thread_info *tp) +{ + return tp->btrace.replay != NULL; +} diff --git a/gdb/btrace.h b/gdb/btrace.h index d219f69..93e6940 100644 --- a/gdb/btrace.h +++ b/gdb/btrace.h @@ -187,6 +187,9 @@ struct btrace_thread_info /* The function call history iterator. */ struct btrace_call_history *call_history; + + /* The current replay position. NULL if not replaying. */ + struct btrace_insn_iterator *replay; }; /* Enable branch tracing for a thread. */ @@ -308,4 +311,7 @@ extern void btrace_set_call_history (struct btrace_thread_info *, const struct btrace_call_iterator *begin, const struct btrace_call_iterator *end); +/* Determine if branch tracing is currently replaying TP. */ +extern int btrace_is_replaying (struct thread_info *tp); + #endif /* BTRACE_H */ diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c index 5c390b8..aa0272e 100644 --- a/gdb/record-btrace.c +++ b/gdb/record-btrace.c @@ -237,6 +237,10 @@ record_btrace_info (void) printf_unfiltered (_("Recorded %u instructions in %u functions for thread " "%d (%s).\n"), insns, calls, tp->num, target_pid_to_str (tp->ptid)); + + if (btrace_is_replaying (tp)) + printf_unfiltered (_("Replay in progress. At instruction %u.\n"), + btrace_insn_number (btinfo->replay)); } /* Print an unsigned int. */ @@ -301,13 +305,34 @@ record_btrace_insn_history (int size, int flags) history = btinfo->insn_history; if (history == NULL) { - /* No matter the direction, we start with the tail of the trace. */ - btrace_insn_end (&begin, btinfo); - end = begin; + struct btrace_insn_iterator *replay; DEBUG ("insn-history (0x%x): %d", flags, size); - covered = btrace_insn_prev (&begin, context); + /* If we're replaying, we start at the replay position. Otherwise, we + start at the tail of the trace. */ + replay = btinfo->replay; + if (replay != NULL) + begin = *replay; + else + btrace_insn_end (&begin, btinfo); + + /* We start from here and expand in the requested direction. Then we + expand in the other direction, as well, to fill up any remaining + context. */ + end = begin; + if (size < 0) + { + /* We want the current position covered, as well. */ + covered = btrace_insn_next (&end, 1); + covered += btrace_insn_prev (&begin, context - covered); + covered += btrace_insn_next (&end, context - covered); + } + else + { + covered = btrace_insn_next (&end, context); + covered += btrace_insn_prev (&begin, context - covered); + } } else { @@ -561,13 +586,37 @@ record_btrace_call_history (int size, int flags) history = btinfo->call_history; if (history == NULL) { - /* No matter the direction, we start with the tail of the trace. */ - btrace_call_end (&begin, btinfo); - end = begin; + struct btrace_insn_iterator *replay; DEBUG ("call-history (0x%x): %d", flags, size); - covered = btrace_call_prev (&begin, context); + /* If we're replaying, we start at the replay position. Otherwise, we + start at the tail of the trace. */ + replay = btinfo->replay; + if (replay != NULL) + { + begin.function = replay->function; + begin.btinfo = btinfo; + } + else + btrace_call_end (&begin, btinfo); + + /* We start from here and expand in the requested direction. Then we + expand in the other direction, as well, to fill up any remaining + context. */ + end = begin; + if (size < 0) + { + /* We want the current position covered, as well. */ + covered = btrace_call_next (&end, 1); + covered += btrace_call_prev (&begin, context - covered); + covered += btrace_call_next (&end, context - covered); + } + else + { + covered = btrace_call_next (&end, context); + covered += btrace_call_prev (&begin, context- covered); + } } else { @@ -688,6 +737,20 @@ record_btrace_call_history_from (ULONGEST from, int size, int flags) record_btrace_call_history_range (begin, end, flags); } +/* The to_record_is_replaying method of target record-btrace. */ + +static int +record_btrace_is_replaying (void) +{ + struct thread_info *tp; + + ALL_THREADS (tp) + if (btrace_is_replaying (tp)) + return 1; + + return 0; +} + /* Initialize the record-btrace target ops. */ static void @@ -714,6 +777,7 @@ init_record_btrace_ops (void) ops->to_call_history = record_btrace_call_history; ops->to_call_history_from = record_btrace_call_history_from; ops->to_call_history_range = record_btrace_call_history_range; + ops->to_record_is_replaying = record_btrace_is_replaying; ops->to_stratum = record_stratum; ops->to_magic = OPS_MAGIC; } -- 1.8.3.1