[review] Normalize get_windows_debug_event API

Message ID gerrit.1574788288000.Ib279ec62e72b3f42a8dec172154df24c6911fefa@gnutoolchain-gerrit.osci.io
State New
Headers show
Series
  • [review] Normalize get_windows_debug_event API
Related show

Commit Message

Simon Marchi (Code Review) Nov. 26, 2019, 5:11 p.m.
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(-)




-- 
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

Comments

Simon Marchi (Code Review) Nov. 29, 2019, 7:52 p.m. | #1
Pedro Alves has posted comments on this change.

Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/712
......................................................................


Patch Set 1: Code-Review+2


-- 
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-Reviewer: Pedro Alves <palves@redhat.com>
Gerrit-Comment-Date: Fri, 29 Nov 2019 19:52:52 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

Patch

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)