From: "Tom Tromey (Code Review)" <gerrit@gnutoolchain-gerrit.osci.io>
To: gdb-patches@sourceware.org
Subject: [review] Normalize get_windows_debug_event API
Date: Tue, 26 Nov 2019 17:12:00 -0000 [thread overview]
Message-ID: <gerrit.1574788288000.Ib279ec62e72b3f42a8dec172154df24c6911fefa@gnutoolchain-gerrit.osci.io> (raw)
In-Reply-To: <gerrit.1574788288000.Ib279ec62e72b3f42a8dec172154df24c6911fefa@gnutoolchain-gerrit.osci.io>
Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/712
......................................................................
Normalize get_windows_debug_event API
This changes gdb's implementation of get_windows_debug_event to have
the same API as that of gdbserver. This allows more code sharing in a
subsequent patch.
gdb/ChangeLog
2019-11-26 Tom Tromey <tromey@adacore.com>
* windows-nat.c (get_windows_debug_event): Remove parameters.
(windows_nat_target::wait): Update.
Change-Id: Ib279ec62e72b3f42a8dec172154df24c6911fefa
---
M gdb/ChangeLog
M gdb/windows-nat.c
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 976c19a..42ebe64 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
2019-11-26 Tom Tromey <tromey@adacore.com>
+ * windows-nat.c (get_windows_debug_event): Remove parameters.
+ (windows_nat_target::wait): Update.
+
+2019-11-26 Tom Tromey <tromey@adacore.com>
+
* windows-nat.c (windows_nat::handle_output_debug_string):
Rename. No longer static.
* nat/windows-nat.h (handle_output_debug_string): Declare.
diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index 083e05b..f718a8e 100644
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -1489,8 +1489,7 @@
/* Get the next event from the child. Returns a non-zero thread id if the event
requires handling by WFI (or whatever). */
static int
-get_windows_debug_event (struct target_ops *ops,
- int pid, struct target_waitstatus *ourstatus)
+get_windows_debug_event (struct target_waitstatus *ourstatus)
{
BOOL debug_event;
DWORD continue_status, event_code;
@@ -1739,8 +1738,6 @@
windows_nat_target::wait (ptid_t ptid, struct target_waitstatus *ourstatus,
int options)
{
- int pid = -1;
-
/* We loop when we get a non-standard exception rather than return
with a SPURIOUS because resume can try and step or modify things,
which needs a current_thread->h. But some of these exceptions mark
@@ -1778,7 +1775,7 @@
the user tries to resume the execution in the inferior.
This is a classic race that we should try to fix one day. */
SetConsoleCtrlHandler (&ctrl_c_handler, TRUE);
- retval = get_windows_debug_event (this, pid, ourstatus);
+ retval = get_windows_debug_event (ourstatus);
SetConsoleCtrlHandler (&ctrl_c_handler, FALSE);
if (retval)
--
Gerrit-Project: binutils-gdb
Gerrit-Branch: master
Gerrit-Change-Id: Ib279ec62e72b3f42a8dec172154df24c6911fefa
Gerrit-Change-Number: 712
Gerrit-PatchSet: 1
Gerrit-Owner: Tom Tromey <tromey@sourceware.org>
Gerrit-MessageType: newchange
next parent reply other threads:[~2019-11-26 17:12 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-26 17:12 Tom Tromey (Code Review) [this message]
2019-11-29 19:52 ` Pedro Alves (Code Review)
-- strict thread matches above, loose matches on Subject: below --
2019-10-29 17:58 Tom Tromey (Code Review)
2019-11-27 0:05 ` Luis Machado (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.1574788288000.Ib279ec62e72b3f42a8dec172154df24c6911fefa@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).