diff options
| author | Tom Tromey <tromey@adacore.com> | 2020-04-08 14:33:35 -0600 |
|---|---|---|
| committer | Tom Tromey <tromey@adacore.com> | 2020-04-08 14:47:59 -0600 |
| commit | 2c1d95e8697f64713d0f60f7b9231d13a3f6a145 (patch) | |
| tree | 6e6bc6f0c78b9a706f108cab3a6fcf7c9a125cf3 /gdbserver | |
| parent | d2977bc4253614907058d3a339875683d8215065 (diff) | |
| download | binutils-gdb-2c1d95e8697f64713d0f60f7b9231d13a3f6a145.tar.gz | |
Move wait_for_debug_event to nat/windows-nat.c
This moves the wait_for_debug_event helper function to
nat/windows-nat.c, and changes gdbserver to use it.
wait_for_debug_event is a wrapper for WaitForDebugEvent that also sets
last_wait_event when appropriate. This is needed to properly handle
queued stops.
gdb/ChangeLog
2020-04-08 Tom Tromey <tromey@adacore.com>
* windows-nat.c (wait_for_debug_event): Move to
nat/windows-nat.c.
* nat/windows-nat.h (wait_for_debug_event): Declare.
* nat/windows-nat.c (wait_for_debug_event): Move from
windows-nat.c. No longer static.
gdbserver/ChangeLog
2020-04-08 Tom Tromey <tromey@adacore.com>
* win32-low.c (win32_kill, get_child_debug_event): Use
wait_for_debug_event.
Diffstat (limited to 'gdbserver')
| -rw-r--r-- | gdbserver/ChangeLog | 5 | ||||
| -rw-r--r-- | gdbserver/win32-low.cc | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index 6793795376e..792834077fe 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,5 +1,10 @@ 2020-04-08 Tom Tromey <tromey@adacore.com> + * win32-low.c (win32_kill, get_child_debug_event): Use + wait_for_debug_event. + +2020-04-08 Tom Tromey <tromey@adacore.com> + * win32-low.c (child_continue): Call continue_last_debug_event. 2020-04-08 Tom Tromey <tromey@adacore.com> diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc index 33f64700153..d151505e9f8 100644 --- a/gdbserver/win32-low.cc +++ b/gdbserver/win32-low.cc @@ -797,7 +797,7 @@ win32_process_target::kill (process_info *process) { if (!child_continue (DBG_CONTINUE, -1)) break; - if (!WaitForDebugEvent (¤t_event, INFINITE)) + if (!wait_for_debug_event (¤t_event, INFINITE)) break; if (current_event.dwDebugEventCode == EXIT_PROCESS_DEBUG_EVENT) break; @@ -1231,7 +1231,7 @@ get_child_debug_event (DWORD *continue_status, happen is the user will see a spurious breakpoint. */ current_event.dwDebugEventCode = 0; - if (!WaitForDebugEvent (¤t_event, 0)) + if (!wait_for_debug_event (¤t_event, 0)) { OUTMSG2(("no attach events left\n")); fake_breakpoint_event (); @@ -1246,7 +1246,7 @@ get_child_debug_event (DWORD *continue_status, /* Keep the wait time low enough for comfortable remote interruption, but high enough so gdbserver doesn't become a bottleneck. */ - if (!WaitForDebugEvent (¤t_event, 250)) + if (!wait_for_debug_event (¤t_event, 250)) { DWORD e = GetLastError(); |