diff options
author | deischen <deischen@FreeBSD.org> | 2003-12-09 15:16:27 +0000 |
---|---|---|
committer | deischen <deischen@FreeBSD.org> | 2003-12-09 15:16:27 +0000 |
commit | 212e86fbe92b6d59f93ffe3c72b99f14b938d832 (patch) | |
tree | 18916360e5686ed736c9666af3091104e4ad8ec9 | |
parent | 367fac1d75e4bce0262cb0696d6441bd93f024a7 (diff) | |
download | FreeBSD-src-212e86fbe92b6d59f93ffe3c72b99f14b938d832.zip FreeBSD-src-212e86fbe92b6d59f93ffe3c72b99f14b938d832.tar.gz |
Add cancellation points for accept() and connect().
-rw-r--r-- | lib/libkse/thread/Makefile.inc | 2 | ||||
-rw-r--r-- | lib/libkse/thread/thr_accept.c | 49 | ||||
-rw-r--r-- | lib/libkse/thread/thr_connect.c | 49 | ||||
-rw-r--r-- | lib/libkse/thread/thr_private.h | 2 | ||||
-rw-r--r-- | lib/libpthread/pthread.map | 4 | ||||
-rw-r--r-- | lib/libpthread/thread/Makefile.inc | 2 | ||||
-rw-r--r-- | lib/libpthread/thread/thr_accept.c | 49 | ||||
-rw-r--r-- | lib/libpthread/thread/thr_connect.c | 49 | ||||
-rw-r--r-- | lib/libpthread/thread/thr_private.h | 2 |
9 files changed, 208 insertions, 0 deletions
diff --git a/lib/libkse/thread/Makefile.inc b/lib/libkse/thread/Makefile.inc index d29da77..0a9da84 100644 --- a/lib/libkse/thread/Makefile.inc +++ b/lib/libkse/thread/Makefile.inc @@ -4,6 +4,7 @@ .PATH: ${.CURDIR}/thread SRCS+= \ + thr_accept.c \ thr_aio_suspend.c \ thr_atfork.c \ thr_attr_destroy.c \ @@ -38,6 +39,7 @@ SRCS+= \ thr_cond.c \ thr_condattr_destroy.c \ thr_condattr_init.c \ + thr_connect.c \ thr_creat.c \ thr_create.c \ thr_detach.c \ diff --git a/lib/libkse/thread/thr_accept.c b/lib/libkse/thread/thr_accept.c new file mode 100644 index 0000000..3bb4031 --- /dev/null +++ b/lib/libkse/thread/thr_accept.c @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2003 Daniel Eischen <deischen@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, this list of conditions and the following disclaimer. + * 2. Neither the name of the author nor the names of any co-contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 AUTHOR OR CONTRIBUTORS 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. + */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + +#include <sys/types.h> +#include <sys/socket.h> +#include <pthread.h> +#include "thr_private.h" + +__weak_reference(__accept, accept); + +int +__accept(int s, struct sockaddr *addr, socklen_t *addrlen) +{ + struct pthread *curthread; + int ret; + + curthread = _get_curthread(); + _thr_cancel_enter(curthread); + ret = __sys_accept(s, addr, addrlen); + _thr_cancel_leave(curthread, ret != 0); + + return (ret); +} diff --git a/lib/libkse/thread/thr_connect.c b/lib/libkse/thread/thr_connect.c new file mode 100644 index 0000000..7e29a6d --- /dev/null +++ b/lib/libkse/thread/thr_connect.c @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2003 Daniel Eischen <deischen@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, this list of conditions and the following disclaimer. + * 2. Neither the name of the author nor the names of any co-contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 AUTHOR OR CONTRIBUTORS 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. + */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + +#include <sys/types.h> +#include <sys/socket.h> +#include <pthread.h> +#include "thr_private.h" + +__weak_reference(__connect, connect); + +int +__connect(int fd, const struct sockaddr *name, socklen_t namelen) +{ + struct pthread *curthread; + int ret; + + curthread = _get_curthread(); + _thr_cancel_enter(curthread); + ret = __sys_connect(fd, name, namelen); + _thr_cancel_leave(curthread, ret != 0); + + return (ret); +} diff --git a/lib/libkse/thread/thr_private.h b/lib/libkse/thread/thr_private.h index 8c344ec..9c8e9fe 100644 --- a/lib/libkse/thread/thr_private.h +++ b/lib/libkse/thread/thr_private.h @@ -1232,6 +1232,8 @@ int __sys_sigaltstack(const struct sigaltstack *, struct sigaltstack *); /* #include <sys/socket.h> */ #ifdef _SYS_SOCKET_H_ +int __sys_accept(int, struct sockaddr *, socklen_t *); +int __sys_connect(int, const struct sockaddr *, socklen_t); int __sys_sendfile(int, int, off_t, size_t, struct sf_hdtr *, off_t *, int); #endif diff --git a/lib/libpthread/pthread.map b/lib/libpthread/pthread.map index ae0a5ae..04b308c 100644 --- a/lib/libpthread/pthread.map +++ b/lib/libpthread/pthread.map @@ -2,7 +2,9 @@ LIBTHREAD_1_0 { global: ___creat; + __accept; __close; + __connect; __error; __fcntl; __fsync; @@ -167,8 +169,10 @@ global: _vfork; _wait; _waitpid; + accept; aio_suspend; close; + connect; creat; fcntl; fork; diff --git a/lib/libpthread/thread/Makefile.inc b/lib/libpthread/thread/Makefile.inc index d29da77..0a9da84 100644 --- a/lib/libpthread/thread/Makefile.inc +++ b/lib/libpthread/thread/Makefile.inc @@ -4,6 +4,7 @@ .PATH: ${.CURDIR}/thread SRCS+= \ + thr_accept.c \ thr_aio_suspend.c \ thr_atfork.c \ thr_attr_destroy.c \ @@ -38,6 +39,7 @@ SRCS+= \ thr_cond.c \ thr_condattr_destroy.c \ thr_condattr_init.c \ + thr_connect.c \ thr_creat.c \ thr_create.c \ thr_detach.c \ diff --git a/lib/libpthread/thread/thr_accept.c b/lib/libpthread/thread/thr_accept.c new file mode 100644 index 0000000..3bb4031 --- /dev/null +++ b/lib/libpthread/thread/thr_accept.c @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2003 Daniel Eischen <deischen@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, this list of conditions and the following disclaimer. + * 2. Neither the name of the author nor the names of any co-contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 AUTHOR OR CONTRIBUTORS 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. + */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + +#include <sys/types.h> +#include <sys/socket.h> +#include <pthread.h> +#include "thr_private.h" + +__weak_reference(__accept, accept); + +int +__accept(int s, struct sockaddr *addr, socklen_t *addrlen) +{ + struct pthread *curthread; + int ret; + + curthread = _get_curthread(); + _thr_cancel_enter(curthread); + ret = __sys_accept(s, addr, addrlen); + _thr_cancel_leave(curthread, ret != 0); + + return (ret); +} diff --git a/lib/libpthread/thread/thr_connect.c b/lib/libpthread/thread/thr_connect.c new file mode 100644 index 0000000..7e29a6d --- /dev/null +++ b/lib/libpthread/thread/thr_connect.c @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2003 Daniel Eischen <deischen@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, this list of conditions and the following disclaimer. + * 2. Neither the name of the author nor the names of any co-contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 AUTHOR OR CONTRIBUTORS 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. + */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + +#include <sys/types.h> +#include <sys/socket.h> +#include <pthread.h> +#include "thr_private.h" + +__weak_reference(__connect, connect); + +int +__connect(int fd, const struct sockaddr *name, socklen_t namelen) +{ + struct pthread *curthread; + int ret; + + curthread = _get_curthread(); + _thr_cancel_enter(curthread); + ret = __sys_connect(fd, name, namelen); + _thr_cancel_leave(curthread, ret != 0); + + return (ret); +} diff --git a/lib/libpthread/thread/thr_private.h b/lib/libpthread/thread/thr_private.h index 8c344ec..9c8e9fe 100644 --- a/lib/libpthread/thread/thr_private.h +++ b/lib/libpthread/thread/thr_private.h @@ -1232,6 +1232,8 @@ int __sys_sigaltstack(const struct sigaltstack *, struct sigaltstack *); /* #include <sys/socket.h> */ #ifdef _SYS_SOCKET_H_ +int __sys_accept(int, struct sockaddr *, socklen_t *); +int __sys_connect(int, const struct sockaddr *, socklen_t); int __sys_sendfile(int, int, off_t, size_t, struct sf_hdtr *, off_t *, int); #endif |