d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restore signal mask correctly after fork().

Browse Source
This commit is contained in:
David Xu 2003-07-09 01:39:24 +00:00
parent 0527fc8806
commit 9efd29f394
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/libkse/thread/thr_kern.c
View File

@ -321,10 +321,11 @@ _kse_single_thread(struct pthread *curthread)
_kse_initial = NULL;
_libpthread_init(curthread);
#else
if (__isthreaded)
_thr_signal_deinit();
_ksd_readandclear_tmbx();
__isthreaded = 0;
active_threads = 0;
_thr_signal_deinit();
#endif
}

7
lib/libkse/thread/thr_sig.c
View File

@ -984,12 +984,13 @@ _thr_signal_init(void)
void
_thr_signal_deinit(void)
{
sigset_t tmpmask, oldmask;
struct pthread *curthread = _get_curthread();
sigset_t tmpmask;
int i;
SIGFILLSET(tmpmask);
SIG_CANTMASK(tmpmask);
__sys_sigprocmask(SIG_SETMASK, &tmpmask, &oldmask);
__sys_sigprocmask(SIG_SETMASK, &tmpmask, NULL);
/* Enter a loop to get the existing signal status: */
for (i = 1; i <= _SIG_MAXSIG; i++) {
/* Check for signals which cannot be trapped: */
@ -1005,6 +1006,6 @@ _thr_signal_deinit(void)
PANIC("Cannot set signal handler info");
}
}
__sys_sigprocmask(SIG_SETMASK, &oldmask, NULL);
__sys_sigprocmask(SIG_SETMASK, &curthread->sigmask, NULL);
}

3
lib/libpthread/thread/thr_kern.c
View File

@ -321,10 +321,11 @@ _kse_single_thread(struct pthread *curthread)
_kse_initial = NULL;
_libpthread_init(curthread);
#else
if (__isthreaded)
_thr_signal_deinit();
_ksd_readandclear_tmbx();
__isthreaded = 0;
active_threads = 0;
_thr_signal_deinit();
#endif
}

7
lib/libpthread/thread/thr_sig.c
View File

@ -984,12 +984,13 @@ _thr_signal_init(void)
void
_thr_signal_deinit(void)
{
sigset_t tmpmask, oldmask;
struct pthread *curthread = _get_curthread();
sigset_t tmpmask;
int i;
SIGFILLSET(tmpmask);
SIG_CANTMASK(tmpmask);
__sys_sigprocmask(SIG_SETMASK, &tmpmask, &oldmask);
__sys_sigprocmask(SIG_SETMASK, &tmpmask, NULL);
/* Enter a loop to get the existing signal status: */
for (i = 1; i <= _SIG_MAXSIG; i++) {
/* Check for signals which cannot be trapped: */
@ -1005,6 +1006,6 @@ _thr_signal_deinit(void)
PANIC("Cannot set signal handler info");
}
}
__sys_sigprocmask(SIG_SETMASK, &oldmask, NULL);
__sys_sigprocmask(SIG_SETMASK, &curthread->sigmask, NULL);
}