Author: kib
Date: Sat Oct 1 11:49:24 2011
New Revision: 225895
URL: http://svn.freebsd.org/changeset/base/225895
Log:
MFC r211526:
Reduce redundant code.
Modified:
stable/8/lib/libthr/thread/thr_sig.c
Directory Properties:
stable/8/lib/libthr/ (props changed)
Modified: stable/8/lib/libthr/thread/thr_sig.c
==============================================================================
--- stable/8/lib/libthr/thread/thr_sig.c Sat Oct 1 10:18:55 2011
(r225894)
+++ stable/8/lib/libthr/thread/thr_sig.c Sat Oct 1 11:49:24 2011
(r225895)
@@ -233,23 +233,26 @@ _pthread_sigmask(int how, const sigset_t
__weak_reference(__sigsuspend, sigsuspend);
-int
-_sigsuspend(const sigset_t * set)
+static const sigset_t *
+thr_remove_thr_signals(const sigset_t *set, sigset_t *newset)
{
- sigset_t newset;
const sigset_t *pset;
- int ret;
if (SIGISMEMBER(*set, SIGCANCEL)) {
- newset = *set;
- SIGDELSET(newset, SIGCANCEL);
- pset = &newset;
+ *newset = *set;
+ SIGDELSET(*newset, SIGCANCEL);
+ pset = newset;
} else
pset = set;
+ return (pset);
+}
- ret = __sys_sigsuspend(pset);
+int
+_sigsuspend(const sigset_t * set)
+{
+ sigset_t newset;
- return (ret);
+ return (__sys_sigsuspend(thr_remove_thr_signals(set, &newset)));
}
int
@@ -257,18 +260,10 @@ __sigsuspend(const sigset_t * set)
{
struct pthread *curthread = _get_curthread();
sigset_t newset;
- const sigset_t *pset;
int ret;
- if (SIGISMEMBER(*set, SIGCANCEL)) {
- newset = *set;
- SIGDELSET(newset, SIGCANCEL);
- pset = &newset;
- } else
- pset = set;
-
_thr_cancel_enter(curthread);
- ret = __sys_sigsuspend(pset);
+ ret = __sys_sigsuspend(thr_remove_thr_signals(set, &newset));
_thr_cancel_leave(curthread);
return (ret);
@@ -283,17 +278,9 @@ _sigtimedwait(const sigset_t *set, sigin
const struct timespec * timeout)
{
sigset_t newset;
- const sigset_t *pset;
- int ret;
- if (SIGISMEMBER(*set, SIGCANCEL)) {
- newset = *set;
- SIGDELSET(newset, SIGCANCEL);
- pset = &newset;
- } else
- pset = set;
- ret = __sys_sigtimedwait(pset, info, timeout);
- return (ret);
+ return (__sys_sigtimedwait(thr_remove_thr_signals(set, &newset), info,
+ timeout));
}
int
@@ -302,17 +289,11 @@ __sigtimedwait(const sigset_t *set, sigi
{
struct pthread *curthread = _get_curthread();
sigset_t newset;
- const sigset_t *pset;
int ret;
- if (SIGISMEMBER(*set, SIGCANCEL)) {
- newset = *set;
- SIGDELSET(newset, SIGCANCEL);
- pset = &newset;
- } else
- pset = set;
_thr_cancel_enter(curthread);
- ret = __sys_sigtimedwait(pset, info, timeout);
+ ret = __sys_sigtimedwait(thr_remove_thr_signals(set, &newset), info,
+ timeout);
_thr_cancel_leave(curthread);
return (ret);
}
@@ -321,18 +302,8 @@ int
_sigwaitinfo(const sigset_t *set, siginfo_t *info)
{
sigset_t newset;
- const sigset_t *pset;
- int ret;
-
- if (SIGISMEMBER(*set, SIGCANCEL)) {
- newset = *set;
- SIGDELSET(newset, SIGCANCEL);
- pset = &newset;
- } else
- pset = set;
- ret = __sys_sigwaitinfo(pset, info);
- return (ret);
+ return (__sys_sigwaitinfo(thr_remove_thr_signals(set, &newset), info));
}
int
@@ -340,18 +311,10 @@ __sigwaitinfo(const sigset_t *set, sigin
{
struct pthread *curthread = _get_curthread();
sigset_t newset;
- const sigset_t *pset;
int ret;
- if (SIGISMEMBER(*set, SIGCANCEL)) {
- newset = *set;
- SIGDELSET(newset, SIGCANCEL);
- pset = &newset;
- } else
- pset = set;
-
_thr_cancel_enter(curthread);
- ret = __sys_sigwaitinfo(pset, info);
+ ret = __sys_sigwaitinfo(thr_remove_thr_signals(set, &newset), info);
_thr_cancel_leave(curthread);
return (ret);
}
@@ -360,18 +323,8 @@ int
_sigwait(const sigset_t *set, int *sig)
{
sigset_t newset;
- const sigset_t *pset;
- int ret;
-
- if (SIGISMEMBER(*set, SIGCANCEL)) {
- newset = *set;
- SIGDELSET(newset, SIGCANCEL);
- pset = &newset;
- } else
- pset = set;
- ret = __sys_sigwait(pset, sig);
- return (ret);
+ return (__sys_sigwait(thr_remove_thr_signals(set, &newset), sig));
}
int
@@ -379,18 +332,10 @@ __sigwait(const sigset_t *set, int *sig)
{
struct pthread *curthread = _get_curthread();
sigset_t newset;
- const sigset_t *pset;
int ret;
- if (SIGISMEMBER(*set, SIGCANCEL)) {
- newset = *set;
- SIGDELSET(newset, SIGCANCEL);
- pset = &newset;
- } else
- pset = set;
-
_thr_cancel_enter(curthread);
- ret = __sys_sigwait(pset, sig);
+ ret = __sys_sigwait(thr_remove_thr_signals(set, &newset), sig);
_thr_cancel_leave(curthread);
return (ret);
}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
