* exceptions.cc (signal_exit): Eliminate setting of main thread priority since

process lock should make that unnecessary.
* fork.cc (stack_base): Eliminate.
(frok::parent): Subsume stack_base and just set stack stuff here.  Report on
priority class in debugging output.
* spawn.cc (spawn_guts): Report on priority class in debugging output.
This commit is contained in:
Christopher Faylor 2005-10-29 20:33:59 +00:00
parent f02b22dcee
commit 0dc249751d
4 changed files with 20 additions and 17 deletions

View File

@ -1,3 +1,12 @@
2005-10-29 Christopher Faylor <cgf@timesys.com>
* exceptions.cc (signal_exit): Eliminate setting of main thread
priority since process lock should make that unnecessary.
* fork.cc (stack_base): Eliminate.
(frok::parent): Subsume stack_base and just set stack stuff here.
Report on priority class in debugging output.
* spawn.cc (spawn_guts): Report on priority class in debugging output.
2005-10-29 Christopher Faylor <cgf@timesys.com> 2005-10-29 Christopher Faylor <cgf@timesys.com>
* fork.cc (frok::child): Change order of cleanup prior to return. * fork.cc (frok::child): Change order of cleanup prior to return.

View File

@ -1187,10 +1187,8 @@ signal_exit (int rc)
if (hExeced || exit_state) if (hExeced || exit_state)
myself.exit (rc); myself.exit (rc);
/* We'd like to stop the main thread from executing but when we do that it /* Starve other threads in a vain attempt to stop them from doing something
causes random, inexplicable hangs. So, instead, we set up the priority stupid. */
of this thread really high so that it should do its thing and then exit. */
SetThreadPriority (hMainThread, THREAD_PRIORITY_IDLE);
SetThreadPriority (GetCurrentThread (), THREAD_PRIORITY_TIME_CRITICAL); SetThreadPriority (GetCurrentThread (), THREAD_PRIORITY_TIME_CRITICAL);
user_data->resourcelocks->Delete (); user_data->resourcelocks->Delete ();

View File

@ -55,17 +55,6 @@ class frok
friend int fork (); friend int fork ();
}; };
static void
stack_base (child_info_fork *ch)
{
ch->stackbottom = _tlsbase;
ch->stacktop = &ch;
ch->stacksize = (char *) ch->stackbottom - (char *) &ch;
debug_printf ("bottom %p, top %p, stack %p, size %d, reserve %d",
ch->stackbottom, ch->stacktop, &ch, ch->stacksize,
(char *) ch->stackbottom - (char *) ch->stacktop);
}
/* Copy memory from parent to child. /* Copy memory from parent to child.
The result is a boolean indicating success. */ The result is a boolean indicating success. */
@ -299,6 +288,7 @@ frok::parent (void *stack_here)
pthread::atforkprepare (); pthread::atforkprepare ();
int c_flags = GetPriorityClass (hMainProc); 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}; 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 /* If we don't have a console, then don't create a console for the
@ -342,7 +332,11 @@ frok::parent (void *stack_here)
ch.forker_finished = forker_finished; ch.forker_finished = forker_finished;
stack_base (&ch); ch.stackbottom = _tlsbase;
ch.stacktop = stack_here;
ch.stacksize = (char *) ch.stackbottom - (char *) stack_here;
debug_printf ("stack - bottom %p, top %p, size %d",
ch.stackbottom, ch.stacktop, ch.stacksize);
si.cb = sizeof (STARTUPINFO); si.cb = sizeof (STARTUPINFO);
si.lpReserved2 = (LPBYTE) &ch; si.lpReserved2 = (LPBYTE) &ch;

View File

@ -576,7 +576,9 @@ spawn_guts (const char * prog_arg, const char *const *argv,
si.hStdError = handle (2, 1); /* Get output handle */ si.hStdError = handle (2, 1); /* Get output handle */
si.cb = sizeof (si); si.cb = sizeof (si);
int flags = CREATE_DEFAULT_ERROR_MODE | GetPriorityClass (hMainProc) | CREATE_SEPARATE_WOW_VDM; int flags = GetPriorityClass (hMainProc);
sigproc_printf ("priority class %d", flags);
flags |= CREATE_DEFAULT_ERROR_MODE | CREATE_SEPARATE_WOW_VDM;
if (mode == _P_DETACH || !set_console_state_for_spawn ()) if (mode == _P_DETACH || !set_console_state_for_spawn ())
flags |= DETACHED_PROCESS; flags |= DETACHED_PROCESS;