mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-13 23:00:22 +00:00
(suspend_with_cancellation): Rewrite as a macro.
This commit is contained in:
parent
ed0d2f1a16
commit
ecea506939
@ -33,25 +33,26 @@ static inline void suspend(pthread_descr self)
|
||||
} while (self->p_signal !=__pthread_sig_restart );
|
||||
}
|
||||
|
||||
static inline void suspend_with_cancellation(pthread_descr self)
|
||||
{
|
||||
sigset_t mask;
|
||||
sigjmp_buf jmpbuf;
|
||||
|
||||
sigprocmask(SIG_SETMASK, NULL, &mask); /* Get current signal mask */
|
||||
sigdelset(&mask, __pthread_sig_restart); /* Unblock the restart signal */
|
||||
/* No need to save the signal mask, we'll restore it ourselves */
|
||||
if (sigsetjmp(jmpbuf, 0) == 0) {
|
||||
self->p_cancel_jmp = &jmpbuf;
|
||||
if (! (self->p_canceled && self->p_cancelstate == PTHREAD_CANCEL_ENABLE)) {
|
||||
do {
|
||||
self->p_signal = 0;
|
||||
sigsuspend(&mask); /* Wait for a signal */
|
||||
} while (self->p_signal != __pthread_sig_restart);
|
||||
}
|
||||
self->p_cancel_jmp = NULL;
|
||||
} else {
|
||||
sigaddset(&mask, __pthread_sig_restart); /* Reblock the restart signal */
|
||||
sigprocmask(SIG_SETMASK, &mask, NULL);
|
||||
}
|
||||
#define suspend_with_cancellation(self) \
|
||||
{ \
|
||||
sigset_t mask; \
|
||||
sigjmp_buf jmpbuf; \
|
||||
\
|
||||
sigprocmask(SIG_SETMASK, NULL, &mask); /* Get current signal mask */ \
|
||||
sigdelset(&mask, __pthread_sig_restart); /* Unblock the restart signal */ \
|
||||
/* No need to save the signal mask, we'll restore it ourselves */ \
|
||||
if (sigsetjmp(jmpbuf, 0) == 0) { \
|
||||
self->p_cancel_jmp = &jmpbuf; \
|
||||
if (! (self->p_canceled \
|
||||
&& self->p_cancelstate == PTHREAD_CANCEL_ENABLE)) { \
|
||||
do { \
|
||||
self->p_signal = 0; \
|
||||
sigsuspend(&mask); /* Wait for a signal */ \
|
||||
} while (self->p_signal != __pthread_sig_restart); \
|
||||
} \
|
||||
self->p_cancel_jmp = NULL; \
|
||||
} else { \
|
||||
sigaddset(&mask, __pthread_sig_restart); /* Reblock the restart signal */ \
|
||||
sigprocmask(SIG_SETMASK, &mask, NULL); \
|
||||
} \
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user