ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libev/ev_kqueue.c
(Generate patch)

Comparing libev/ev_kqueue.c (file contents):
Revision 1.31 by root, Sun Dec 9 15:06:21 2007 UTC vs.
Revision 1.52 by root, Sun Feb 12 08:38:31 2012 UTC

1/* 1/*
2 * libev kqueue backend 2 * libev kqueue backend
3 * 3 *
4 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010,2011 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * modification, are permitted provided that the following conditions are 8 * tion, are permitted provided that the following conditions are met:
9 * met:
10 * 9 *
11 * * Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright notice,
11 * this list of conditions and the following disclaimer.
12 *
13 * 2. Redistributions in binary form must reproduce the above copyright
12 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution.
13 * 16 *
14 * * Redistributions in binary form must reproduce the above 17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
15 * copyright notice, this list of conditions and the following 18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
16 * disclaimer in the documentation and/or other materials provided 19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
17 * with the distribution. 20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
18 *
19 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
20 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
21 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
22 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
23 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
24 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 22 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 23 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 24 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 25 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 26 * OF THE POSSIBILITY OF SUCH DAMAGE.
27 *
28 * Alternatively, the contents of this file may be used under the terms of
29 * the GNU General Public License ("GPL") version 2 or any later version,
30 * in which case the provisions of the GPL are applicable instead of
31 * the above. If you wish to allow the use of your version of this file
32 * only under the terms of the GPL and not to allow others to use your
33 * version of this file under the BSD license, indicate your decision
34 * by deleting the provisions above and replace them with the notice
35 * and other provisions required by the GPL. If you do not delete the
36 * provisions above, a recipient may use your version of this file under
37 * either the BSD or the GPL.
30 */ 38 */
31 39
32#include <sys/types.h> 40#include <sys/types.h>
33#include <sys/time.h> 41#include <sys/time.h>
34#include <sys/queue.h>
35#include <sys/event.h> 42#include <sys/event.h>
36#include <string.h> 43#include <string.h>
37#include <errno.h> 44#include <errno.h>
38 45
39void inline_speed 46void inline_speed
40kqueue_change (EV_P_ int fd, int filter, int flags, int fflags) 47kqueue_change (EV_P_ int fd, int filter, int flags, int fflags)
41{ 48{
42 struct kevent *ke;
43
44 ++kqueue_changecnt; 49 ++kqueue_changecnt;
45 array_needsize (struct kevent, kqueue_changes, kqueue_changemax, kqueue_changecnt, EMPTY2); 50 array_needsize (struct kevent, kqueue_changes, kqueue_changemax, kqueue_changecnt, EMPTY2);
46 51
47 EV_SET (&kqueue_changes [kqueue_changecnt - 1], fd, filter, flags, fflags, 0, 0); 52 EV_SET (&kqueue_changes [kqueue_changecnt - 1], fd, filter, flags, fflags, 0, 0);
48} 53}
49 54
55/* OS X at least needs this */
56#ifndef EV_ENABLE
57# define EV_ENABLE 0
58#endif
50#ifndef NOTE_EOF 59#ifndef NOTE_EOF
51# define NOTE_EOF 0 60# define NOTE_EOF 0
52#endif 61#endif
53 62
54static void 63static void
… …
65 74
66 /* to detect close/reopen reliably, we have to re-add */ 75 /* to detect close/reopen reliably, we have to re-add */
67 /* event requests even when oev == nev */ 76 /* event requests even when oev == nev */
68 77
69 if (nev & EV_READ) 78 if (nev & EV_READ)
70 kqueue_change (EV_A_ fd, EVFILT_READ , EV_ADD, NOTE_EOF); 79 kqueue_change (EV_A_ fd, EVFILT_READ , EV_ADD | EV_ENABLE, NOTE_EOF);
71 80
72 if (nev & EV_WRITE) 81 if (nev & EV_WRITE)
73 kqueue_change (EV_A_ fd, EVFILT_WRITE, EV_ADD, NOTE_EOF); 82 kqueue_change (EV_A_ fd, EVFILT_WRITE, EV_ADD | EV_ENABLE, NOTE_EOF);
74} 83}
75 84
76static void 85static void
77kqueue_poll (EV_P_ ev_tstamp timeout) 86kqueue_poll (EV_P_ ev_tstamp timeout)
78{ 87{
… …
85 ev_free (kqueue_events); 94 ev_free (kqueue_events);
86 kqueue_eventmax = array_nextsize (sizeof (struct kevent), kqueue_eventmax, kqueue_changecnt); 95 kqueue_eventmax = array_nextsize (sizeof (struct kevent), kqueue_eventmax, kqueue_changecnt);
87 kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax); 96 kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax);
88 } 97 }
89 98
90 ts.tv_sec = (time_t)timeout; 99 EV_RELEASE_CB;
91 ts.tv_nsec = (long)((timeout - (ev_tstamp)ts.tv_sec) * 1e9); 100 EV_TS_SET (ts, timeout);
92 res = kevent (backend_fd, kqueue_changes, kqueue_changecnt, kqueue_events, kqueue_eventmax, &ts); 101 res = kevent (backend_fd, kqueue_changes, kqueue_changecnt, kqueue_events, kqueue_eventmax, &ts);
102 EV_ACQUIRE_CB;
93 kqueue_changecnt = 0; 103 kqueue_changecnt = 0;
94 104
95 if (expect_false (res < 0)) 105 if (expect_false (res < 0))
96 { 106 {
97 if (errno != EINTR) 107 if (errno != EINTR)
98 syserr ("(libev) kevent"); 108 ev_syserr ("(libev) kevent");
99 109
100 return; 110 return;
101 } 111 }
102 112
103 for (i = 0; i < res; ++i) 113 for (i = 0; i < res; ++i)
104 { 114 {
105 int fd = kqueue_events [i].ident; 115 int fd = kqueue_events [i].ident;
106 116
107 if (expect_false (kqueue_events [i].flags & EV_ERROR)) 117 if (expect_false (kqueue_events [i].flags & EV_ERROR))
108 { 118 {
109 int err = kqueue_events [i].data; 119 int err = kqueue_events [i].data;
110 120
111 /* we are only interested in errors for fds that we are interested in :) */ 121 /* we are only interested in errors for fds that we are interested in :) */
112 if (anfds [fd].events) 122 if (anfds [fd].events)
113 { 123 {
114 if (err == ENOENT) /* resubmit changes on ENOENT */ 124 if (err == ENOENT) /* resubmit changes on ENOENT */
115 kqueue_modify (EV_A_ fd, 0, anfds [fd].events); 125 kqueue_modify (EV_A_ fd, 0, anfds [fd].events);
116 else if (err == EBADF) /* on EBADF, we re-check the fd */ 126 else if (err == EBADF) /* on EBADF, we re-check the fd */
117 { 127 {
118 if (fd_valid (fd)) 128 if (fd_valid (fd))
… …
120 else 130 else
121 fd_kill (EV_A_ fd); 131 fd_kill (EV_A_ fd);
122 } 132 }
123 else /* on all other errors, we error out on the fd */ 133 else /* on all other errors, we error out on the fd */
124 fd_kill (EV_A_ fd); 134 fd_kill (EV_A_ fd);
125 } 135 }
126 } 136 }
127 else 137 else
128 fd_event ( 138 fd_event (
129 EV_A_ 139 EV_A_
130 fd, 140 fd,
… …
143} 153}
144 154
145int inline_size 155int inline_size
146kqueue_init (EV_P_ int flags) 156kqueue_init (EV_P_ int flags)
147{ 157{
148 struct kevent ch, ev;
149
150 /* Initalize the kernel queue */ 158 /* Initialize the kernel queue */
151 if ((backend_fd = kqueue ()) < 0) 159 if ((backend_fd = kqueue ()) < 0)
152 return 0; 160 return 0;
153 161
154 fcntl (backend_fd, F_SETFD, FD_CLOEXEC); /* not sure if necessary, hopefully doesn't hurt */ 162 fcntl (backend_fd, F_SETFD, FD_CLOEXEC); /* not sure if necessary, hopefully doesn't hurt */
155 163
156 backend_fudge = 0.; 164 backend_mintime = 1e-9; /* apparently, they did the right thing in freebsd */
157 backend_modify = kqueue_modify; 165 backend_modify = kqueue_modify;
158 backend_poll = kqueue_poll; 166 backend_poll = kqueue_poll;
159 167
160 kqueue_eventmax = 64; /* initial number of events receivable per poll */ 168 kqueue_eventmax = 64; /* initial number of events receivable per poll */
161 kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax); 169 kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax);
162 170
163 kqueue_changes = 0; 171 kqueue_changes = 0;
… …
178kqueue_fork (EV_P) 186kqueue_fork (EV_P)
179{ 187{
180 close (backend_fd); 188 close (backend_fd);
181 189
182 while ((backend_fd = kqueue ()) < 0) 190 while ((backend_fd = kqueue ()) < 0)
183 syserr ("(libev) kqueue"); 191 ev_syserr ("(libev) kqueue");
184 192
185 fcntl (backend_fd, F_SETFD, FD_CLOEXEC); 193 fcntl (backend_fd, F_SETFD, FD_CLOEXEC);
186 194
187 /* re-register interest in fds */ 195 /* re-register interest in fds */
188 fd_rearm_all (EV_A); 196 fd_rearm_all (EV_A);
189} 197}
190 198
199/* sys/event.h defines EV_ERROR */
200#undef EV_ERROR
201

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines