diff options
Diffstat (limited to 'winsup/cygwin')
| -rw-r--r-- | winsup/cygwin/ChangeLog | 9 | ||||
| -rw-r--r-- | winsup/cygwin/sigproc.cc | 19 | ||||
| -rw-r--r-- | winsup/cygwin/strace.cc | 2 | ||||
| -rw-r--r-- | winsup/cygwin/syscalls.cc | 2 |
4 files changed, 18 insertions, 14 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 82543c267..ec7dc2e2f 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,12 @@ +Tue Oct 17 14:50:31 2000 Christopher Faylor <cgf@cygnus.com> + + * sigproc.cc (proc_subproc): Remove unneeded test for correct process + in PROC_ADDCHILD. Return 0 when terminated child has just been + reparented. + (wait_subproc): Only send SIGCHLD when proc_subproc returns != 0. + * strace.cc (strace::vsprntf): Only strip .exe extension from program + name. + 2000-10-16 Charles Wilson <cwilson@ece.gatech.edu> * fhandler_clipboard.cc: new file diff --git a/winsup/cygwin/sigproc.cc b/winsup/cygwin/sigproc.cc index 46f8b6108..d98bd0e11 100644 --- a/winsup/cygwin/sigproc.cc +++ b/winsup/cygwin/sigproc.cc @@ -248,14 +248,6 @@ proc_subproc (DWORD what, DWORD val) case PROC_ADDCHILD: if (nchildren >= PSIZE - 1) system_printf ("nchildren too large %d", nchildren); - if (WaitForSingleObject (vchild->hProcess, 0) != WAIT_TIMEOUT) - { - system_printf ("invalid process handle %p. pid %d, win pid %d", - vchild->hProcess, vchild->pid, vchild->dwProcessId); - rc = 0; - break; - } - pchildren[nchildren] = vchild; hchildren[nchildren] = vchild->hProcess; if (!DuplicateHandle (hMainProc, vchild->hProcess, hMainProc, &vchild->pid_handle, @@ -278,7 +270,6 @@ proc_subproc (DWORD what, DWORD val) * (called from wait_subproc thread) */ case PROC_CHILDTERMINATED: - rc = 0; if (hchildren[val] != pchildren[val]->hProcess) { sigproc_printf ("pid %d[%d], reparented old hProcess %p, new %p", @@ -286,6 +277,7 @@ proc_subproc (DWORD what, DWORD val) ForceCloseHandle1 (hchildren[val], childhProc); hchildren[val] = pchildren[val]->hProcess; /* Filled out by child */ ProtectHandle1 (pchildren[val]->hProcess, childhProc); + rc = 0; break; // This was an exec() } @@ -1275,12 +1267,15 @@ wait_subproc (VOID *) rc -= WAIT_OBJECT_0; if (rc-- != 0) { - (void) proc_subproc (PROC_CHILDTERMINATED, rc); + rc = proc_subproc (PROC_CHILDTERMINATED, rc); if (!proc_loop_wait) // Don't bother if wait_subproc is break; // exiting - /* Send a SIGCHLD to myself. */ - rc = sig_send (myself_nowait, SIGCHLD); + /* Send a SIGCHLD to myself. We do this here, rather than in proc_subproc + to avoid the proc_subproc lock since the signal thread will eventually + be calling proc_subproc and could unnecessarily block. */ + if (rc) + sig_send (myself_nowait, SIGCHLD); } sigproc_printf ("looping"); } diff --git a/winsup/cygwin/strace.cc b/winsup/cygwin/strace.cc index 74f77e1ad..41c436e05 100644 --- a/winsup/cygwin/strace.cc +++ b/winsup/cygwin/strace.cc @@ -130,7 +130,7 @@ strace::vsprntf (char *buf, const char *func, const char *infmt, va_list ap) else p = pn; strcpy (progname, p); - if ((p = strrchr (progname, '.')) != NULL) + if ((p = strrchr (progname, '.')) != NULL && strcasematch (p, ".exe")) *p = '\000'; p = progname; count = __small_sprintf (buf, fmt, p && *p ? p : "?", diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc index f4a13b0a7..a9b926b97 100644 --- a/winsup/cygwin/syscalls.cc +++ b/winsup/cygwin/syscalls.cc @@ -920,7 +920,7 @@ _fstat (int fd, struct stat *buf) { memset (buf, 0, sizeof (struct stat)); r = fdtab[fd]->fstat (buf); - syscall_printf ("%d = fstat (%d, %x)", r,fd,buf); + syscall_printf ("%d = fstat (%d, %x)", r, fd, buf); } return r; |