* exceptions.cc: (ctrl_c_handler): Do nothing while a Cygwin subprocess is
starting. * child_info.h (init_child_info): Remove pid argument from declaration. * cygheap.h (init_cygheap::pid): New element. * dcrt0.cc (dll_crt0_0): Eliminate handling of now-noexistent cygpid parameter in child_info struct. Set forkee to 'true' rather than cygpid since the pid value was never used. (dll_crt0_1): Ditto. (_dll_crt0): Ditto. * fork.cc (fork_child): Don't wait for sigthread. This is handled in the fork call now. (fork_parent): Remove obsolete pid argument from init_child_info call. Don't do anything special with cygpid when DEBUGGING. (fork): Delay all signals during fork. (fork_init): Don't do anything special when DEBUGGING. * pinfo.cc (set_myself): Remove pid parameter. Use new pid field in cygheap. (pinfo_init): Don't pass pid argument to set_myself. * sigproc.cc (sig_send): Wait for dwProcessId to be non-zero as well as sendsig. (init_child_info): Eliminate handling of pid. (wait_sig): Implement method to temporarily hold off sending signals. * sigproc.h (__SIGHOLD): New enum. (__SIGNOHOLD): Ditto. * spawn.cc (spawn_guts): Remove obsolete pid argument from init_child_info call.
This commit is contained in:
@@ -44,7 +44,7 @@ pinfo_fixup_after_fork ()
|
||||
{
|
||||
if (hexec_proc)
|
||||
CloseHandle (hexec_proc);
|
||||
/* Keeps the cygpid from being reused. No rights required */
|
||||
/* Keeps the cygpid from being reused. No rights required */
|
||||
if (!DuplicateHandle (hMainProc, hMainProc, hMainProc, &hexec_proc, 0,
|
||||
TRUE, 0))
|
||||
{
|
||||
@@ -58,19 +58,18 @@ pinfo_fixup_after_fork ()
|
||||
This is done once when the dll is first loaded. */
|
||||
|
||||
void __stdcall
|
||||
set_myself (pid_t pid, HANDLE h)
|
||||
set_myself (HANDLE h)
|
||||
{
|
||||
DWORD winpid = GetCurrentProcessId ();
|
||||
if (pid == 1)
|
||||
pid = cygwin_pid (winpid);
|
||||
myself.init (pid, PID_IN_USE | PID_MYSELF, h);
|
||||
myself->dwProcessId = winpid;
|
||||
if (!h)
|
||||
cygheap->pid = cygwin_pid (GetCurrentProcessId ());
|
||||
myself.init (cygheap->pid, PID_IN_USE | PID_MYSELF, h);
|
||||
myself->process_state |= PID_IN_USE;
|
||||
myself->start_time = time (NULL); /* Register our starting time. */
|
||||
|
||||
(void) GetModuleFileName (NULL, myself->progname, sizeof (myself->progname));
|
||||
if (!strace.active)
|
||||
strace.hello ();
|
||||
debug_printf ("myself->dwProcessId %u", myself->dwProcessId);
|
||||
InitializeCriticalSection (&myself->lock);
|
||||
return;
|
||||
}
|
||||
@@ -90,7 +89,7 @@ pinfo_init (char **envp, int envc)
|
||||
{
|
||||
/* Invent our own pid. */
|
||||
|
||||
set_myself (1);
|
||||
set_myself (NULL);
|
||||
myself->ppid = 1;
|
||||
myself->pgid = myself->sid = myself->pid;
|
||||
myself->ctty = -1;
|
||||
|
Reference in New Issue
Block a user