Deleted Added
full compact
thr_kill.c (261354) thr_kill.c (297706)
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
9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution.
13 * 3. Neither the name of the author nor the names of any co-contributors
14 * may be used to endorse or promote products derived from this software
15 * without specific prior written permission.
16 *
17 * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL AND CONTRIBUTORS ``AS IS'' AND
18 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
19 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
20 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
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
9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution.
13 * 3. Neither the name of the author nor the names of any co-contributors
14 * may be used to endorse or promote products derived from this software
15 * without specific prior written permission.
16 *
17 * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL AND CONTRIBUTORS ``AS IS'' AND
18 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
19 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
20 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 * $FreeBSD: head/lib/libthr/thread/thr_kill.c 261354 2014-02-01 18:13:18Z kib $
30 */
31
28 */
29
30#include <sys/cdefs.h>
31__FBSDID("$FreeBSD: head/lib/libthr/thread/thr_kill.c 297706 2016-04-08 11:15:26Z kib $");
32
32#include "namespace.h"
33#include <errno.h>
34#include <signal.h>
35#include <pthread.h>
36#include "un-namespace.h"
37
38#include "thr_private.h"
39
40__weak_reference(_pthread_kill, pthread_kill);
41
42int
43_pthread_kill(pthread_t pthread, int sig)
44{
45 struct pthread *curthread;
46 int ret;
47
48 /* Check for invalid signal numbers: */
49 if (sig < 0 || sig > _SIG_MAXSIG)
50 /* Invalid signal: */
51 return (EINVAL);
52
53 curthread = _get_curthread();
54
55 /*
56 * Ensure the thread is in the list of active threads, and the
57 * signal is valid (signal 0 specifies error checking only) and
58 * not being ignored:
59 */
60 if (curthread == pthread) {
61 if (sig > 0)
62 _thr_send_sig(pthread, sig);
63 ret = 0;
64 } else if ((ret = _thr_find_thread(curthread, pthread,
65 /*include dead*/0)) == 0) {
66 if (sig > 0)
67 _thr_send_sig(pthread, sig);
68 THR_THREAD_UNLOCK(curthread, pthread);
69 }
70
71 /* Return the completion status: */
72 return (ret);
73}
33#include "namespace.h"
34#include <errno.h>
35#include <signal.h>
36#include <pthread.h>
37#include "un-namespace.h"
38
39#include "thr_private.h"
40
41__weak_reference(_pthread_kill, pthread_kill);
42
43int
44_pthread_kill(pthread_t pthread, int sig)
45{
46 struct pthread *curthread;
47 int ret;
48
49 /* Check for invalid signal numbers: */
50 if (sig < 0 || sig > _SIG_MAXSIG)
51 /* Invalid signal: */
52 return (EINVAL);
53
54 curthread = _get_curthread();
55
56 /*
57 * Ensure the thread is in the list of active threads, and the
58 * signal is valid (signal 0 specifies error checking only) and
59 * not being ignored:
60 */
61 if (curthread == pthread) {
62 if (sig > 0)
63 _thr_send_sig(pthread, sig);
64 ret = 0;
65 } else if ((ret = _thr_find_thread(curthread, pthread,
66 /*include dead*/0)) == 0) {
67 if (sig > 0)
68 _thr_send_sig(pthread, sig);
69 THR_THREAD_UNLOCK(curthread, pthread);
70 }
71
72 /* Return the completion status: */
73 return (ret);
74}