diff options
author | davidxu <davidxu@FreeBSD.org> | 2003-07-19 05:25:49 +0000 |
---|---|---|
committer | davidxu <davidxu@FreeBSD.org> | 2003-07-19 05:25:49 +0000 |
commit | d1d23a75b814719ade6f74ebd08160434cc10a24 (patch) | |
tree | 615d6f3ecd291a3bc89444ba9e9d0686309ec124 /lib | |
parent | 69cd67f2e64c70e31397afb5fa3bd28825d7d443 (diff) | |
download | FreeBSD-src-d1d23a75b814719ade6f74ebd08160434cc10a24.zip FreeBSD-src-d1d23a75b814719ade6f74ebd08160434cc10a24.tar.gz |
Override libc function raise(), in threading mode, raise() will
send signal to current thread.
Reviewed by: deischen
Diffstat (limited to 'lib')
-rw-r--r-- | lib/libkse/thread/Makefile.inc | 1 | ||||
-rw-r--r-- | lib/libkse/thread/thr_raise.c | 53 | ||||
-rw-r--r-- | lib/libpthread/pthread.map | 2 | ||||
-rw-r--r-- | lib/libpthread/thread/Makefile.inc | 1 | ||||
-rw-r--r-- | lib/libpthread/thread/thr_raise.c | 53 |
5 files changed, 110 insertions, 0 deletions
diff --git a/lib/libkse/thread/Makefile.inc b/lib/libkse/thread/Makefile.inc index cc4f340..328c3c8 100644 --- a/lib/libkse/thread/Makefile.inc +++ b/lib/libkse/thread/Makefile.inc @@ -68,6 +68,7 @@ SRCS+= \ thr_printf.c \ thr_priority_queue.c \ thr_pselect.c \ + thr_raise.c \ thr_read.c \ thr_readv.c \ thr_resume_np.c \ diff --git a/lib/libkse/thread/thr_raise.c b/lib/libkse/thread/thr_raise.c new file mode 100644 index 0000000..0554fa4 --- /dev/null +++ b/lib/libkse/thread/thr_raise.c @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2003 David Xu<davidxu@freebsd.org>. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice(s), this list of conditions and the following disclaimer as + * the first lines of this file unmodified other than the possible + * addition of one or more copyright notices. + * 2. Redistributions in binary form must reproduce the above copyright + * notice(s), this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#include <pthread.h> +#include <errno.h> +#include "thr_private.h" + +__weak_reference(_raise, raise); + +int +_raise(int sig) +{ + int ret; + + if (!_kse_isthreaded()) + ret = kill(getpid(), sig); + else { + ret = pthread_kill(pthread_self(), sig); + if (ret != 0) { + errno = ret; + ret = -1; + } + } + return (ret); +} diff --git a/lib/libpthread/pthread.map b/lib/libpthread/pthread.map index c7bb4e4..a2f65a4 100644 --- a/lib/libpthread/pthread.map +++ b/lib/libpthread/pthread.map @@ -123,6 +123,7 @@ global: _pthread_switch_delete_np; _pthread_testcancel; _pthread_yield; + _raise; _sched_yield; _sem_close; _sem_destroy; @@ -255,6 +256,7 @@ global: pthread_switch_delete_np; pthread_testcancel; pthread_yield; + raise; read; readv; sched_yield; diff --git a/lib/libpthread/thread/Makefile.inc b/lib/libpthread/thread/Makefile.inc index cc4f340..328c3c8 100644 --- a/lib/libpthread/thread/Makefile.inc +++ b/lib/libpthread/thread/Makefile.inc @@ -68,6 +68,7 @@ SRCS+= \ thr_printf.c \ thr_priority_queue.c \ thr_pselect.c \ + thr_raise.c \ thr_read.c \ thr_readv.c \ thr_resume_np.c \ diff --git a/lib/libpthread/thread/thr_raise.c b/lib/libpthread/thread/thr_raise.c new file mode 100644 index 0000000..0554fa4 --- /dev/null +++ b/lib/libpthread/thread/thr_raise.c @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2003 David Xu<davidxu@freebsd.org>. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice(s), this list of conditions and the following disclaimer as + * the first lines of this file unmodified other than the possible + * addition of one or more copyright notices. + * 2. Redistributions in binary form must reproduce the above copyright + * notice(s), this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#include <pthread.h> +#include <errno.h> +#include "thr_private.h" + +__weak_reference(_raise, raise); + +int +_raise(int sig) +{ + int ret; + + if (!_kse_isthreaded()) + ret = kill(getpid(), sig); + else { + ret = pthread_kill(pthread_self(), sig); + if (ret != 0) { + errno = ret; + ret = -1; + } + } + return (ret); +} |