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:
Christopher Faylor
@ -1,6 +1,6 @@
|
||||
/* sigproc.h
|
||||
|
||||
Copyright 1997, 1998, 2000, 2001, 2002 Red Hat, Inc.
|
||||
Copyright 1997, 1998, 2000, 2001, 2002, 2003 Red Hat, Inc.
|
||||
|
||||
This file is part of Cygwin.
|
||||
|
||||
@ -48,72 +48,23 @@ typedef struct struct_waitq
|
||||
HANDLE thread_ev;
|
||||
} waitq;
|
||||
|
||||
struct sigthread
|
||||
{
|
||||
DWORD id;
|
||||
DWORD frame;
|
||||
CRITICAL_SECTION lock;
|
||||
LONG winapi_lock;
|
||||
BOOL exception;
|
||||
bool get_winapi_lock (int test = 0);
|
||||
void release_winapi_lock ();
|
||||
void init (const char *s);
|
||||
};
|
||||
|
||||
class sigframe
|
||||
{
|
||||
private:
|
||||
sigthread *st;
|
||||
inline bool unregister ()
|
||||
{
|
||||
if (!st)
|
||||
return 0;
|
||||
EnterCriticalSection (&st->lock);
|
||||
st->frame = 0;
|
||||
st->exception = 0;
|
||||
st->release_winapi_lock ();
|
||||
LeaveCriticalSection (&st->lock);
|
||||
st = NULL;
|
||||
return 1;
|
||||
}
|
||||
|
||||
public:
|
||||
inline void set (sigthread &t, DWORD ebp, bool is_exception = 0)
|
||||
{
|
||||
DWORD oframe = t.frame;
|
||||
st = &t;
|
||||
t.frame = ebp;
|
||||
t.exception = is_exception;
|
||||
if (!oframe)
|
||||
t.get_winapi_lock ();
|
||||
}
|
||||
inline void init (sigthread &t, DWORD ebp = (DWORD) __builtin_frame_address (0), bool is_exception = 0)
|
||||
{
|
||||
if (is_exception || (!t.frame && t.id == GetCurrentThreadId ()))
|
||||
set (t, ebp, is_exception);
|
||||
else
|
||||
st = NULL;
|
||||
}
|
||||
|
||||
sigframe (): st (NULL) {}
|
||||
sigframe (sigthread &t, DWORD ebp = (DWORD) __builtin_frame_address (0)) {init (t, ebp);}
|
||||
~sigframe ()
|
||||
{
|
||||
unregister ();
|
||||
}
|
||||
|
||||
int call_signal_handler ();
|
||||
};
|
||||
|
||||
extern sigthread mainthread;
|
||||
extern HANDLE signal_arrived;
|
||||
extern HANDLE sigCONT;
|
||||
|
||||
BOOL __stdcall my_parent_is_alive ();
|
||||
int __stdcall sig_dispatch_pending ();
|
||||
extern "C" void __stdcall set_process_mask (sigset_t newmask);
|
||||
#ifdef _PINFO_H
|
||||
extern "C" void __stdcall set_signal_mask (sigset_t newmask, sigset_t& = myself->getsigmask ());
|
||||
#endif
|
||||
int __stdcall handle_sigprocmask (int sig, const sigset_t *set,
|
||||
sigset_t *oldset, sigset_t& opmask)
|
||||
__attribute__ ((regparm (3)));
|
||||
|
||||
extern "C" void __stdcall reset_signal_arrived ();
|
||||
int __stdcall sig_handle (int, sigset_t) __attribute__ ((regparm (2)));
|
||||
extern "C" int __stdcall call_signal_handler_now ();
|
||||
#ifdef _CYGTLS_H
|
||||
int __stdcall sig_handle (int, sigset_t, int, _threadinfo *) __attribute__ ((regparm (3)));
|
||||
#endif
|
||||
void __stdcall sig_clear (int) __attribute__ ((regparm (1)));
|
||||
void __stdcall sig_set_pending (int) __attribute__ ((regparm (1)));
|
||||
int __stdcall handle_sigsuspend (sigset_t);
|
||||
@ -127,18 +78,15 @@ void __stdcall subproc_init ();
|
||||
void __stdcall sigproc_terminate ();
|
||||
BOOL __stdcall proc_exists (_pinfo *) __attribute__ ((regparm(1)));
|
||||
BOOL __stdcall pid_exists (pid_t) __attribute__ ((regparm(1)));
|
||||
int __stdcall sig_send (_pinfo *, int, DWORD ebp = (DWORD) __builtin_frame_address (0),
|
||||
bool exception = 0) __attribute__ ((regparm(3)));
|
||||
int __stdcall sig_send (_pinfo *, int, void * = NULL) __attribute__ ((regparm(3)));
|
||||
void __stdcall signal_fixup_after_fork ();
|
||||
void __stdcall signal_fixup_after_exec ();
|
||||
void __stdcall wait_for_sigthread ();
|
||||
void __stdcall sigalloc ();
|
||||
|
||||
extern char myself_nowait_dummy[];
|
||||
extern char myself_nowait_nonmain_dummy[];
|
||||
|
||||
#define WAIT_SIG_PRIORITY THREAD_PRIORITY_TIME_CRITICAL
|
||||
|
||||
#define myself_nowait ((_pinfo *)myself_nowait_dummy)
|
||||
#define myself_nowait_nonmain ((_pinfo *)myself_nowait_nonmain_dummy)
|
||||
#endif /*_SIGPROC_H*/
|
||||
|
||||
Reference in New Issue
Block a user