diff options
| author |   millert <millert@openbsd.org> | 2003-09-23 16:51:11 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 2003-09-23 16:51:11 +0000 |
| commit | 154dfaaa7e8e47825c6990a73b3eba25e82ebbb9 (patch) | |
| tree | bae4f380ce55fc233a68444dffc895a9dabf0b91 /sys/kern/kern_event.c | |
| parent | regen (Prepare for conversion of select backend -> poll) (diff) | |
| download | wireguard-openbsd-154dfaaa7e8e47825c6990a73b3eba25e82ebbb9.tar.xz wireguard-openbsd-154dfaaa7e8e47825c6990a73b3eba25e82ebbb9.zip | |
Replace select backends with poll backends. selscan() and pollscan()
now call the poll backend. With this change we implement greater
poll(2) functionality instead of emulating it via the select backend.
Adapted from NetBSD and including some changes from FreeBSD.
Tested by many, deraadt@ OK
Diffstat (limited to 'sys/kern/kern_event.c')
| -rw-r--r-- | sys/kern/kern_event.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index b5d265159d7..368bc6c79b6 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_event.c,v 1.20 2003/08/15 20:32:18 tedu Exp $ */ +/* $OpenBSD: kern_event.c,v 1.21 2003/09/23 16:51:12 millert Exp $ */ /*- * Copyright (c) 1999,2000,2001 Jonathan Lemon <jlemon@FreeBSD.org> @@ -48,6 +48,7 @@ #include <sys/stat.h> #include <sys/uio.h> #include <sys/mount.h> +#include <sys/poll.h> #include <sys/syscallargs.h> int kqueue_scan(struct file *fp, int maxevents, @@ -60,7 +61,7 @@ int kqueue_write(struct file *fp, off_t *poff, struct uio *uio, struct ucred *cred); int kqueue_ioctl(struct file *fp, u_long com, caddr_t data, struct proc *p); -int kqueue_select(struct file *fp, int which, struct proc *p); +int kqueue_poll(struct file *fp, int events, struct proc *p); int kqueue_kqfilter(struct file *fp, struct knote *kn); int kqueue_stat(struct file *fp, struct stat *st, struct proc *p); int kqueue_close(struct file *fp, struct proc *p); @@ -70,7 +71,7 @@ struct fileops kqueueops = { kqueue_read, kqueue_write, kqueue_ioctl, - kqueue_select, + kqueue_poll, kqueue_kqfilter, kqueue_stat, kqueue_close @@ -700,22 +701,22 @@ kqueue_ioctl(struct file *fp, u_long com, caddr_t data, struct proc *p) /*ARGSUSED*/ int -kqueue_select(struct file *fp, int which, struct proc *p) +kqueue_poll(struct file *fp, int events, struct proc *p) { struct kqueue *kq = (struct kqueue *)fp->f_data; - int res = 0; + int revents = 0; int s = splnet(); - if (which == FREAD) { + if (events & (POLLIN | POLLRDNORM)) { if (kq->kq_count) { - res = 1; + revents |= events & (POLLIN | POLLRDNORM); } else { selrecord(p, &kq->kq_sel); kq->kq_state |= KQ_SEL; } } splx(s); - return (res); + return (revents); } /*ARGSUSED*/ |