* cygtls.h (struct _cygtls): Remove unneeded elements.

* thread.cc (pthread::exit): Avoid potential double call to _my_tls.remove.
* tlsoffsets.h: Regenerate.
This commit is contained in:
Christopher Faylor 2010-02-10 03:17:32 +00:00
parent 5880fbf783
commit 161387a725
4 changed files with 37 additions and 43 deletions

View File

@ -1,3 +1,10 @@
2010-02-09 Christopher Faylor <me+cygwin@cgf.cx>
* cygtls.h (struct _cygtls): Remove unneeded elements.
* thread.cc (pthread::exit): Avoid potential double call to
_my_tls.remove.
* tlsoffsets.h: Regenerate.
2010-02-09 Corinna Vinschen <corinna@vinschen.de> 2010-02-09 Corinna Vinschen <corinna@vinschen.de>
* nlsfuncs.cc (__set_lc_messages_from_win): Fix typo. * nlsfuncs.cc (__set_lc_messages_from_win): Fix typo.

View File

@ -207,7 +207,6 @@ struct _cygtls
class cygthread *_ctinfo; class cygthread *_ctinfo;
san andreas; san andreas;
waitq wq; waitq wq;
struct _cygtls *prev, *next;
int sig; int sig;
unsigned incyg; unsigned incyg;
unsigned spinning; unsigned spinning;

View File

@ -486,14 +486,10 @@ pthread::exit (void *value_ptr)
_my_tls.local_clib.__sdidinit = 0; _my_tls.local_clib.__sdidinit = 0;
(_reclaim_reent) (_REENT); (_reclaim_reent) (_REENT);
if (InterlockedDecrement (&MT_INTERFACE->threadcount) == 0) if (InterlockedDecrement (&MT_INTERFACE->threadcount) == 0)
::exit (0); ::exit (0);
else else
{ ExitThread (0);
_my_tls.remove (INFINITE);
ExitThread (0);
}
} }
int int

View File

@ -1,6 +1,6 @@
//;# autogenerated: Do not edit. //;# autogenerated: Do not edit.
//; $tls::sizeof__cygtls = 4332; //; $tls::sizeof__cygtls = 4324;
//; $tls::func = -12700; //; $tls::func = -12700;
//; $tls::pfunc = 0; //; $tls::pfunc = 0;
//; $tls::el = -12696; //; $tls::el = -12696;
@ -45,24 +45,20 @@
//; $tls::pandreas = 3232; //; $tls::pandreas = 3232;
//; $tls::wq = -9452; //; $tls::wq = -9452;
//; $tls::pwq = 3248; //; $tls::pwq = 3248;
//; $tls::prev = -9424; //; $tls::sig = -9424;
//; $tls::pprev = 3276; //; $tls::psig = 3276;
//; $tls::next = -9420; //; $tls::incyg = -9420;
//; $tls::pnext = 3280; //; $tls::pincyg = 3280;
//; $tls::sig = -9416; //; $tls::spinning = -9416;
//; $tls::psig = 3284; //; $tls::pspinning = 3284;
//; $tls::incyg = -9412; //; $tls::stacklock = -9412;
//; $tls::pincyg = 3288; //; $tls::pstacklock = 3288;
//; $tls::spinning = -9408; //; $tls::stackptr = -9408;
//; $tls::pspinning = 3292; //; $tls::pstackptr = 3292;
//; $tls::stacklock = -9404; //; $tls::stack = -9404;
//; $tls::pstacklock = 3296; //; $tls::pstack = 3296;
//; $tls::stackptr = -9400; //; $tls::initialized = -8380;
//; $tls::pstackptr = 3300; //; $tls::pinitialized = 4320;
//; $tls::stack = -9396;
//; $tls::pstack = 3304;
//; $tls::initialized = -8372;
//; $tls::pinitialized = 4328;
//; __DATA__ //; __DATA__
#define tls_func (-12700) #define tls_func (-12700)
@ -109,21 +105,17 @@
#define tls_pandreas (3232) #define tls_pandreas (3232)
#define tls_wq (-9452) #define tls_wq (-9452)
#define tls_pwq (3248) #define tls_pwq (3248)
#define tls_prev (-9424) #define tls_sig (-9424)
#define tls_pprev (3276) #define tls_psig (3276)
#define tls_next (-9420) #define tls_incyg (-9420)
#define tls_pnext (3280) #define tls_pincyg (3280)
#define tls_sig (-9416) #define tls_spinning (-9416)
#define tls_psig (3284) #define tls_pspinning (3284)
#define tls_incyg (-9412) #define tls_stacklock (-9412)
#define tls_pincyg (3288) #define tls_pstacklock (3288)
#define tls_spinning (-9408) #define tls_stackptr (-9408)
#define tls_pspinning (3292) #define tls_pstackptr (3292)
#define tls_stacklock (-9404) #define tls_stack (-9404)
#define tls_pstacklock (3296) #define tls_pstack (3296)
#define tls_stackptr (-9400) #define tls_initialized (-8380)
#define tls_pstackptr (3300) #define tls_pinitialized (4320)
#define tls_stack (-9396)
#define tls_pstack (3304)
#define tls_initialized (-8372)
#define tls_pinitialized (4328)