summaryrefslogtreecommitdiffstats
path: root/winsup/cygwin/sigproc.cc
diff options
context:
space:
mode:
authorChristopher Faylor <me@cgf.cx>2003-12-23 16:26:31 +0000
committerChristopher Faylor <me@cgf.cx>2003-12-23 16:26:31 +0000
commit29d52c8a27ec621dea1c8229c26b60fe12bc3e16 (patch)
treedd74fe4148e46c755e6cc76d0912dce7a7f3abe7 /winsup/cygwin/sigproc.cc
parent1fb9256d7e06dd6b0004fb625253464e4aaa6140 (diff)
downloadcygnal-29d52c8a27ec621dea1c8229c26b60fe12bc3e16.tar.gz
cygnal-29d52c8a27ec621dea1c8229c26b60fe12bc3e16.tar.bz2
cygnal-29d52c8a27ec621dea1c8229c26b60fe12bc3e16.zip
* exceptions.cc (set_signal_mask): Redefine to not pass by address. Report
calculated mask in debugging output. * sigproc.h (set_signal_mask): Reflect above change in declaration. * path.cc (mount_item::build_win32): Take path apart before feeding it to fnmunge. Throughout, change use of _reent_winsup()-> to _my_tls.locals. instead. Throughout, remove obsolete MT_SAFE/_CYG_THREAD_FAILSAFE considerations. Througout, add cygtls.h include. * Makefile.in (DLL_OFILES): Add cygtls.o. Add some more objects to the -fomit-frame-pointer list. * acconfig.h: Remove obsolete settings. * config.h.in: Ditto. * bsdlib.cc: Add cygtls.h include. * configure.in: Remove --enable-extra-threadsafe-checking. * configure: Regenerate. * cygtls.h (_local_storage): New struct renamed from _winsup_t (sic). (_threadinfo:local_clib): Add new field. (_threadinfo::locals): Ditto. (_threadinfo::init_thread): Accept second _reent * argument. (_threadinfo::call): Define as regparm. (CYGTLS_PADSIZE): Remove unnecessary slop. (_getreent): Define as a macro. * thread.h: Remove _CYG_THREAD_FAILSAFE and MT_SAFE stuff. (_winsup_t): Move to cygtls.h. (ResourceLocks::ResourceLocks): Eliminate empty constructor. (MTinterface::reents): Eliminate. (MTinterface::thread_self_key): Eliminate. (MTinterface::MTinterface): Eliminate. * dcrt0.cc: Include stdio.h for _impure_ptr initialization. (do_global_ctors): Remove run_ctors_p (sic) considerations. Don't call atexit here. (__main): Initialize destructors for user here. (dll_crt0_1): Accept a dummy argument. Don't call init_thread here. Don't set _impure_ptr here. Call do_global_ctors after more things have been initialized. (_dll_crt0): Define zeros buffer as max of needed size of CYGTLS_PADSIZE so that it can be used for two purposes while minimizing stack usage. Initialize _impure_ptr specifically, for speed. Call dll_crt0_1 with buffer argument. (cygwin_dll_init): Call dll_crt0_1 with dummy argument. * dtable.cc (dtable::find_unused_handle): Remove call to AssertResourceOwner. * exceptions.cc: Move _threadinfo stuff to new file. * cygtls.cc: New file. * gentls_offsets: Accommodate increasing complexity of cygtls.h. * hires.h (hires_base::~hires_base): Remove. * init.cc (dll_entry): Remove setting of reents. * thread.cc: Remove syslog.h include. (__getreent): Simplify to use _my_tls. (_reent_winsup): Delete. (AssertResourceOwner): Delete. (MTinterface::Init): Remove setting of _clib and _winsup, with all that entails. (MTinterface::fixup_after_fork): Ditto. (pthread::thread_init_wrapper): Ditto. Also remove call to set_tls_self_pointer. (pthread::set_tls_self_pointer): Eliminate. (pthread::get_tls_self_pointer): Just return _my_tls.tid; (__reent_t::init_clib): Eliminate. * tlsoffsets.h: Regenerate.
Diffstat (limited to 'winsup/cygwin/sigproc.cc')
-rw-r--r--winsup/cygwin/sigproc.cc22
1 files changed, 19 insertions, 3 deletions
diff --git a/winsup/cygwin/sigproc.cc b/winsup/cygwin/sigproc.cc
index 0f4431f85..227a25b00 100644
--- a/winsup/cygwin/sigproc.cc
+++ b/winsup/cygwin/sigproc.cc
@@ -588,8 +588,17 @@ int __stdcall
sig_dispatch_pending ()
{
if (exit_state || GetCurrentThreadId () == sigtid || !sigqueue.start.next)
- return 0;
+ {
+#ifdef DEBUGGING
+ sigproc_printf ("exit_state %d, GetCurrentThreadId () %p, sigtid %p, sigqueue.start.next %p",
+ exit_state, GetCurrentThreadId (), sigtid, sigqueue.start.next);
+#endif
+ return 0;
+ }
+#ifdef DEBUGGING
+ sigproc_printf ("flushing");
+#endif
(void) sig_send (myself, __SIGFLUSH);
return call_signal_handler_now ();
}
@@ -1155,8 +1164,15 @@ wait_sig (VOID *self)
sig_clear (-pack.sig);
else
{
- if (sig_handle (pack.sig, *pack.mask, pack.pid, pack.tls) <= 0)
- sigqueue.add (pack.sig, pack.pid, pack.tls);// FIXME: Shouldn't add this in !sh condition
+ int sigres = sig_handle (pack.sig, *pack.mask, pack.pid, pack.tls);
+ if (sigres <= 0)
+ {
+#ifdef DEBUGGING
+ if (!sigres)
+ system_printf ("Failed to arm signal %d from pid %d");
+#endif
+ sigqueue.add (pack.sig, pack.pid, pack.tls);// FIXME: Shouldn't add this in !sh condition
+ }
if (pack.sig == SIGCHLD)
proc_subproc (PROC_CLEARWAIT, 0);
}