* cygthread.cc (cygthread::stub): Revert previous change and again subsume
cygthread::stub2. Just return from function now since ExitThread is guaranteed by automatic _threadinfo wrapper. Define as per ThreadProc convention. (cygthread::stub2): Remove. (cygthread::simplestub): Perform similar operations to cygthread::stub. (cygthread::simplestub2): Remove. * cygthread.h (cygthread::stub): Declare as per ThreadProc convention. (cygthread::stub2): Remove declaration. (cygthread::simplestub): Declare as per ThreadProc convention. (cygthread::simplestub2): Remove declaration. * cygtls.h (_threadinfo::call): Define first argument as per ThreadProc convention. (_threadinfo::call2): Ditto. (_tlsbase): Define as char * pointer. (_tlstop): New definition. (_main_tls): Define here. * dcrt0.cc (alloc_stack): Revert previous change which called init_thread since information would be overwritten by fork later anyway. (dll_crt0_1): Use _tlsbase and _tlstop for setting stack bottom, top. * exceptions.cc: Move _main_tls declaration to cygtls.h. (_threadinfo::call): Define first argument as per ThreadProc convention. (_threadinfo::call2): Call ExitThread with thread function return value. (_threadinfo::init_thread): Don't initialize cygtls to zero if input arg is NULL. * fork.cc (fork_child): Reset _main_tls here. Reinitialize parts of _my_tls after copying data from parent. * init.cc (threadfunc_fe): New function. Front-end for all threads created in cygwin processes. (munge_threadfunc): New function. (dll_entry): Call munge_threadfunc to force the call of a thread wrapper. * thread.cc (pthread::thread_init_wrapper): Perform similar operations to cygthread::stub. (pthread::thread_init_wrapper2): Remove. * thread.h (pthread::thread_init_wrapper): Declare as per ThreadProc convention. (pthread::thread_init_wrapper2): Remove declaration. * window.cc (Winmain): Just return from function now since ExitThread is guaranteed by automatic _threadinfo wrapper.
This commit is contained in:
@ -31,13 +31,6 @@ bool NO_COPY cygthread::exiting;
|
||||
to execute. */
|
||||
DWORD WINAPI
|
||||
cygthread::stub (VOID *arg)
|
||||
{
|
||||
_threadinfo::call (stub2, arg);
|
||||
return 0;
|
||||
}
|
||||
|
||||
void
|
||||
cygthread::stub2 (void *arg, void *)
|
||||
{
|
||||
exception_list except_entry;
|
||||
/* Initialize this thread's ability to respond to things like
|
||||
@ -71,7 +64,7 @@ cygthread::stub2 (void *arg, void *)
|
||||
else
|
||||
{
|
||||
if (!info->func || exiting)
|
||||
ExitThread (0);
|
||||
return 0;
|
||||
|
||||
/* Cygwin threads should not call ExitThread directly */
|
||||
info->func (info->arg == cygself ? info : info->arg);
|
||||
@ -98,13 +91,6 @@ cygthread::stub2 (void *arg, void *)
|
||||
and then exits the thread. */
|
||||
DWORD WINAPI
|
||||
cygthread::simplestub (VOID *arg)
|
||||
{
|
||||
_threadinfo::call (simplestub2, arg);
|
||||
return 0;
|
||||
}
|
||||
|
||||
void
|
||||
cygthread::simplestub2 (void *arg, void *)
|
||||
{
|
||||
exception_list except_entry;
|
||||
/* Initialize this thread's ability to respond to things like
|
||||
@ -116,7 +102,7 @@ cygthread::simplestub2 (void *arg, void *)
|
||||
info->stack_ptr = &arg;
|
||||
info->ev = info->h;
|
||||
info->func (info->arg == cygself ? info : info->arg);
|
||||
ExitThread (0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Start things going. Called from dll_crt0_1. */
|
||||
|
Reference in New Issue
Block a user