Deleted Added
full compact
thr_sigwait.c (50476) thr_sigwait.c (51794)
1/*
2 * Copyright (c) 1997 John Birrell <jb@cimlogic.com.au>.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 15 unchanged lines hidden (view full) ---

24 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
25 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
30 * SUCH DAMAGE.
31 *
1/*
2 * Copyright (c) 1997 John Birrell <jb@cimlogic.com.au>.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 15 unchanged lines hidden (view full) ---

24 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
25 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
30 * SUCH DAMAGE.
31 *
32 * $FreeBSD: head/lib/libkse/thread/thr_sigwait.c 50476 1999-08-28 00:22:10Z peter $
32 * $FreeBSD: head/lib/libkse/thread/thr_sigwait.c 51794 1999-09-29 15:18:46Z marcel $
33 */
34#include <signal.h>
35#include <errno.h>
36#ifdef _THREAD_SAFE
37#include <pthread.h>
38#include "pthread_private.h"
39
40int

--- 22 unchanged lines hidden (view full) ---

63 /* These signals can't be waited on. */
64 sigdelset(&waitset, SIGKILL);
65 sigdelset(&waitset, SIGSTOP);
66 sigdelset(&waitset, _SCHED_SIGNAL);
67 sigdelset(&waitset, SIGCHLD);
68 sigdelset(&waitset, SIGINFO);
69
70 /* Check to see if a pending signal is in the wait mask. */
33 */
34#include <signal.h>
35#include <errno.h>
36#ifdef _THREAD_SAFE
37#include <pthread.h>
38#include "pthread_private.h"
39
40int

--- 22 unchanged lines hidden (view full) ---

63 /* These signals can't be waited on. */
64 sigdelset(&waitset, SIGKILL);
65 sigdelset(&waitset, SIGSTOP);
66 sigdelset(&waitset, _SCHED_SIGNAL);
67 sigdelset(&waitset, SIGCHLD);
68 sigdelset(&waitset, SIGINFO);
69
70 /* Check to see if a pending signal is in the wait mask. */
71 if (tempset = (_thread_run->sigpend & waitset)) {
71 tempset = _thread_run->sigpend;
72 SIGSETAND(tempset, waitset);
73 if (SIGNOTEMPTY(tempset)) {
72 /* Enter a loop to find a pending signal: */
73 for (i = 1; i < NSIG; i++) {
74 if (sigismember (&tempset, i))
75 break;
76 }
77
78 /* Clear the pending signal: */
79 sigdelset(&_thread_run->sigpend,i);

--- 60 unchanged lines hidden ---
74 /* Enter a loop to find a pending signal: */
75 for (i = 1; i < NSIG; i++) {
76 if (sigismember (&tempset, i))
77 break;
78 }
79
80 /* Clear the pending signal: */
81 sigdelset(&_thread_run->sigpend,i);

--- 60 unchanged lines hidden ---