diff options
author | Christopher Faylor <me@cgf.cx> | 2003-12-14 10:09:22 +0300 |
---|---|---|
committer | Christopher Faylor <me@cgf.cx> | 2003-12-14 10:09:22 +0300 |
commit | c350feda2096e2446bf7cc0b97019eed7386400d (patch) | |
tree | cf4d16da61690609cc660b194d3b236d93ba0a40 /winsup/cygwin/cygthread.cc | |
parent | f082663050af4062e8fea5e3f56991794dcb0091 (diff) |
* 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.
Diffstat (limited to 'winsup/cygwin/cygthread.cc')
-rw-r--r-- | winsup/cygwin/cygthread.cc | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/winsup/cygwin/cygthread.cc b/winsup/cygwin/cygthread.cc index 2a120fb61..16f629634 100644 --- a/winsup/cygwin/cygthread.cc +++ b/winsup/cygwin/cygthread.cc @@ -32,13 +32,6 @@ bool NO_COPY cygthread::exiting; 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 SIGSEGV or SIGFPE. */ @@ -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); @@ -99,13 +92,6 @@ cygthread::stub2 (void *arg, void *) 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 SIGSEGV or SIGFPE. */ @@ -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. */ |