diff options
author | jlemon <jlemon@FreeBSD.org> | 2000-08-07 16:51:56 +0000 |
---|---|---|
committer | jlemon <jlemon@FreeBSD.org> | 2000-08-07 16:51:56 +0000 |
commit | 4cc352512a9cd9c6d421fa054cf26a9bdec60d47 (patch) | |
tree | 501db957c30a9410e56389dc06d2febd72b86029 /lib | |
parent | ed47465fd4017beb82cd19e2a4c0e0fac965b390 (diff) | |
download | FreeBSD-src-4cc352512a9cd9c6d421fa054cf26a9bdec60d47.zip FreeBSD-src-4cc352512a9cd9c6d421fa054cf26a9bdec60d47.tar.gz |
Add wrapper for kevent() syscall
Noted as missing by: nicolas.leonard@animaths.com
Diffstat (limited to 'lib')
-rw-r--r-- | lib/libc_r/Makefile | 3 | ||||
-rw-r--r-- | lib/libc_r/uthread/Makefile.inc | 1 | ||||
-rw-r--r-- | lib/libc_r/uthread/pthread_private.h | 2 | ||||
-rw-r--r-- | lib/libc_r/uthread/uthread_kern.c | 2 | ||||
-rw-r--r-- | lib/libc_r/uthread/uthread_kevent.c | 80 | ||||
-rw-r--r-- | lib/libkse/Makefile | 3 | ||||
-rw-r--r-- | lib/libkse/thread/Makefile.inc | 1 | ||||
-rw-r--r-- | lib/libkse/thread/thr_kern.c | 2 | ||||
-rw-r--r-- | lib/libkse/thread/thr_private.h | 2 | ||||
-rw-r--r-- | lib/libpthread/Makefile | 3 | ||||
-rw-r--r-- | lib/libpthread/thread/Makefile.inc | 1 | ||||
-rw-r--r-- | lib/libpthread/thread/thr_kern.c | 2 | ||||
-rw-r--r-- | lib/libpthread/thread/thr_private.h | 2 |
13 files changed, 95 insertions, 9 deletions
diff --git a/lib/libc_r/Makefile b/lib/libc_r/Makefile index 32a4127..4c06007 100644 --- a/lib/libc_r/Makefile +++ b/lib/libc_r/Makefile @@ -29,7 +29,8 @@ PRECIOUSLIB= yes HIDDEN_SYSCALLS= aio_suspend.o accept.o bind.o close.o connect.o dup.o dup2.o \ execve.o fchflags.o fchmod.o fchown.o fcntl.o \ flock.o fpathconf.o fstat.o fstatfs.o fsync.o getdirentries.o \ - getlogin.o getpeername.o getsockname.o getsockopt.o ioctl.o listen.o \ + getlogin.o getpeername.o getsockname.o getsockopt.o ioctl.o \ + kevent.o listen.o \ msync.o nanosleep.o nfssvc.o open.o poll.o read.o readv.o recvfrom.o \ recvmsg.o sched_yield.o select.o sendfile.o sendmsg.o sendto.o \ setsockopt.o shutdown.o sigaction.o sigaltstack.o \ diff --git a/lib/libc_r/uthread/Makefile.inc b/lib/libc_r/uthread/Makefile.inc index 68c3ae4..36c0834 100644 --- a/lib/libc_r/uthread/Makefile.inc +++ b/lib/libc_r/uthread/Makefile.inc @@ -65,6 +65,7 @@ SRCS+= \ uthread_jmp.c \ uthread_join.c \ uthread_kern.c \ + uthread_kevent.c \ uthread_kill.c \ uthread_listen.c \ uthread_mattr_init.c \ diff --git a/lib/libc_r/uthread/pthread_private.h b/lib/libc_r/uthread/pthread_private.h index 1ecda3c..8058469 100644 --- a/lib/libc_r/uthread/pthread_private.h +++ b/lib/libc_r/uthread/pthread_private.h @@ -1063,7 +1063,7 @@ void _thread_kern_sched(ucontext_t *); void _thread_kern_sched_state(enum pthread_state,char *fname,int lineno); void _thread_kern_sched_state_unlock(enum pthread_state state, spinlock_t *lock, char *fname, int lineno); -void _thread_kern_set_timeout(struct timespec *); +void _thread_kern_set_timeout(const struct timespec *); void _thread_kern_sig_defer(void); void _thread_kern_sig_undefer(void); void _thread_sig_handler(int, int, ucontext_t *); diff --git a/lib/libc_r/uthread/uthread_kern.c b/lib/libc_r/uthread/uthread_kern.c index 8b333e4..96a11da 100644 --- a/lib/libc_r/uthread/uthread_kern.c +++ b/lib/libc_r/uthread/uthread_kern.c @@ -1008,7 +1008,7 @@ _thread_kern_poll(int wait_reqd) } void -_thread_kern_set_timeout(struct timespec * timeout) +_thread_kern_set_timeout(const struct timespec * timeout) { struct timespec current_time; struct timeval tv; diff --git a/lib/libc_r/uthread/uthread_kevent.c b/lib/libc_r/uthread/uthread_kevent.c new file mode 100644 index 0000000..56e2798 --- /dev/null +++ b/lib/libc_r/uthread/uthread_kevent.c @@ -0,0 +1,80 @@ +/*- + * Copyright (c) 2000 Jonathan Lemon <jlemon@flugsvamp.com> + * 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. Redistributions in binary form must reproduce the above copyright + * notice, 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 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. + * + * $FreeBSD$ + */ + +#include <unistd.h> +#include <errno.h> +#include <string.h> +#include <sys/types.h> +#include <sys/time.h> +#include <sys/fcntl.h> +#include <sys/event.h> +#ifdef _THREAD_SAFE +#include <pthread.h> +#include "pthread_private.h" + + +int +_kevent(int kq, const struct kevent *changelist, int nchanges, + struct kevent *eventlist, int nevents, const struct timespec *timeout) +{ + struct timespec nullts = { 0, 0 }; + int rc; + + /* Set the wake up time */ + _thread_kern_set_timeout(timeout); + + rc = _thread_sys_kevent(kq, changelist, nchanges, + eventlist, nevents, &nullts); + if (rc == 0 && (timeout == NULL || + timeout->tv_sec != 0 || timeout->tv_nsec != 0)) { + /* Save the socket file descriptor: */ + _thread_run->data.fd.fd = kq; + _thread_run->data.fd.fname = __FILE__; + _thread_run->data.fd.branch = __LINE__; + + do { + /* Reset the interrupted operation flag: */ + _thread_run->interrupted = 0; + + _thread_kern_sched_state(PS_FDR_WAIT, + __FILE__, __LINE__); + + if (_thread_run->interrupted) { + errno = EINTR; + rc = -1; + break; + } + rc = _thread_sys_kevent(kq, NULL, 0, + eventlist, nevents, &nullts); + } while (rc == 0 && timeout != NULL); + } + return (rc); +} + +__strong_reference(_kevent, kevent); +#endif diff --git a/lib/libkse/Makefile b/lib/libkse/Makefile index 32a4127..4c06007 100644 --- a/lib/libkse/Makefile +++ b/lib/libkse/Makefile @@ -29,7 +29,8 @@ PRECIOUSLIB= yes HIDDEN_SYSCALLS= aio_suspend.o accept.o bind.o close.o connect.o dup.o dup2.o \ execve.o fchflags.o fchmod.o fchown.o fcntl.o \ flock.o fpathconf.o fstat.o fstatfs.o fsync.o getdirentries.o \ - getlogin.o getpeername.o getsockname.o getsockopt.o ioctl.o listen.o \ + getlogin.o getpeername.o getsockname.o getsockopt.o ioctl.o \ + kevent.o listen.o \ msync.o nanosleep.o nfssvc.o open.o poll.o read.o readv.o recvfrom.o \ recvmsg.o sched_yield.o select.o sendfile.o sendmsg.o sendto.o \ setsockopt.o shutdown.o sigaction.o sigaltstack.o \ diff --git a/lib/libkse/thread/Makefile.inc b/lib/libkse/thread/Makefile.inc index 68c3ae4..36c0834 100644 --- a/lib/libkse/thread/Makefile.inc +++ b/lib/libkse/thread/Makefile.inc @@ -65,6 +65,7 @@ SRCS+= \ uthread_jmp.c \ uthread_join.c \ uthread_kern.c \ + uthread_kevent.c \ uthread_kill.c \ uthread_listen.c \ uthread_mattr_init.c \ diff --git a/lib/libkse/thread/thr_kern.c b/lib/libkse/thread/thr_kern.c index 8b333e4..96a11da 100644 --- a/lib/libkse/thread/thr_kern.c +++ b/lib/libkse/thread/thr_kern.c @@ -1008,7 +1008,7 @@ _thread_kern_poll(int wait_reqd) } void -_thread_kern_set_timeout(struct timespec * timeout) +_thread_kern_set_timeout(const struct timespec * timeout) { struct timespec current_time; struct timeval tv; diff --git a/lib/libkse/thread/thr_private.h b/lib/libkse/thread/thr_private.h index 1ecda3c..8058469 100644 --- a/lib/libkse/thread/thr_private.h +++ b/lib/libkse/thread/thr_private.h @@ -1063,7 +1063,7 @@ void _thread_kern_sched(ucontext_t *); void _thread_kern_sched_state(enum pthread_state,char *fname,int lineno); void _thread_kern_sched_state_unlock(enum pthread_state state, spinlock_t *lock, char *fname, int lineno); -void _thread_kern_set_timeout(struct timespec *); +void _thread_kern_set_timeout(const struct timespec *); void _thread_kern_sig_defer(void); void _thread_kern_sig_undefer(void); void _thread_sig_handler(int, int, ucontext_t *); diff --git a/lib/libpthread/Makefile b/lib/libpthread/Makefile index 32a4127..4c06007 100644 --- a/lib/libpthread/Makefile +++ b/lib/libpthread/Makefile @@ -29,7 +29,8 @@ PRECIOUSLIB= yes HIDDEN_SYSCALLS= aio_suspend.o accept.o bind.o close.o connect.o dup.o dup2.o \ execve.o fchflags.o fchmod.o fchown.o fcntl.o \ flock.o fpathconf.o fstat.o fstatfs.o fsync.o getdirentries.o \ - getlogin.o getpeername.o getsockname.o getsockopt.o ioctl.o listen.o \ + getlogin.o getpeername.o getsockname.o getsockopt.o ioctl.o \ + kevent.o listen.o \ msync.o nanosleep.o nfssvc.o open.o poll.o read.o readv.o recvfrom.o \ recvmsg.o sched_yield.o select.o sendfile.o sendmsg.o sendto.o \ setsockopt.o shutdown.o sigaction.o sigaltstack.o \ diff --git a/lib/libpthread/thread/Makefile.inc b/lib/libpthread/thread/Makefile.inc index 68c3ae4..36c0834 100644 --- a/lib/libpthread/thread/Makefile.inc +++ b/lib/libpthread/thread/Makefile.inc @@ -65,6 +65,7 @@ SRCS+= \ uthread_jmp.c \ uthread_join.c \ uthread_kern.c \ + uthread_kevent.c \ uthread_kill.c \ uthread_listen.c \ uthread_mattr_init.c \ diff --git a/lib/libpthread/thread/thr_kern.c b/lib/libpthread/thread/thr_kern.c index 8b333e4..96a11da 100644 --- a/lib/libpthread/thread/thr_kern.c +++ b/lib/libpthread/thread/thr_kern.c @@ -1008,7 +1008,7 @@ _thread_kern_poll(int wait_reqd) } void -_thread_kern_set_timeout(struct timespec * timeout) +_thread_kern_set_timeout(const struct timespec * timeout) { struct timespec current_time; struct timeval tv; diff --git a/lib/libpthread/thread/thr_private.h b/lib/libpthread/thread/thr_private.h index 1ecda3c..8058469 100644 --- a/lib/libpthread/thread/thr_private.h +++ b/lib/libpthread/thread/thr_private.h @@ -1063,7 +1063,7 @@ void _thread_kern_sched(ucontext_t *); void _thread_kern_sched_state(enum pthread_state,char *fname,int lineno); void _thread_kern_sched_state_unlock(enum pthread_state state, spinlock_t *lock, char *fname, int lineno); -void _thread_kern_set_timeout(struct timespec *); +void _thread_kern_set_timeout(const struct timespec *); void _thread_kern_sig_defer(void); void _thread_kern_sig_undefer(void); void _thread_sig_handler(int, int, ucontext_t *); |