Deleted Added
full compact
thr_sigwait.c (118075) thr_sigwait.c (119063)
1//depot/projects/kse/lib/libpthread/thread/thr_sigwait.c#1 - branch change 15154 (text+ko)
2/*
3 * Copyright (c) 1997 John Birrell <jb@cimlogic.com.au>.
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

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

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

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

25 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
33 * $FreeBSD: head/lib/libkse/thread/thr_sigwait.c 118075 2003-07-27 06:46:34Z davidxu $
33 * $FreeBSD: head/lib/libkse/thread/thr_sigwait.c 119063 2003-08-18 03:58:29Z davidxu $
34 */
35#include <signal.h>
36#include <sys/param.h>
37#include <sys/signalvar.h>
38#include <errno.h>
39#include <pthread.h>
40#include "thr_private.h"
41

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

50 struct pthread *curthread = _get_curthread();
51 int ret = 0;
52 int i;
53 struct sigwait_data waitdata;
54 sigset_t waitset;
55 kse_critical_t crit;
56 siginfo_t siginfo;
57
34 */
35#include <signal.h>
36#include <sys/param.h>
37#include <sys/signalvar.h>
38#include <errno.h>
39#include <pthread.h>
40#include "thr_private.h"
41

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

50 struct pthread *curthread = _get_curthread();
51 int ret = 0;
52 int i;
53 struct sigwait_data waitdata;
54 sigset_t waitset;
55 kse_critical_t crit;
56 siginfo_t siginfo;
57
58 if (!_kse_isthreaded() ||
59 (curthread->attr.flags & PTHREAD_SCOPE_SYSTEM)) {
58 if (curthread->attr.flags & PTHREAD_SCOPE_SYSTEM) {
60 if (info == NULL)
61 info = &siginfo;
62 return (__sys_sigtimedwait((sigset_t *)set, info,
63 (struct timespec *)timeout));
64 }
65
66 /*
67 * Initialize the set of signals that will be waited on:

--- 136 unchanged lines hidden ---
59 if (info == NULL)
60 info = &siginfo;
61 return (__sys_sigtimedwait((sigset_t *)set, info,
62 (struct timespec *)timeout));
63 }
64
65 /*
66 * Initialize the set of signals that will be waited on:

--- 136 unchanged lines hidden ---