* cygtls.cc (cygtls::call2): Move socket cleanup.
(cygtls::remove): Move socket cleanup here. Don't use _my_tls to reference it.
This commit is contained in:
parent
0eefa5256b
commit
02e221b774
|
@ -1,3 +1,9 @@
|
||||||
|
2005-01-28 Christopher Faylor <cgf@timesys.com>
|
||||||
|
|
||||||
|
* cygtls.cc (cygtls::call2): Move socket cleanup.
|
||||||
|
(cygtls::remove): Move socket cleanup here. Don't use _my_tls to
|
||||||
|
reference it.
|
||||||
|
|
||||||
2005-01-26 Christopher Faylor <cgf@timesys.com>
|
2005-01-26 Christopher Faylor <cgf@timesys.com>
|
||||||
|
|
||||||
* pinfo.cc (pinfo::init): Avoid a compiler warning.
|
* pinfo.cc (pinfo::init): Avoid a compiler warning.
|
||||||
|
|
|
@ -91,10 +91,6 @@ _cygtls::call2 (DWORD (*func) (void *, void *), void *arg, void *buf)
|
||||||
_my_tls.init_thread (buf, func);
|
_my_tls.init_thread (buf, func);
|
||||||
DWORD res = func (arg, buf);
|
DWORD res = func (arg, buf);
|
||||||
_my_tls.remove (INFINITE);
|
_my_tls.remove (INFINITE);
|
||||||
// FIXME: Need some sort of atthreadexit function to allow things like
|
|
||||||
// select to control this themselves
|
|
||||||
if (_my_tls.locals.exitsock != INVALID_SOCKET)
|
|
||||||
closesocket (_my_tls.locals.exitsock);
|
|
||||||
ExitThread (res);
|
ExitThread (res);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -156,6 +152,10 @@ void
|
||||||
_cygtls::remove (DWORD wait)
|
_cygtls::remove (DWORD wait)
|
||||||
{
|
{
|
||||||
debug_printf ("wait %p\n", wait);
|
debug_printf ("wait %p\n", wait);
|
||||||
|
// FIXME: Need some sort of atthreadexit function to allow things like
|
||||||
|
// select to control this themselves
|
||||||
|
if (_my_tls.locals.exitsock != INVALID_SOCKET)
|
||||||
|
closesocket (locals.exitsock);
|
||||||
do
|
do
|
||||||
{
|
{
|
||||||
sentry here (wait);
|
sentry here (wait);
|
||||||
|
|
Loading…
Reference in New Issue