From: Yao Qi <yao@codesourcery.com>
To: <gdb-patches@sourceware.org>
Subject: [PATCH 2/2] Find the next matched trace file in 'tfile target'.
Date: Mon, 25 Feb 2013 02:58:00 -0000 [thread overview]
Message-ID: <1361761061-9625-2-git-send-email-yao@codesourcery.com> (raw)
In-Reply-To: <1361761061-9625-1-git-send-email-yao@codesourcery.com>
The previous patch exposes a bug in tfile target when finding a trace
frame. Every time, GDB will scan tfile from the starting offset and
initialize trace frame number to zero. When TYPE is not tfind_number,
it means GDB wants to find the *next* matched trace frame of current
one. So we need to check the tfile trace frame number iterator is
greater than the current trace frame number (which means *next*).
This is mainly what this patch does.
Regression tested on x86_64-linux.
gdb:
2013-02-25 Yao Qi <yao@codesourcery.com>
* tracepoint.c (tfile_trace_find): Find the next matched trace
frame.
---
gdb/tracepoint.c | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index ca104aa..f7a3650 100644
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -4324,22 +4324,34 @@ tfile_trace_find (enum trace_find_type type, int num,
break;
case tfind_pc:
tfaddr = tfile_get_traceframe_address (tframe_offset);
- if (tfaddr == addr1)
+ if (tfaddr == addr1
+ /* Looks for the next trace frame if matched. */
+ && (tfnum > traceframe_number
+ || (tfnum == traceframe_number && tfnum == 0)))
found = 1;
break;
case tfind_tp:
tp = get_tracepoint (num);
- if (tp && tpnum == tp->number_on_target)
+ if (tp && tpnum == tp->number_on_target
+ /* Looks for the next trace frame if matched. */
+ && (tfnum > traceframe_number
+ || (tfnum == traceframe_number && tfnum == 0)))
found = 1;
break;
case tfind_range:
tfaddr = tfile_get_traceframe_address (tframe_offset);
- if (addr1 <= tfaddr && tfaddr <= addr2)
+ if (addr1 <= tfaddr && tfaddr <= addr2
+ /* Looks for the next trace frame if matched. */
+ && (tfnum > traceframe_number
+ || (tfnum == traceframe_number && tfnum == 0)))
found = 1;
break;
case tfind_outside:
tfaddr = tfile_get_traceframe_address (tframe_offset);
- if (!(addr1 <= tfaddr && tfaddr <= addr2))
+ if (!(addr1 <= tfaddr && tfaddr <= addr2)
+ /* Looks for the next trace frame if matched. */
+ && (tfnum > traceframe_number
+ || (tfnum == traceframe_number && tfnum == 0)))
found = 1;
break;
default:
--
1.7.7.6
next prev parent reply other threads:[~2013-02-25 2:58 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-25 2:58 [PATCH 1/2] Check trace data from trace file Yao Qi
2013-02-25 2:58 ` Yao Qi [this message]
2013-02-26 19:53 ` [PATCH 2/2] Find the next matched trace file in 'tfile target' Pedro Alves
2013-02-27 1:37 ` Yao Qi
2013-02-25 3:10 ` [PATCH 1/2] Check trace data from trace file Yao Qi
2013-02-26 18:44 ` Pedro Alves
2013-02-26 18:57 ` Pedro Alves
2013-02-27 1:54 ` Yao Qi
2013-02-27 15:23 ` Pedro Alves
2013-02-28 1:14 ` Yao Qi
2013-02-25 12:03 ` Abid, Hafiz
2013-02-25 14:10 ` Abid, Hafiz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1361761061-9625-2-git-send-email-yao@codesourcery.com \
--to=yao@codesourcery.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox