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.15 by root, Sun Nov 11 16:59:35 2007 UTC vs.
Revision 1.25 by root, Fri Nov 23 19:13:33 2007 UTC

… …
37static void 37static void
38kqueue_change (EV_P_ int fd, int filter, int flags, int fflags) 38kqueue_change (EV_P_ int fd, int filter, int flags, int fflags)
39{ 39{
40 struct kevent *ke; 40 struct kevent *ke;
41 41
42 ++kqueue_changecnt;
42 array_needsize (struct kevent, kqueue_changes, kqueue_changemax, ++kqueue_changecnt, ); 43 array_needsize (struct kevent, kqueue_changes, kqueue_changemax, kqueue_changecnt, EMPTY2);
43 44
44 ke = &kqueue_changes [kqueue_changecnt - 1]; 45 EV_SET (&kqueue_changes [kqueue_changecnt - 1], fd, filter, flags, fflags, 0, 0);
45 memset (ke, 0, sizeof (struct kevent));
46 ke->ident = fd;
47 ke->filter = filter;
48 ke->flags = flags;
49 ke->fflags = fflags;
50} 46}
51 47
52#ifndef NOTE_EOF 48#ifndef NOTE_EOF
53# define NOTE_EOF 0 49# define NOTE_EOF 0
54#endif 50#endif
55 51
56static void 52static void
57kqueue_modify (EV_P_ int fd, int oev, int nev) 53kqueue_modify (EV_P_ int fd, int oev, int nev)
58{ 54{
55 if (oev != nev)
56 {
57 if (oev & EV_READ)
58 kqueue_change (EV_A_ fd, EVFILT_READ , EV_DELETE, 0);
59
60 if (oev & EV_WRITE)
61 kqueue_change (EV_A_ fd, EVFILT_WRITE, EV_DELETE, 0);
62 }
63
59 /* to detect close/reopen reliably, we have to remove and re-add */ 64 /* to detect close/reopen reliably, we have to re-add */
60 /* event requests even when oev == nev */ 65 /* event requests even when oev == nev */
61 66
62 if (oev & EV_READ)
63 kqueue_change (EV_A_ fd, EVFILT_READ, EV_DELETE, 0);
64
65 if (oev & EV_WRITE)
66 kqueue_change (EV_A_ fd, EVFILT_WRITE, EV_DELETE, 0);
67
68 if (nev & EV_READ) 67 if (nev & EV_READ)
69 kqueue_change (EV_A_ fd, EVFILT_READ, EV_ADD, NOTE_EOF); 68 kqueue_change (EV_A_ fd, EVFILT_READ , EV_ADD, NOTE_EOF);
70 69
71 if (nev & EV_WRITE) 70 if (nev & EV_WRITE)
72 kqueue_change (EV_A_ fd, EVFILT_WRITE, EV_ADD, NOTE_EOF); 71 kqueue_change (EV_A_ fd, EVFILT_WRITE, EV_ADD, NOTE_EOF);
73} 72}
74 73
… …
85 kqueue_eventmax = array_roundsize (struct kevent, kqueue_changecnt); 84 kqueue_eventmax = array_roundsize (struct kevent, kqueue_changecnt);
86 kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax); 85 kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax);
87 } 86 }
88 87
89 ts.tv_sec = (time_t)timeout; 88 ts.tv_sec = (time_t)timeout;
90 ts.tv_nsec = (long)(timeout - (ev_tstamp)ts.tv_sec) * 1e9; 89 ts.tv_nsec = (long)((timeout - (ev_tstamp)ts.tv_sec) * 1e9);
91 res = kevent (kqueue_fd, kqueue_changes, kqueue_changecnt, kqueue_events, kqueue_eventmax, &ts); 90 res = kevent (backend_fd, kqueue_changes, kqueue_changecnt, kqueue_events, kqueue_eventmax, &ts);
92 kqueue_changecnt = 0; 91 kqueue_changecnt = 0;
93 92
94 if (res < 0) 93 if (res < 0)
95 { 94 {
96 if (errno != EINTR) 95 if (errno != EINTR)
… …
101 100
102 for (i = 0; i < res; ++i) 101 for (i = 0; i < res; ++i)
103 { 102 {
104 int fd = kqueue_events [i].ident; 103 int fd = kqueue_events [i].ident;
105 104
106 if (kqueue_events [i].flags & EV_ERROR) 105 if (expect_false (kqueue_events [i].flags & EV_ERROR))
107 { 106 {
108 int err = kqueue_events [i].data; 107 int err = kqueue_events [i].data;
109 108
110 /* 109 /*
111 * errors that may happen 110 * errors that may happen
… …
155kqueue_init (EV_P_ int flags) 154kqueue_init (EV_P_ int flags)
156{ 155{
157 struct kevent ch, ev; 156 struct kevent ch, ev;
158 157
159 /* Initalize the kernel queue */ 158 /* Initalize the kernel queue */
160 if ((kqueue_fd = kqueue ()) < 0) 159 if ((backend_fd = kqueue ()) < 0)
161 return 0; 160 return 0;
162 161
163 fcntl (kqueue_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 */
164 163
165 /* Check for Mac OS X kqueue bug. */ 164 /* Check for Mac OS X kqueue bug. */
166 ch.ident = -1; 165 ch.ident = -1;
167 ch.filter = EVFILT_READ; 166 ch.filter = EVFILT_READ;
168 ch.flags = EV_ADD; 167 ch.flags = EV_ADD;
… …
170 /* 169 /*
171 * If kqueue works, then kevent will succeed, and it will 170 * If kqueue works, then kevent will succeed, and it will
172 * stick an error in ev. If kqueue is broken, then 171 * stick an error in ev. If kqueue is broken, then
173 * kevent will fail. 172 * kevent will fail.
174 */ 173 */
175 if (kevent (kqueue_fd, &ch, 1, &ev, 1, 0) != 1 174 if (kevent (backend_fd, &ch, 1, &ev, 1, 0) != 1
176 || ev.ident != -1 175 || ev.ident != -1
177 || ev.flags != EV_ERROR) 176 || ev.flags != EV_ERROR)
178 { 177 {
179 /* detected broken kqueue */ 178 /* detected broken kqueue */
180 close (kqueue_fd); 179 close (backend_fd);
181 return 0; 180 return 0;
182 } 181 }
183 182
184 method_fudge = 1e-3; /* needed to compensate for kevent returning early */ 183 backend_fudge = 1e-3; /* needed to compensate for kevent returning early */
185 method_modify = kqueue_modify; 184 backend_modify = kqueue_modify;
186 method_poll = kqueue_poll; 185 backend_poll = kqueue_poll;
187 186
188 kqueue_eventmax = 64; /* intiial number of events receivable per poll */ 187 kqueue_eventmax = 64; /* intiial number of events receivable per poll */
189 kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax); 188 kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax);
190 189
191 kqueue_changes = 0; 190 kqueue_changes = 0;
192 kqueue_changemax = 0; 191 kqueue_changemax = 0;
193 kqueue_changecnt = 0; 192 kqueue_changecnt = 0;
194 193
195 return EVMETHOD_KQUEUE; 194 return EVBACKEND_KQUEUE;
196} 195}
197 196
198static void 197static void
199kqueue_destroy (EV_P) 198kqueue_destroy (EV_P)
200{ 199{
201 close (kqueue_fd); 200 close (backend_fd);
202 201
203 ev_free (kqueue_events); 202 ev_free (kqueue_events);
204 ev_free (kqueue_changes); 203 ev_free (kqueue_changes);
205} 204}
206 205
207static void 206static void
208kqueue_fork (EV_P) 207kqueue_fork (EV_P)
209{ 208{
210 close (kqueue_fd); 209 close (backend_fd);
211 210
212 while ((kqueue_fd = kqueue ()) < 0) 211 while ((backend_fd = kqueue ()) < 0)
213 syserr ("(libev) kqueue"); 212 syserr ("(libev) kqueue");
214 213
215 fcntl (kqueue_fd, F_SETFD, FD_CLOEXEC); 214 fcntl (backend_fd, F_SETFD, FD_CLOEXEC);
216 215
217 /* re-register interest in fds */ 216 /* re-register interest in fds */
218 fd_rearm_all (EV_A); 217 fd_rearm_all (EV_A);
219} 218}
220 219

Diff Legend

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