newlib/winsup/cygwin/wait.cc

119 lines
2.5 KiB
C++
Raw Normal View History

2000-02-17 20:38:33 +01:00
/* wait.cc: Posix wait routines.
Copyright 1996, 1997, 1998, 1999, 2000 Cygnus Solutions.
2000-02-17 20:38:33 +01:00
This file is part of Cygwin.
This software is a copyrighted work licensed under the terms of the
Cygwin license. Please consult the file "CYGWIN_LICENSE" for
details. */
#include "winsup.h"
2000-02-17 20:38:33 +01:00
#include <sys/wait.h>
#include <stdlib.h>
#include <errno.h>
#include "cygerrno.h"
#include "sync.h"
#include "sigproc.h"
#include "perthread.h"
2000-02-17 20:38:33 +01:00
/* This is called _wait and not wait because the real wait is defined
in libc/syscalls/syswait.c. It calls us. */
extern "C"
pid_t
_wait (int *status)
{
return wait4 (-1, status, 0, NULL);
}
pid_t
waitpid (pid_t intpid, int *status, int options)
{
return wait4 (intpid, status, options, NULL);
}
pid_t
wait3 (int *status, int options, struct rusage *r)
{
return wait4 (-1, status, options, r);
}
/* Wait for any child to complete.
* Note: this is not thread safe. Use of wait in multiple threads will
* not work correctly.
*/
pid_t
wait4 (int intpid, int *status, int options, struct rusage *r)
{
int rc;
waitq *w;
HANDLE waitfor;
* include/cygwin/version.h: Bump DLL minor version number to 5 due to all of the changes below. Redefine process structure to avoid a fixed size table. Redefine pinfo/_pinfo classes. Use these throughout. * dcrt0.cc (dll_crt0_1): Accomodate set_myself argument change. (__api_fatal): Accomodate _pinfo::record_death argument change. * exceptions.cc (really_exit): Ditto. (sig_handle_tty_stop): Use pinfo constructor to access process info. (events_init): Don't create pinfo_mutex since it is no longer required. * external.cc (fillout_pinfo): Use winpids class to iterate over all system pids. (cygwin_internal): lock_pinfo_for_update and unlock_pinfo are now noops. * fhandler_termios.cc (fhandler_termios::set_ctty): Use pinfo constructor to access process info. * fork.cc (fork): Reorganize to initialize child info after the child has started since that is when we know the child's winpid, which is necessary to allocate the pinfo shared memory. * mmap.cc (recreate_mmaps_after_fork): Change arg type to _pinfo. * pinfo.cc: Rename pinfo methods to _pinfo throughout. Eliminate pinfo_list stuff. (set_myself): Accept a pid argument now. Call pinfo initializer to initialize myself. Detect when this is an "execed" process and create an "indirect" pid block. (pinfo_init): Accomodate set_myself arg change. (procinfo): Remove. (pinfo::lock_pinfo): Remove. (pinfo::unlock_pinfo): Remove. (pinfo::init): New method. Allocates shared memory space for process pinfo structure. (pinfo::record_death): Don't call locking functions. (cygwin_winpid_to_pid): Simplify by using new pinfo constructor. (EnumProcessesW95): New function for iterating over processes on Windows 95. (winpids::winpids): New constructor for winpids class. Sets up a list of process ids. (enum_init): Initialize w95/wnt pid enumerators. * shared.cc (shared-info::initialize): Remove pid initialization. * shared.h: Move pinfo stuff into pinfo.h. (class shared_info): Remove pinfo_list element. * signal.cc (kill_worker): Use pinfo constructor to access process info. (kill_pgrp): Ditto. Use winpids methods to access list of processes. * sigproc.cc: Throughout, modify to use _pinfo where appropriate. (proc_exists (pid_t)): New function. Determines if a process exists based on the pid. (proc_exists (_pinfo *p): Use new proc_exists function above. (proc_subproc): Copy pinfo stuff around rather than _pinfo pointers. Try to be careful about releasing shared memory when we don't need it anymore. Remove pinfo locks. (remove_zombies): Remove pinfo memory when zombie is going away. * sigproc.h: Reflect _pinfo/pinfo changes in sigproc.cc. * spawn.cc (spawn_guts): Eliminate pinfo *child argument. Reorganize to only initialize child pinfo after process has been started and we know the windows pid. (_spawnve): Reflect spawn_guts changes. * syscalls.cc (setpgid): Use pinfo constructor to access process info. (getpgid): Ditto. (internal_getlogin): Use _pinfo. * winsup.h: Eliminate pinfo_mutex. Eliminate spawn_guts declaration since it is static now. Reflect set_myself argument change. * include/sys/cygwin.h: Add some PID_* enums to accomodate new pinfo stuff. * include/cygwin/version.h: Update minor version for cygdrive changes below.
2000-07-29 18:24:59 +02:00
sigproc_printf ("here");
2000-02-17 20:38:33 +01:00
if (options & ~(WNOHANG | WUNTRACED))
{
set_errno (EINVAL);
return -1;
}
if (r)
memset (r, 0, sizeof (*r));
if ((w = (waitq *) waitq_storage.get ()) == NULL)
w = (waitq *) waitq_storage.create ();
w->pid = intpid;
w->options = options;
w->rusage = r;
sigproc_printf("calling proc_subproc, pid %d, options %d",
w->pid, w->options);
if (!proc_subproc(PROC_WAIT, (DWORD)w))
{
set_errno(ENOSYS);
paranoid_printf ("proc_subproc returned 0");
rc = -1;
goto done;
}
if ((waitfor = w->ev) == NULL)
goto nochildren;
rc = WaitForSingleObject (waitfor, INFINITE);
sigproc_printf ("%d = WaitForSingleObject (...)", rc);
if (w->ev == NULL)
{
nochildren:
/* found no children */
set_errno (ECHILD);
rc = -1;
goto done;
}
if (w->status == -1)
{
set_sig_errno (EINTR);
rc = -1;
}
else if (rc != WAIT_OBJECT_0)
{
/* We shouldn't set errno to any random value if we can help it.
See the Posix manual for a list of valid values for `errno'. */
set_errno (EINVAL);
rc = -1;
}
else if ((rc = w->pid) != 0 && status)
*status = w->status;
done:
sigproc_printf ("intpid %d, status %p, w->status %d, options %d, rc %d",
intpid, status, w->status, options, rc);
w->status = -1;
if (rc < 0)
sigproc_printf("*** errno = %d", get_errno());
return rc;
}