Eliminate use of sigframe and sigthread throughout.
* Makefile.in (DLL_OFILES): Add sigfe.o. Remove reliance on cygwin.def from cygwin0.dll dependency since dependence on sigfe.o implies that. Generate def file on the fly using 'gendef'. * configure.in: Don't auto-generate cygwin.def. * configure: Regenerate. * cygwin.din: Add SIGFE stuff where appropriate. * dcrt0.cc (dll_crt0_1): Initialize cygwin tls early in process startup. Set _main_tls to address of the main thread's cygwin tls. * debug.h: Remove now unneeded WFSO and WFMO declarations. * exceptions.cc (_last_thread): Define. (set_thread_state_for_signals): New function. (reset_thread_exception_for_signals): Ditto. (init_thread_for_signals): Ditto. (delete_thread_for_signals): Ditto. (capture_thread_for_signals): Ditto. (handle_exceptions): Set return address explicitly for exceptions prior to calling sig_send. (interrupt_on_return): Eliminate. (setup_handler): Add preliminary implementation for dealing with thread-specific signals by querying _main_tls. (signal_exit): Use cygthread::main_thread_id instead of mainthread.id. (call_signal_handler_now): For now, just handle the main thread. * fork.cc (vfork): Save and restore main _my_tls. * gendef: New file. Generates def file and sigfe.s file. * gentls_offsets: New file. Generates offsets for perl to use in sigfe.s. * how-signals-work.txt: Mention that info is obsolete. * init.cc (dll_entry): Initialize cygwin tls storage here. * miscfuncs.cc (low_priority_sleep): Make a C function for easier calling from asm. * perthread.h (vfork_save::tls): New element. * signal.cc (nanosleep): Replace previous use of sigframe.call_signal_handler_now with straight call to call_signal_handler_now. (abort): Ditto. * syscalls.cc (readv): Ditto. * termios.cc (tcsetattr): Ditto. * wait.cc (wait4): Ditto. * sigproc.cc (sig_dispatch_pending): Ditto. (sig_send): Ditto. * sigproc.h: Declare call_signal_handler_now. * thread.cc (pthread::thread_init_wrapper): Initialize cygwin tls. Remove obsolete and unworking signal stuff. * thread.h (verifyable_object::sigs): Eliminate. (verifyable_object::sigmask): Eliminate. (verifyable_object::sigtodo): Eliminate. (verifyable_object::exit): Make attribute noreturn. (verifyable_object::thread_init_wrapper): Ditto. (pthread_null::exit): Ditto. * winbase.h (__stackbase): Always define. * winsup.h (low_priority_sleep): Declare as a "C" function. * include/cygwin/version.h: Bump API version to reflect sigwait export. * include/sys/queue.h: Protect SLIST_ENTRY from previous declaration. * signal.cc (sigwait): Implement. * select.cc (fhandler_base::ready_for_read): Add debugging output. * devices.h: Define more device pointers via their storage. * devices.in: Don't parse things like /dev/inet/tcp, as they really have no meaning. * devices.cc: Regenerate. * gendevices: Set proper protection for output file. * cygtls.h: New file. * gendef: New file. * gentls_offsets: New file. * tlsoffsets.h: New file. Autogenerated. * config/i386/longjmp.c: Remove. File subsumed by gendef output. * config/i386/makefrag: Remove obsolete file. * fhandler.cc: Remove spurious access_worker declaration. * spawn.cc (spawnve): Make debugging output more accurate. * cygwin-gperf: Remove. * devices.cc: Remove.
This commit is contained in:
@@ -42,15 +42,11 @@ details. */
|
||||
HANDLE NO_COPY hMainProc = (HANDLE) -1;
|
||||
HANDLE NO_COPY hMainThread;
|
||||
|
||||
sigthread NO_COPY mainthread; // ID of the main thread
|
||||
|
||||
per_thread_waitq NO_COPY waitq_storage;
|
||||
per_thread_vfork NO_COPY vfork_storage;
|
||||
per_thread_signal_dispatch NO_COPY signal_dispatch_storage;
|
||||
|
||||
per_thread NO_COPY *threadstuff[] = {&waitq_storage,
|
||||
&vfork_storage,
|
||||
&signal_dispatch_storage,
|
||||
NULL};
|
||||
|
||||
bool display_title;
|
||||
@@ -72,7 +68,6 @@ ResourceLocks _reslock NO_COPY;
|
||||
MTinterface _mtinterf;
|
||||
|
||||
bool NO_COPY _cygwin_testing;
|
||||
unsigned NO_COPY _cygwin_testing_magic;
|
||||
|
||||
char NO_COPY almost_null[1];
|
||||
|
||||
@@ -526,15 +521,10 @@ int _declspec(dllexport) __argc;
|
||||
char _declspec(dllexport) **__argv;
|
||||
vfork_save NO_COPY *main_vfork = NULL;
|
||||
|
||||
void
|
||||
sigthread::init (const char *s)
|
||||
{
|
||||
InitializeCriticalSection (&lock);
|
||||
id = GetCurrentThreadId ();
|
||||
}
|
||||
|
||||
extern "C" void __sinit (_reent *);
|
||||
|
||||
_threadinfo NO_COPY *_main_tls;
|
||||
|
||||
/* Take over from libc's crt0.o and start the application. Note the
|
||||
various special cases when Cygwin DLL is being runtime loaded (as
|
||||
opposed to being link-time loaded by Cygwin apps) from a non
|
||||
@@ -542,6 +532,9 @@ extern "C" void __sinit (_reent *);
|
||||
static void
|
||||
dll_crt0_1 ()
|
||||
{
|
||||
__uint64_t padding[CYGTLS_PADSIZE];
|
||||
_main_tls = _my_tls.init (padding);
|
||||
|
||||
/* According to onno@stack.urc.tue.nl, the exception handler record must
|
||||
be on the stack. */
|
||||
/* FIXME: Verify forked children get their exception handler set up ok. */
|
||||
@@ -568,9 +561,6 @@ dll_crt0_1 ()
|
||||
user_data->resourcelocks->Init ();
|
||||
user_data->threadinterface->Init ();
|
||||
|
||||
mainthread.init ("mainthread"); // For use in determining if signals
|
||||
// should be blocked.
|
||||
|
||||
winpids::init ();
|
||||
|
||||
int envc = 0;
|
||||
@@ -632,7 +622,7 @@ dll_crt0_1 ()
|
||||
ProtectHandle (hMainThread);
|
||||
cygthread::init ();
|
||||
|
||||
/* Initialize pthread mainthread when not forked and it is save to call new,
|
||||
/* Initialize pthread mainthread when not forked and it is safe to call new,
|
||||
otherwise it is reinitalized in fixup_after_fork */
|
||||
if (!user_data->forkee)
|
||||
{
|
||||
@@ -804,9 +794,9 @@ break_here ()
|
||||
void
|
||||
initial_env ()
|
||||
{
|
||||
DWORD len;
|
||||
char buf[CYG_MAX_PATH + 1];
|
||||
#ifdef DEBUGGING
|
||||
DWORD len;
|
||||
if (GetEnvironmentVariable ("CYGWIN_SLEEP", buf, sizeof (buf) - 1))
|
||||
{
|
||||
DWORD ms = atoi (buf);
|
||||
@@ -836,14 +826,7 @@ initial_env ()
|
||||
#endif
|
||||
|
||||
if (GetEnvironmentVariable ("CYGWIN_TESTING", buf, sizeof (buf) - 1))
|
||||
{
|
||||
_cygwin_testing = 1;
|
||||
if ((len = GetModuleFileName (cygwin_hmodule, buf, CYG_MAX_PATH))
|
||||
&& len > sizeof ("new-cygwin1.dll")
|
||||
&& strcasematch (buf + len - sizeof ("new-cygwin1.dll"),
|
||||
"\\new-cygwin1.dll"))
|
||||
_cygwin_testing_magic = 0x10;
|
||||
}
|
||||
_cygwin_testing = 1;
|
||||
}
|
||||
|
||||
/* Wrap the real one, otherwise gdb gets confused about
|
||||
|
Reference in New Issue
Block a user