mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-18 12:29:32 +08:00
962f9a2ccc
* cygserver_ipc.h (ipc_set_proc_info): Use _cygtls::ipc_set_proc_info to set per-thread signal arrived value. * cygthread.cc (cygthread::detach): Use per-thread signal_arrived via set_thread_waiting. * fork.cc (_cygtls::fixup_after_fork): Clear signal_arrived. (_cygtls::remove): Close any signal_arrived handle when thread exists. (_cygtls::find_tls): Remove unneeded function. * cygtls.h: Update copyright. (class _cygtls): Reorganize to help avoid rebuilding newlib when structure changes. (_cygtls::event): Delete. (_cygtls::threadkill): Ditto. (_cygtls::signal_waiting): Declare new bool. (_cygtls::find_tls): Delete declaration. (_cygtls::set_threadkill): Ditto. (_cygtls::reset_threadkill): Ditto. (_cygtls::set_signal_arrived): Declare new function. (class set_thread_waiting): Declare new class. * cygwait.cc (cw_nowait_storage): Define. (cygwait): Set per-thread signal_arrived via set_thread_waiting. Don't special-case _main_tls. * cygwait.h (cw_nowait): Define. (cw_infinite): Ditto. (cygwait): Redefine pathological wait-only case. * dcrt0.cc (dll_crt0_0): Remove call to now-defunct events_init(). (dll_crt0_1): Remove call to now-defunct create_signal_arrived(). * exceptions.cc: Reflect set_signal_mask() argument reordering throughout. Remove signal mask synchronization throughout. (events_init): Delete definition. (mask_sync): Delete now-unneeded mask synchronization. (set_signal_mask): Reverse order of arguments to "standard" to, from layout. Rename "newmask" argument to "setmask". Remove debugging. (sig_handle_tty_stop): Use cancelable_wait rather than WFMO. (_cygtls::interrupt_setup): Don't treat "threadkill" events specially. Conditionally set signal_arrived depending on whether the thread has created it or not. (sigpacket::process): Reorganize to reflect thread-specific sending of signals which is more in line with the way it was actually supposed to work. * fhandler_socket.cc (get_inet_addr): Use cancelable_wait rather than IsEventSignalled to avoid potential race. (fhandler_socket::wait_for_events): Set signal_arrived event using set_thread_waiting(). (fhandler_socket::close): Use cygwait for the case of just waiting 10 ms for a signal. * fhandler_tape.cc (fhandler_dev_tape::_lock): Use cancelable_wait rather than WFMO. Redo switch/case tests accordingly. * fhandler_termios.cc (fhandler_termios::bg_check): Use cygwait for case of just waiting 0 ms for a potential signal. * fhandler_tty.cc (fhandler_pty_master::process_slave_output): Use cancelable_wait rather than WFSO. * fhandler_windows.cc (fhandler_windows::read): Set per-thread signal_arrived via set_thread_waiting(). * flock.cc (lf_setlock): Ditto. * select.cc (pselect): Ditto. Set per-thread signal_arrived using set_thread_waiting(). * gendef: Don't special case handling of _cygtls::sig for threads. * gentls_offsets: Use #pragma once in tlsoffsets.h. * ntdll.h: Use #pragma once. * poll.cc: Reflect set_signal_mask() argument reordering. * posix_ipc.cc (ipc_mutex_lock): Use cancelable_wait rather than WFMO. (ipc_cond_timedwait): Set perl-thread signal arrived using set_thread_waiting(). * security.h: Use #pragma once. * signal.cc (abort): Reflect set_signal_mask() argument reordering. (clock_nanosleep): Ditto. Change call to cancelable_wait to properly specify handling of cancel and interrupt. (sigwaitinfo): Remove handling of per-thread event in favor of per-thread signal_arrived. Use cancelable_wait rather than WFSO. * sigproc.cc (signal_arrived): Delete definition. (create_signal_arrived): Ditto. * sigproc.h (signal_arrived): Delete declaration. (set_signal_mask): Avoid defining as a "C" function. Don't conditionally declare. (create_signal_arrived): Delete declaration. * syscalls.cc (rename): Use cygwait() rather than WFSO. * thread.h (fast_mutex::lock): Use cw_infinite rather than LARGE_NULL. * wait.cc (wait4): Ditto. * thread.cc (pthread_mutex::lock): Ditto. (pthread::join): Ditto. (semaphore::_wait): Ditto. (pthread_kill): Remove set_threadkill() accommodation. * tlsoffsets.h: Regenerate.
270 lines
7.0 KiB
C++
270 lines
7.0 KiB
C++
/* cygtls.cc
|
|
|
|
Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
|
|
2012 Red Hat, Inc.
|
|
|
|
This software is a copyrighted work licensed under the terms of the
|
|
Cygwin license. Please consult the file "CYGWIN_LICENSE" for
|
|
details. */
|
|
|
|
#include "winsup.h"
|
|
#define USE_SYS_TYPES_FD_SET
|
|
#include "cygtls.h"
|
|
#include <syslog.h>
|
|
#include <stdlib.h>
|
|
#include "path.h"
|
|
#include "fhandler.h"
|
|
#include "dtable.h"
|
|
#include "cygheap.h"
|
|
#include "sigproc.h"
|
|
#include "exception.h"
|
|
|
|
class sentry
|
|
{
|
|
static muto lock;
|
|
int destroy;
|
|
public:
|
|
void init ();
|
|
bool acquired () {return lock.acquired ();}
|
|
sentry () {destroy = 0;}
|
|
sentry (DWORD wait) {destroy = lock.acquire (wait);}
|
|
~sentry () {if (destroy) lock.release ();}
|
|
friend void _cygtls::init ();
|
|
};
|
|
|
|
muto NO_COPY sentry::lock;
|
|
|
|
static size_t NO_COPY nthreads;
|
|
|
|
#define THREADLIST_CHUNK 256
|
|
|
|
void
|
|
_cygtls::init ()
|
|
{
|
|
if (cygheap->threadlist)
|
|
memset (cygheap->threadlist, 0, cygheap->sthreads * sizeof (cygheap->threadlist[0]));
|
|
else
|
|
{
|
|
cygheap->sthreads = THREADLIST_CHUNK;
|
|
cygheap->threadlist = (_cygtls **) ccalloc_abort (HEAP_TLS, cygheap->sthreads,
|
|
sizeof (cygheap->threadlist[0]));
|
|
}
|
|
sentry::lock.init ("sentry_lock");
|
|
}
|
|
|
|
/* Two calls to get the stack right... */
|
|
void
|
|
_cygtls::call (DWORD (*func) (void *, void *), void *arg)
|
|
{
|
|
char buf[CYGTLS_PADSIZE];
|
|
/* Initialize this thread's ability to respond to things like
|
|
SIGSEGV or SIGFPE. */
|
|
exception protect;
|
|
_my_tls.call2 (func, arg, buf);
|
|
}
|
|
|
|
static int
|
|
dll_cmp (const void *a, const void *b)
|
|
{
|
|
return wcscasecmp ((const wchar_t *) a, *(const wchar_t **) b);
|
|
}
|
|
|
|
/* Keep sorted!
|
|
This is a list of well-known core system DLLs which contain code
|
|
whiuch is started in its own thread by the system. Kernel32.dll,
|
|
for instance, contains the thread called on every Ctrl-C keypress
|
|
in a console window. The DLLs in this list are not recognized as
|
|
BLODAs. */
|
|
const wchar_t *well_known_dlls[] =
|
|
{
|
|
L"advapi32.dll",
|
|
L"kernel32.dll",
|
|
L"mswsock.dll",
|
|
L"ntdll.dll",
|
|
L"ole32.dll",
|
|
L"shlwapi.dll",
|
|
L"wbemprox.dll",
|
|
L"ws2_32.dll",
|
|
};
|
|
|
|
void
|
|
_cygtls::call2 (DWORD (*func) (void *, void *), void *arg, void *buf)
|
|
{
|
|
init_thread (buf, func);
|
|
|
|
/* Optional BLODA detection. The idea is that the function address is
|
|
supposed to be within Cygwin itself. This is also true for pthreads,
|
|
since pthreads are always calling thread_wrapper in miscfuncs.cc.
|
|
Therefore, every function call to a function outside of the Cygwin DLL
|
|
is potentially a thread injected into the Cygwin process by some BLODA.
|
|
|
|
But that's a bit too simple. Assuming the application itself calls
|
|
CreateThread, then this is a bad idea, but not really invalid. So we
|
|
shouldn't print a BLODA message if the address is within the loaded
|
|
image of the application. Also, ntdll.dll starts threads into the
|
|
application which */
|
|
if (detect_bloda)
|
|
{
|
|
PIMAGE_DOS_HEADER img_start = (PIMAGE_DOS_HEADER) GetModuleHandle (NULL);
|
|
PIMAGE_NT_HEADERS32 ntheader = (PIMAGE_NT_HEADERS32)
|
|
((PBYTE) img_start + img_start->e_lfanew);
|
|
void *img_end = (void *) ((PBYTE) img_start
|
|
+ ntheader->OptionalHeader.SizeOfImage);
|
|
if (((void *) func < (void *) cygwin_hmodule
|
|
|| (void *) func > (void *) cygheap)
|
|
&& ((void *) func < (void *) img_start || (void *) func >= img_end))
|
|
{
|
|
MEMORY_BASIC_INFORMATION mbi;
|
|
wchar_t modname[PATH_MAX];
|
|
|
|
VirtualQuery ((PVOID) func, &mbi, sizeof mbi);
|
|
GetModuleFileNameW ((HMODULE) mbi.AllocationBase, modname, PATH_MAX);
|
|
/* Fetch basename and check against list of above system DLLs. */
|
|
const wchar_t *modbasename = wcsrchr (modname, L'\\') + 1;
|
|
if (!bsearch (modbasename, well_known_dlls,
|
|
sizeof well_known_dlls / sizeof well_known_dlls[0],
|
|
sizeof well_known_dlls[0], dll_cmp))
|
|
small_printf ("\n\nPotential BLODA detected! Thread function "
|
|
"called outside of Cygwin DLL:\n %W\n\n", modname);
|
|
}
|
|
}
|
|
|
|
DWORD res = func (arg, buf);
|
|
remove (INFINITE);
|
|
/* Don't call ExitThread on the main thread since we may have been
|
|
dynamically loaded. */
|
|
if ((void *) func != (void *) dll_crt0_1
|
|
&& (void *) func != (void *) dll_dllcrt0_1)
|
|
ExitThread (res);
|
|
}
|
|
|
|
void
|
|
_cygtls::init_thread (void *x, DWORD (*func) (void *, void *))
|
|
{
|
|
if (x)
|
|
{
|
|
memset (this, 0, sizeof (*this));
|
|
_REENT_INIT_PTR (&local_clib);
|
|
stackptr = stack;
|
|
if (_GLOBAL_REENT)
|
|
{
|
|
local_clib._stdin = _GLOBAL_REENT->_stdin;
|
|
local_clib._stdout = _GLOBAL_REENT->_stdout;
|
|
local_clib._stderr = _GLOBAL_REENT->_stderr;
|
|
local_clib.__sdidinit = _GLOBAL_REENT->__sdidinit ? -1 : 0;
|
|
local_clib.__cleanup = _GLOBAL_REENT->__cleanup;
|
|
local_clib.__sglue._niobs = 3;
|
|
local_clib.__sglue._iobs = &_GLOBAL_REENT->__sf[0];
|
|
}
|
|
}
|
|
|
|
thread_id = GetCurrentThreadId ();
|
|
initialized = CYGTLS_INITIALIZED;
|
|
errno_addr = &(local_clib._errno);
|
|
locals.cw_timer = NULL;
|
|
|
|
if ((void *) func == (void *) cygthread::stub
|
|
|| (void *) func == (void *) cygthread::simplestub)
|
|
return;
|
|
|
|
cygheap->user.reimpersonate ();
|
|
|
|
sentry here (INFINITE);
|
|
if (nthreads >= cygheap->sthreads)
|
|
{
|
|
cygheap->threadlist = (_cygtls **)
|
|
crealloc_abort (cygheap->threadlist, (cygheap->sthreads += THREADLIST_CHUNK)
|
|
* sizeof (cygheap->threadlist[0]));
|
|
memset (cygheap->threadlist + nthreads, 0, THREADLIST_CHUNK * sizeof (cygheap->threadlist[0]));
|
|
}
|
|
|
|
cygheap->threadlist[nthreads++] = this;
|
|
}
|
|
|
|
void
|
|
_cygtls::fixup_after_fork ()
|
|
{
|
|
if (sig)
|
|
{
|
|
pop ();
|
|
sig = 0;
|
|
}
|
|
stacklock = spinning = 0;
|
|
signal_arrived = NULL;
|
|
locals.select.sockevt = NULL;
|
|
locals.cw_timer = NULL;
|
|
wq.thread_ev = NULL;
|
|
}
|
|
|
|
#define free_local(x) \
|
|
if (locals.x) \
|
|
{ \
|
|
free (locals.x); \
|
|
locals.x = NULL; \
|
|
}
|
|
|
|
void
|
|
_cygtls::remove (DWORD wait)
|
|
{
|
|
initialized = 0;
|
|
if (exit_state >= ES_FINAL)
|
|
return;
|
|
|
|
debug_printf ("wait %p", wait);
|
|
|
|
/* FIXME: Need some sort of atthreadexit function to allow things like
|
|
select to control this themselves. */
|
|
|
|
if (signal_arrived)
|
|
{
|
|
HANDLE h = signal_arrived;
|
|
signal_arrived = NULL;
|
|
CloseHandle (h);
|
|
}
|
|
|
|
/* Close handle and free memory used by select. */
|
|
if (locals.select.sockevt)
|
|
{
|
|
CloseHandle (locals.select.sockevt);
|
|
locals.select.sockevt = NULL;
|
|
free_local (select.ser_num);
|
|
free_local (select.w4);
|
|
}
|
|
/* Free memory used by network functions. */
|
|
free_local (ntoa_buf);
|
|
free_local (protoent_buf);
|
|
free_local (servent_buf);
|
|
free_local (hostent_buf);
|
|
/* Free temporary TLS path buffers. */
|
|
locals.pathbufs.destroy ();
|
|
|
|
do
|
|
{
|
|
sentry here (wait);
|
|
if (here.acquired ())
|
|
{
|
|
for (size_t i = 0; i < nthreads; i++)
|
|
if (this == cygheap->threadlist[i])
|
|
{
|
|
if (i < --nthreads)
|
|
cygheap->threadlist[i] = cygheap->threadlist[nthreads];
|
|
debug_printf ("removed %p element %d", this, i);
|
|
break;
|
|
}
|
|
}
|
|
} while (0);
|
|
remove_wq (wait);
|
|
}
|
|
|
|
void
|
|
_cygtls::push (__stack_t addr)
|
|
{
|
|
*stackptr++ = (__stack_t) addr;
|
|
}
|
|
|
|
void
|
|
_cygtls::set_siginfo (sigpacket *pack)
|
|
{
|
|
infodata = pack->si;
|
|
}
|