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

* dcrt0.cc (child_info_fork::alloc_stack_hard_way): Fix datatype of

Browse Source 
stacksize to SIZE_T.  Cast to SIZE_T in pointer arithmetic.  Slightly
	enhance output in case of a fatal error.
	* fork.cc (frok::parent): Always set ch.stackaddr to DeallocationStack
	value of current thread to help stack reservation in
	child_info_fork::alloc_stack_hard_way along.  Simplify subsequent code
	storing stack values in ch.  Print guardsize in hex, too.
This commit is contained in:
Corinna Vinschen
2013-05-23 20:10:35 +00:00
parent df7a7e2e82
commit c6696a3426
3 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
winsup/cygwin/fork.cc
View File

@@ -302,17 +302,17 @@ frok::parent (volatile char * volatile stack_here)
ch.forker_finished = forker_finished;
PTEB teb = NtCurrentTeb ();
ch.stackbottom = _tlsbase;
ch.stacktop = (void *) _tlstop;
ch.stackaddr = 0;
ch.stackaddr = teb->DeallocationStack;
ch.guardsize = 0;
if (&_my_tls != _main_tls)
{
/* We have not been started from the main thread. Fetch the
information required to set up the thread stack identically
in the child. */
PTEB teb = NtCurrentTeb ();
if (!teb->DeallocationStack)
if (!ch.stackaddr)
{
/* Pthread with application-provided stack. Don't set up a
PAGE_GUARD page. guardsize == -1 is used in alloc_stack_hard_way
@@ -320,15 +320,11 @@ frok::parent (volatile char * volatile stack_here)
ch.stackaddr = _my_tls.tid->attr.stackaddr;
ch.guardsize = (size_t) -1;
}
else
{
ch.stackaddr = teb->DeallocationStack;
/* If it's a pthread, fetch guardsize from thread attributes. */
if (_my_tls.tid)
ch.guardsize = _my_tls.tid->attr.guardsize;
}
else if (_my_tls.tid)
/* If it's a pthread, fetch guardsize from thread attributes. */
ch.guardsize = _my_tls.tid->attr.guardsize;
}
debug_printf ("stack - bottom %p, top %p, addr %p, guardsize %lu",
debug_printf ("stack - bottom %p, top %p, addr %p, guardsize %ly",
ch.stackbottom, ch.stacktop, ch.stackaddr, ch.guardsize);
PROCESS_INFORMATION pi;