From f17fc04c70d3c02bd3781d3834fbb8b0be0a8b33 Mon Sep 17 00:00:00 2001 From: Paul Ackersviller Date: Sun, 18 Nov 2007 19:42:41 +0000 Subject: Merge of 23364: fix race in POSIX signal blocking - use local variables as other forms already do. --- Src/signals.h | 57 +++++++++++++++++++++++---------------------------------- 1 file changed, 23 insertions(+), 34 deletions(-) (limited to 'Src/signals.h') diff --git a/Src/signals.h b/Src/signals.h index b1970e0f2..9541a1a02 100644 --- a/Src/signals.h +++ b/Src/signals.h @@ -58,7 +58,6 @@ #define child_block() signal_block(sigchld_mask) #define child_unblock() signal_unblock(sigchld_mask) -#define child_suspend(S) signal_suspend(SIGCHLD, S) /* ignore a signal */ #define signal_ignore(S) signal(S, SIG_IGN) @@ -73,48 +72,38 @@ * queue signals, it is probably overkill for zsh to do * * this, but it shouldn't hurt anything to do it anyway. */ -/* Right now I'm queueing all signals, but maybe we only * - * need to queue SIGCHLD. Anybody know? */ - -#define MAX_QUEUE_SIZE 16 +#define MAX_QUEUE_SIZE 128 #define queue_signals() (queueing_enabled++) +#define run_queued_signals() do { \ + while (queue_front != queue_rear) { /* while signals in queue */ \ + sigset_t oset; \ + queue_front = (queue_front + 1) % MAX_QUEUE_SIZE; \ + oset = signal_setmask(signal_mask_queue[queue_front]); \ + zhandler(signal_queue[queue_front]); /* handle queued signal */ \ + signal_setmask(oset); \ + } \ +} while (0) + #define unqueue_signals() do { \ DPUTS(!queueing_enabled, "BUG: unqueue_signals called but not queueing"); \ - if (!--queueing_enabled) { \ - while (queue_front != queue_rear) { /* while signals in queue */ \ - sigset_t oset; \ - queue_front = (queue_front + 1) % MAX_QUEUE_SIZE; \ - oset = signal_setmask(signal_mask_queue[queue_front]); \ - handler(signal_queue[queue_front]); /* handle queued signal */ \ - signal_setmask(oset); \ - } \ - } \ + if (!--queueing_enabled) run_queued_signals(); \ } while (0) +#define queue_signal_level() queueing_enabled -/* Make some signal functions faster. */ +#define dont_queue_signals() do { \ + queueing_enabled = 0; \ + run_queued_signals(); \ +} while (0) -#ifdef POSIX_SIGNALS -#define signal_block(S) \ - ((dummy_sigset1 = (S)), \ - sigprocmask(SIG_BLOCK, &dummy_sigset1, &dummy_sigset2), \ - dummy_sigset2) -#else -# ifdef BSD_SIGNALS +#define restore_queue_signals(q) (queueing_enabled = (q)) + +#ifdef BSD_SIGNALS #define signal_block(S) sigblock(S) -# else -extern sigset_t signal_block _((sigset_t)); -# endif /* BSD_SIGNALS */ -#endif /* POSIX_SIGNALS */ - -#ifdef POSIX_SIGNALS -#define signal_unblock(S) \ - ((dummy_sigset1 = (S)), \ - sigprocmask(SIG_UNBLOCK, &dummy_sigset1, &dummy_sigset2), \ - dummy_sigset2) #else -extern sigset_t signal_unblock _((sigset_t)); -#endif /* POSIX_SIGNALS */ +extern sigset_t signal_block _((sigset_t)); +#endif /* BSD_SIGNALS */ +extern sigset_t signal_unblock _((sigset_t)); -- cgit 1.4.1