diff options
| author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2014-10-29 22:38:43 +0000 |
|---|---|---|
| committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2014-10-29 22:38:43 +0000 |
| commit | 718ac877b64578ff518e34aec246ce62fec32311 (patch) | |
| tree | a4a3f864544ffd0c66bba578cd565ecec895ac16 | |
| parent | 6fd4d56a51e9da4e3c0694749044c47116ca33de (diff) | |
Remove workaround for Mac OS X kqueue bug.
OK nicm@
| -rw-r--r-- | lib/libevent/kqueue.c | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/lib/libevent/kqueue.c b/lib/libevent/kqueue.c index 5b4d73c448b..db87df49466 100644 --- a/lib/libevent/kqueue.c +++ b/lib/libevent/kqueue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kqueue.c,v 1.33 2014/10/18 21:56:44 bluhm Exp $ */ +/* $OpenBSD: kqueue.c,v 1.34 2014/10/29 22:38:42 bluhm Exp $ */ /* * Copyright 2000-2002 Niels Provos <provos@citi.umich.edu> @@ -121,27 +121,6 @@ kq_init(struct event_base *base) TAILQ_INIT(&kqueueop->evsigevents[i]); } - /* Check for Mac OS X kqueue bug. */ - kqueueop->changes[0].ident = -1; - kqueueop->changes[0].filter = EVFILT_READ; - kqueueop->changes[0].flags = EV_ADD; - /* - * If kqueue works, then kevent will succeed, and it will - * stick an error in events[0]. If kqueue is broken, then - * kevent will fail. - */ - if (kevent(kq, - kqueueop->changes, 1, kqueueop->events, NEVENT, NULL) != 1 || - kqueueop->events[0].ident != -1 || - kqueueop->events[0].flags != EV_ERROR) { - event_warn("%s: detected broken kqueue; not using.", __func__); - free(kqueueop->changes); - free(kqueueop->events); - free(kqueueop); - close(kq); - return (NULL); - } - return (kqueueop); } |