diff options
| author | Ian Lance Taylor <ian@airs.com> | 1998-01-19 18:38:51 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@airs.com> | 1998-01-19 18:38:51 +0000 |
| commit | b5edcb4521a8ebe0af5f19a8a8564a9f602eba2d (patch) | |
| tree | fc3e0f1e65cdbd62d532d870477b8d3958d3b434 | |
| parent | 76bf91921d2ead8d868782f3485a5c1c1461c959 (diff) | |
| download | gdb-b5edcb4521a8ebe0af5f19a8a8564a9f602eba2d.zip gdb-b5edcb4521a8ebe0af5f19a8a8564a9f602eba2d.tar.gz gdb-b5edcb4521a8ebe0af5f19a8a8564a9f602eba2d.tar.bz2 | |
From cgf@bbc.com (Chris Faylor):
* win32-nat.c (child_mourn_inferior): Call ContinueDebugEvent to
let the child exit.
(child_kill_inferior): Respond to all debug events as the child is
terminating.
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/win32-nat.c | 21 |
2 files changed, 26 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a41a9d5..f66e3e8 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ Mon Jan 19 13:34:40 1998 Ian Lance Taylor <ian@cygnus.com> + From cgf@bbc.com (Chris Faylor): + * win32-nat.c (child_mourn_inferior): Call ContinueDebugEvent to + let the child exit. + (child_kill_inferior): Respond to all debug events as the child is + terminating. + * Makefile.in (all): Change gdb dependency to gdb$(EXEEXT). (uninstall): Add $(EXEEXT) to file name to remove. (gdb$(EXEEXT)): Rename target from plain gdb. diff --git a/gdb/win32-nat.c b/gdb/win32-nat.c index 664d554..be83b7a 100644 --- a/gdb/win32-nat.c +++ b/gdb/win32-nat.c @@ -1,5 +1,5 @@ /* Target-vector operations for controlling win32 child processes, for GDB. - Copyright 1995, 1996 Free Software Foundation, Inc. + Copyright 1995, 1996, 1997, 1998 Free Software Foundation, Inc. Contributed by Cygnus Support. This file is part of GDB. @@ -768,6 +768,9 @@ child_create_inferior (exec_file, allargs, env) static void child_mourn_inferior () { + (void) ContinueDebugEvent (current_process_id, + current_thread_id, + DBG_CONTINUE); unpush_target (&child_ops); generic_mourn_inferior (); } @@ -808,6 +811,22 @@ void child_kill_inferior (void) { CHECK (TerminateProcess (current_process, 0)); + + for (;;) + { + DEBUG_EVENT event; + if (!ContinueDebugEvent (current_process_id, + current_thread_id, + DBG_CONTINUE)) + break; + if (!WaitForDebugEvent (&event, INFINITE)) + break; + current_thread_id = event.dwThreadId; + current_process_id = event.dwProcessId; + if (event.dwDebugEventCode == EXIT_PROCESS_DEBUG_EVENT) + break; + } + CHECK (CloseHandle (current_process)); CHECK (CloseHandle (current_thread)); target_mourn_inferior(); /* or just child_mourn_inferior? */ |