JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* dcrt0.cc (dll_crt0_0): Reorganize so that sigproc_init is called a little

Browse Source 
later.  Add a comment.
* fork.cc (resume_child): Make void.
(frok::parent): Only zero pi when necessary.  Explicitly zero si.  Set
this_errno when child_copy fails.  Accommodate change to resume_child.
* sigproc.cc (sigalloc): Move global_sigs initialization here.
(sigproc_init): Move global_sigs.
(sig_send): Just check for flush signals once.
* wincap.h: Define supports_setconsolectrlhandler_null throughout.
* wincap.cc: Ditto.
This commit is contained in:
Christopher Faylor
2006-03-13 18:29:48 +00:00
parent d6382e653a
commit bbca1e4cb9
6 changed files with 73 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
winsup/cygwin/fork.cc
View File

@@ -50,12 +50,12 @@ class frok
friend int fork ();
};
static int
static void
resume_child (HANDLE forker_finished)
{
SetEvent (forker_finished);
debug_printf ("signalled child");
return 1;
return;
}
/* Notify parent that it is time for the next step. */
@@ -214,7 +214,6 @@ frok::parent (void *stack_here)
{
HANDLE forker_finished;
DWORD rc;
PROCESS_INFORMATION pi = {0, NULL, 0, 0};
child_pid = -1;
error = NULL;
this_errno = 0;
@@ -225,7 +224,6 @@ frok::parent (void *stack_here)
int c_flags = GetPriorityClass (hMainProc);
debug_printf ("priority class %d", c_flags);
STARTUPINFO si = {0, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL};
/* If we don't have a console, then don't create a console for the
child either. */
@@ -274,6 +272,10 @@ frok::parent (void *stack_here)
debug_printf ("stack - bottom %p, top %p, size %d",
ch.stackbottom, ch.stacktop, ch.stacksize);
PROCESS_INFORMATION pi;
STARTUPINFO si;
memset (&si, 0, sizeof (si));
si.cb = sizeof (STARTUPINFO);
si.lpReserved2 = (LPBYTE) &ch;
si.cbReserved2 = sizeof (ch);
@@ -300,6 +302,7 @@ frok::parent (void *stack_here)
{
this_errno = geterrno_from_win_error ();
error = "CreateProcessA failed";
memset (&pi, 0, sizeof (pi));
goto cleanup;
}
@@ -403,7 +406,10 @@ frok::parent (void *stack_here)
locked = false;
MALLOC_CHECK;
if (!rc)
goto cleanup;
{
this_errno = get_errno ();
goto cleanup;
}
/* Now fill data/bss of any DLLs that were linked into the program. */
for (dll *d = dlls.istart (DLL_LINK); d; d = dlls.inext ())
@@ -422,10 +428,9 @@ frok::parent (void *stack_here)
}
}
/* Start thread, and wait for it to reload dlls. */
if (!resume_child (forker_finished))
goto cleanup;
else if (!ch.sync (child->pid, pi.hProcess, FORK_WAIT_TIMEOUT))
/* Start thread, and then wait for it to reload dlls. */
resume_child (forker_finished);
if (!ch.sync (child->pid, pi.hProcess, FORK_WAIT_TIMEOUT))
{
this_errno = EAGAIN;
error = "died waiting for dll loading";