From: "Tom Tromey (Code Review)" <gerrit@gnutoolchain-gerrit.osci.io>
To: gdb-patches@sourceware.org
Subject: [review] Introduce fetch_pending_stop
Date: Tue, 29 Oct 2019 17:58:00 -0000 [thread overview]
Message-ID: <gerrit.1572371871000.I330cb8bda61ff9460f22d9e0eaaa96740d256202@gnutoolchain-gerrit.osci.io> (raw)
In-Reply-To: <gerrit.1572371871000.I330cb8bda61ff9460f22d9e0eaaa96740d256202@gnutoolchain-gerrit.osci.io>
Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/427
......................................................................
Introduce fetch_pending_stop
This introduces a new "fetch_pending_stop" function and changes gdb to
use it. This function removes the first matching pending stop from
the list of such stops.
Change-Id: I2d289dbf3ab17ae5c13c59afdf89b724301e962f
gdb/ChangeLog
2019-10-29 Tom Tromey <tromey@adacore.com>
* windows-nat.c (get_windows_debug_event): Use
fetch_pending_stop.
* nat/windows-nat.h (fetch_pending_stop): Declare.
* nat/windows-nat.c (fetch_pending_stop): New function.
Change-Id: I330cb8bda61ff9460f22d9e0eaaa96740d256202
---
M gdb/ChangeLog
M gdb/nat/windows-nat.c
M gdb/nat/windows-nat.h
M gdb/windows-nat.c
4 files changed, 49 insertions(+), 20 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0d38851..e4bdd16 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,12 @@
2019-10-29 Tom Tromey <tromey@adacore.com>
+ * windows-nat.c (get_windows_debug_event): Use
+ fetch_pending_stop.
+ * nat/windows-nat.h (fetch_pending_stop): Declare.
+ * nat/windows-nat.c (fetch_pending_stop): New function.
+
+2019-10-29 Tom Tromey <tromey@adacore.com>
+
* windows-nat.c (windows_continue): Use matching_pending_stop and
continue_last_debug_event.
* nat/windows-nat.h (matching_pending_stop)
diff --git a/gdb/nat/windows-nat.c b/gdb/nat/windows-nat.c
index 163e3b1..7ac06f4 100644
--- a/gdb/nat/windows-nat.c
+++ b/gdb/nat/windows-nat.c
@@ -322,6 +322,33 @@
/* See nat/windows-nat.h. */
+bool
+fetch_pending_stop (bool debug_events, pending_stop *result)
+{
+ for (auto iter = pending_stops.begin ();
+ iter != pending_stops.end ();
+ ++iter)
+ {
+ if (desired_stop_thread_id == -1
+ || desired_stop_thread_id == iter->thread_id)
+ {
+ *result = *iter;
+ current_event = iter->event;
+
+ DEBUG_EVENTS (("get_windows_debug_event - "
+ "pending stop found in 0x%x (desired=0x%x)\n",
+ iter->thread_id, desired_stop_thread_id));
+
+ pending_stops.erase (iter);
+ return true;
+ }
+ }
+
+ return false;
+}
+
+/* See nat/windows-nat.h. */
+
BOOL
continue_last_debug_event (DWORD continue_status, bool debug_events)
{
diff --git a/gdb/nat/windows-nat.h b/gdb/nat/windows-nat.h
index 42e2e75..2a5d4a1 100644
--- a/gdb/nat/windows-nat.h
+++ b/gdb/nat/windows-nat.h
@@ -216,6 +216,12 @@
extern bool matching_pending_stop (bool debug_events);
+/* See if a pending stop matches DESIRED_STOP_THREAD_ID. If so,
+ remove it from the list of pending stops, store it in *RESULT, set
+ 'current_event', and return true. Otherwise, return false. */
+
+extern bool fetch_pending_stop (bool debug_events, pending_stop *result);
+
/* A simple wrapper for ContinueDebugEvent that continues the last
waited-for event. */
diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index 6884411..e91e052 100644
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -1301,29 +1301,18 @@
/* If there is a relevant pending stop, report it now. See the
comment by the definition of "pending_stops" for details on why
this is needed. */
- for (auto iter = pending_stops.begin ();
- iter != pending_stops.end ();
- ++iter)
+ pending_stop stop;
+ if (fetch_pending_stop (debug_events, &stop))
{
- if (desired_stop_thread_id == -1
- || desired_stop_thread_id == iter->thread_id)
- {
- thread_id = iter->thread_id;
- *ourstatus = iter->status;
- current_event = iter->event;
+ thread_id = stop.thread_id;
+ *ourstatus = stop.status;
- inferior_ptid = ptid_t (current_event.dwProcessId, thread_id, 0);
- current_windows_thread = thread_rec (inferior_ptid,
- INVALIDATE_CONTEXT);
- current_windows_thread->reload_context = 1;
+ inferior_ptid = ptid_t (current_event.dwProcessId, thread_id, 0);
+ current_windows_thread = thread_rec (inferior_ptid,
+ INVALIDATE_CONTEXT);
+ current_windows_thread->reload_context = 1;
- DEBUG_EVENTS (("get_windows_debug_event - "
- "pending stop found in 0x%x (desired=0x%x)\n",
- thread_id, desired_stop_thread_id));
-
- pending_stops.erase (iter);
- return thread_id;
- }
+ return thread_id;
}
last_sig = GDB_SIGNAL_0;
--
Gerrit-Project: binutils-gdb
Gerrit-Branch: master
Gerrit-Change-Id: I330cb8bda61ff9460f22d9e0eaaa96740d256202
Gerrit-Change-Number: 427
Gerrit-PatchSet: 1
Gerrit-Owner: Tom Tromey <tromey@sourceware.org>
Gerrit-MessageType: newchange
next parent reply other threads:[~2019-10-29 17:58 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-29 17:58 Tom Tromey (Code Review) [this message]
2019-11-21 18:41 ` Pedro Alves (Code Review)
2019-11-21 21:52 ` Tom Tromey
2019-11-26 17:12 Tom Tromey (Code Review)
2019-11-29 20:09 ` Pedro Alves (Code Review)
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=gerrit.1572371871000.I330cb8bda61ff9460f22d9e0eaaa96740d256202@gnutoolchain-gerrit.osci.io \
--to=gerrit@gnutoolchain-gerrit.osci.io \
--cc=gdb-patches@sourceware.org \
--cc=tromey@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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).