From 70300fdb1c4f0834f83441fcd3fa029e110a7c2e Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Fri, 15 Feb 2008 17:53:11 +0000 Subject: Perform whitespace cleanup throughout. * dcrt0.cc (signal_shift_subtract): Eliminate ancient backwards compatibility. (check_sanity_and_sync): Ditto. * winsup.h (SIGTOMASK): Ditto. Just use constant in signal calculation. * include/cygwin/version: Remove backwards signal mask compatibility define. * path.cc (symlink_info::check_sysfile): Cosmetic change. * registry.cc (get_registry_hive_path): Remove unneeded variable. * exceptions.cc (handle_sigsuspend): Eliminate thread signal mask and use either main sigmask or current thread sigmask. (set_process_mask): Ditto. (sighold): Ditto. (sigrelse): Ditto. (sigset): Ditto. (set_process_mask_delta): Ditto. (_cygtls::call_signal_handler): Ditto. * fhandler_process.cc (format_process_status): Ditto. * fhandler_termios.cc (fhandler_termios::bg_check): Ditto. * pinfo.h (class pinfo): Ditto. * select.cc (pselect): Ditto. * signal.cc (sigprocmask): Ditto. (abort): Ditto. (sigpause): Ditto. (sigsend): Ditto. (wait_sig): Ditto. * thread.h (pthread::parent_tls): New member. * thread.cc (pthread::pthread): Record parent_tls here. (pthread::thread_init_wrapper): Initialize sigmask from parent thread. --- winsup/cygwin/sigproc.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'winsup/cygwin/sigproc.cc') diff --git a/winsup/cygwin/sigproc.cc b/winsup/cygwin/sigproc.cc index d97b2cf6d..af9cd0682 100644 --- a/winsup/cygwin/sigproc.cc +++ b/winsup/cygwin/sigproc.cc @@ -663,7 +663,7 @@ sig_send (_pinfo *p, siginfo_t& si, _cygtls *tls) else if (si.si_signo == __SIGPENDING) pack.mask = &pending; else if (si.si_signo == __SIGFLUSH || si.si_signo > 0) - pack.mask = &myself->getsigmask (); + pack.mask = &_my_tls.sigmask; else pack.mask = NULL; @@ -1118,7 +1118,7 @@ pending_signals::add (sigpacket& pack) return; se = sigs + pack.si.si_signo; *se = pack; - se->mask = &myself->getsigmask (); + se->mask = &pack.tls->sigmask; se->next = NULL; if (end) end->next = se; @@ -1199,7 +1199,7 @@ wait_sig (VOID *) sigset_t dummy_mask; if (!pack.mask) { - dummy_mask = myself->getsigmask (); + dummy_mask = _main_tls->sigmask; pack.mask = &dummy_mask; } @@ -1218,7 +1218,7 @@ wait_sig (VOID *) unsigned bit; sigq.reset (); while ((q = sigq.next ())) - if (myself->getsigmask () & (bit = SIGTOMASK (q->si.si_signo))) + if (pack.tls->sigmask & (bit = SIGTOMASK (q->si.si_signo))) *pack.mask |= bit; break; case __SIGHOLD: -- cgit v1.2.3