* cygtls.cc (handle_threadlist_exception): Improve diagnostic output.

* sigproc.cc (child_info::sync): Only clear hProcess when execing.
(wait_sig): Protect readsig handle.
This commit is contained in:
Christopher Faylor 2005-10-19 00:22:08 +00:00
parent 1f5c3042d5
commit b72a5c0767
3 changed files with 14 additions and 8 deletions

View File

@ -1,3 +1,10 @@
2005-10-18 Christopher Faylor <cgf@timesys.com>
* cygtls.cc (handle_threadlist_exception): Improve diagnostic output.
* sigproc.cc (child_info::sync): Only clear hProcess when execing.
(wait_sig): Protect readsig handle.
2005-10-18 Corinna Vinschen <corinna@vinschen.de> 2005-10-18 Corinna Vinschen <corinna@vinschen.de>
* autoload.cc (NtLockVirtualMemory): Import. * autoload.cc (NtLockVirtualMemory): Import.

View File

@ -241,26 +241,24 @@ _cygtls::set_siginfo (sigpacket *pack)
extern "C" DWORD __stdcall RtlUnwind (void *, void *, void *, DWORD); extern "C" DWORD __stdcall RtlUnwind (void *, void *, void *, DWORD);
static int static int
handle_threadlist_exception (EXCEPTION_RECORD *e, void *frame, CONTEXT *, void *) handle_threadlist_exception (EXCEPTION_RECORD *e, void *frame, CONTEXT *c, void *)
{ {
if (e->ExceptionCode != STATUS_ACCESS_VIOLATION) if (e->ExceptionCode != STATUS_ACCESS_VIOLATION)
{ {
system_printf ("handle_threadlist_exception called with exception code %d\n", system_printf ("unhandled exception %p at %p", e->ExceptionCode, c->Eip);
e->ExceptionCode);
return 1; return 1;
} }
sentry here; sentry here;
if (threadlist_ix == BAD_IX) if (threadlist_ix == BAD_IX)
{ {
system_printf ("handle_threadlist_exception called with threadlist_ix %d\n", system_printf ("called with threadlist_ix %d", BAD_IX);
BAD_IX);
return 1; return 1;
} }
if (!here.acquired ()) if (!here.acquired ())
{ {
system_printf ("handle_threadlist_exception couldn't aquire muto\n"); system_printf ("couldn't aquire muto");
return 1; return 1;
} }

View File

@ -846,7 +846,7 @@ child_info::sync (pid_t pid, HANDLE& hProcess, DWORD howlong)
} }
else else
{ {
if (type != _PROC_FORK && x == nsubproc_ready) if (type == _PROC_EXEC && x == nsubproc_ready)
{ {
ForceCloseHandle1 (hProcess, childhProcess); ForceCloseHandle1 (hProcess, childhProcess);
hProcess = NULL; hProcess = NULL;
@ -1057,6 +1057,7 @@ wait_sig (VOID *)
if (!CreatePipe (&readsig, &myself->sendsig, sec_user_nih (sa_buf), 0)) if (!CreatePipe (&readsig, &myself->sendsig, sec_user_nih (sa_buf), 0))
api_fatal ("couldn't create signal pipe, %E"); api_fatal ("couldn't create signal pipe, %E");
ProtectHandle (readsig);
sigCONT = CreateEvent (&sec_none_nih, FALSE, FALSE, NULL); sigCONT = CreateEvent (&sec_none_nih, FALSE, FALSE, NULL);
my_sendsig = myself->sendsig; my_sendsig = myself->sendsig;
@ -1186,7 +1187,7 @@ wait_sig (VOID *)
break; break;
} }
CloseHandle (readsig); ForceCloseHandle (readsig);
sigproc_printf ("signal thread exiting"); sigproc_printf ("signal thread exiting");
ExitThread (0); ExitThread (0);
} }