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.2 by root, Fri Nov 2 21:17:30 2007 UTC vs.
Revision 1.14 by root, Tue Nov 6 18:49:32 2007 UTC

1
2/* 1/*
3 * Copyright 2007 Marc Alexander Lehmann <libev@schmorp.de> 2 * Copyright 2007 Marc Alexander Lehmann <libev@schmorp.de>
4 * Copyright 2000-2002 Niels Provos <provos@citi.umich.edu> 3 * Copyright 2000-2002 Niels Provos <provos@citi.umich.edu>
5 * All rights reserved. 4 * All rights reserved.
6 * 5 *
… …
33#include <sys/queue.h> 32#include <sys/queue.h>
34#include <sys/event.h> 33#include <sys/event.h>
35#include <string.h> 34#include <string.h>
36#include <errno.h> 35#include <errno.h>
37 36
38static int kq_fd;
39static struct kevent *kq_changes;
40static int kq_changemax, kq_changecnt;
41static struct kevent *kq_events;
42static int kq_eventmax;
43
44static void 37static void
45kqueue_change (int fd, int filter, int flags, int fflags) 38kqueue_change (EV_P_ int fd, int filter, int flags, int fflags)
46{ 39{
47 struct kevent *ke; 40 struct kevent *ke;
48 41
49 array_needsize (kq_changes, kq_changemax, ++kq_changecnt, ); 42 array_needsize (struct kevent, kqueue_changes, kqueue_changemax, ++kqueue_changecnt, );
50 43
51 ke = &kq_changes [kq_changecnt - 1]; 44 ke = &kqueue_changes [kqueue_changecnt - 1];
52 memset (ke, 0, sizeof (struct kevent)); 45 memset (ke, 0, sizeof (struct kevent));
53 ke->ident = fd; 46 ke->ident = fd;
54 ke->filter = filter; 47 ke->filter = filter;
55 ke->flags = flags; 48 ke->flags = flags;
56 ke->fflags = fflags; 49 ke->fflags = fflags;
57} 50}
58 51
52#ifndef NOTE_EOF
53# define NOTE_EOF 0
54#endif
55
59static void 56static void
60kqueue_modify (int fd, int oev, int nev) 57kqueue_modify (EV_P_ int fd, int oev, int nev)
61{ 58{
59 /* to detect close/reopen reliably, we have to remove and re-add */
60 /* event requests even when oev == nev */
61
62 if ((oev ^ new) & EV_READ) 62 if (oev & EV_READ)
63 { 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
64 if (nev & EV_READ) 68 if (nev & EV_READ)
65 kqueue_change (fd, EVFILT_READ, EV_ADD, NOTE_EOF); 69 kqueue_change (EV_A_ fd, EVFILT_READ, EV_ADD, NOTE_EOF);
66 else
67 kqueue_change (fd, EVFILT_READ, EV_DELETE, 0);
68 }
69 70
70 if ((oev ^ new) & EV_WRITE)
71 {
72 if (nev & EV_WRITE) 71 if (nev & EV_WRITE)
73 kqueue_change (fd, EVFILT_WRITE, EV_ADD, NOTE_EOF); 72 kqueue_change (EV_A_ fd, EVFILT_WRITE, EV_ADD, NOTE_EOF);
74 else
75 kqueue_change (fd, EVFILT_WRITE, EV_DELETE, 0);
76 }
77} 73}
78 74
79static void 75static void
80kqueue_poll (ev_tstamp timeout) 76kqueue_poll (EV_P_ ev_tstamp timeout)
81{ 77{
82 int res, i; 78 int res, i;
83 struct timespec ts; 79 struct timespec ts;
84 80
81 /* need to resize so there is enough space for errors */
82 if (kqueue_changecnt > kqueue_eventmax)
83 {
84 ev_free (kqueue_events);
85 kqueue_eventmax = array_roundsize (struct kevent, kqueue_changecnt);
86 kqueue_events = ev_malloc (sizeof (struct kevent) * kqueue_eventmax);
87 }
88
85 ts.tv_sec = (time_t)timeout; 89 ts.tv_sec = (time_t)timeout;
86 ts.tv_nsec = (long)(timeout - (ev_tstamp)ts.tv_sec) * 1e9; 90 ts.tv_nsec = (long)(timeout - (ev_tstamp)ts.tv_sec) * 1e9;
87 res = kevent (kq_fd, kq_changes, kq_changecnt, kq_events, kq_eventmax, &ts); 91 res = kevent (kqueue_fd, kqueue_changes, kqueue_changecnt, kqueue_events, kqueue_eventmax, &ts);
88 kq_changecnt = 0; 92 kqueue_changecnt = 0;
89 93
90 if (res < 0) 94 if (res < 0)
95 {
96 if (errno != EINTR)
97 syserr ("(libev) kevent");
98
91 return; 99 return;
100 }
92 101
93 for (i = 0; i < res; ++i) 102 for (i = 0; i < res; ++i)
94 { 103 {
104 int fd = kqueue_events [i].ident;
105
95 if (kq_events [i].flags & EV_ERROR) 106 if (kqueue_events [i].flags & EV_ERROR)
96 { 107 {
108 int err = kqueue_events [i].data;
109
97 /* 110 /*
98 * Error messages that can happen, when a delete fails. 111 * errors that may happen
99 * EBADF happens when the file discriptor has been 112 * EBADF happens when the file discriptor has been
100 * closed, 113 * closed,
101 * ENOENT when the file discriptor was closed and 114 * ENOENT when the file descriptor was closed and
102 * then reopened. 115 * then reopened.
103 * EINVAL for some reasons not understood; EINVAL 116 * EINVAL for some reasons not understood; EINVAL
104 * should not be returned ever; but FreeBSD does :-\ 117 * should not be returned ever; but FreeBSD does :-\
105 * An error is also indicated when a callback deletes
106 * an event we are still processing. In that case
107 * the data field is set to ENOENT.
108 */ 118 */
109 if (events [i].data == EBADF) 119
110 fd_kill (events [i].ident); 120 /* we are only interested in errors for fds that we are interested in :) */
121 if (anfds [fd].events)
122 {
123 if (err == ENOENT) /* resubmit changes on ENOENT */
124 kqueue_modify (EV_A_ fd, 0, anfds [fd].events);
125 else if (err == EBADF) /* on EBADF, we re-check the fd */
126 {
127 if (fd_valid (fd))
128 kqueue_modify (EV_A_ fd, 0, anfds [fd].events);
129 else
130 fd_kill (EV_A_ fd);
131 }
132 else /* on all other errors, we error out on the fd */
133 fd_kill (EV_A_ fd);
134 }
111 } 135 }
112 else 136 else
113 event ( 137 fd_event (
114 events [i].ident, 138 EV_A_
139 fd,
115 events [i].filter == EVFILT_READ ? EV_READ 140 kqueue_events [i].filter == EVFILT_READ ? EV_READ
116 : events [i].filter == EVFILT_WRITE ? EV_WRITE 141 : kqueue_events [i].filter == EVFILT_WRITE ? EV_WRITE
117 : 0 142 : 0
118 ); 143 );
119 } 144 }
120 145
121 if (expect_false (res == kq_eventmax)) 146 if (expect_false (res == kqueue_eventmax))
122 { 147 {
123 free (kq_events); 148 ev_free (kqueue_events);
124 kq_eventmax = array_roundsize (kq_events, kq_eventmax << 1); 149 kqueue_eventmax = array_roundsize (struct kevent, kqueue_eventmax << 1);
125 kq_events = malloc (sizeof (struct kevent) * kq_eventmax); 150 kqueue_events = ev_malloc (sizeof (struct kevent) * kqueue_eventmax);
126 } 151 }
127} 152}
128 153
129static void 154static int
130kqueue_init (struct event_base *base) 155kqueue_init (EV_P_ int flags)
131{ 156{
132 struct kevent ch, ev; 157 struct kevent ch, ev;
133 158
134 /* Initalize the kernel queue */ 159 /* Initalize the kernel queue */
135 if ((kq_fd = kqueue ()) < 0) 160 if ((kqueue_fd = kqueue ()) < 0)
136 return; 161 return 0;
162
163 fcntl (kqueue_fd, F_SETFD, FD_CLOEXEC); /* not sure if necessary, hopefully doesn't hurt */
137 164
138 /* Check for Mac OS X kqueue bug. */ 165 /* Check for Mac OS X kqueue bug. */
139 ch.ident = -1; 166 ch.ident = -1;
140 ch.filter = EVFILT_READ; 167 ch.filter = EVFILT_READ;
141 ch.flags = EV_ADD; 168 ch.flags = EV_ADD;
142 169
143 /* 170 /*
144 * If kqueue works, then kevent will succeed, and it will 171 * If kqueue works, then kevent will succeed, and it will
145 * stick an error in events[0]. If kqueue is broken, then 172 * stick an error in ev. If kqueue is broken, then
146 * kevent will fail. 173 * kevent will fail.
147 */ 174 */
148 if (kevent (kq_fd, &ch, 1, &ev, 1, 0) != 1 175 if (kevent (kqueue_fd, &ch, 1, &ev, 1, 0) != 1
149 || ev.ident != -1 176 || ev.ident != -1
150 || ev.flags != EV_ERROR) 177 || ev.flags != EV_ERROR)
151 { 178 {
152 /* detected broken kqueue */ 179 /* detected broken kqueue */
153 close (kq_fd); 180 close (kqueue_fd);
154 return; 181 return 0;
155 } 182 }
156 183
157 ev_method = EVMETHOD_KQUEUE;
158 method_fudge = 1e-3; /* needed to compensate for kevent returning early */ 184 method_fudge = 1e-3; /* needed to compensate for kevent returning early */
159 method_modify = kq_modify; 185 method_modify = kqueue_modify;
160 method_poll = kq_poll; 186 method_poll = kqueue_poll;
161 187
162 kq_eventmax = 64; /* intiial number of events receivable per poll */ 188 kqueue_eventmax = 64; /* intiial number of events receivable per poll */
163 kq_events = malloc (sizeof (struct kevent) * kq_eventmax); 189 kqueue_events = ev_malloc (sizeof (struct kevent) * kqueue_eventmax);
164}
165 190
191 kqueue_changes = 0;
192 kqueue_changemax = 0;
193 kqueue_changecnt = 0;
194
195 return EVMETHOD_KQUEUE;
196}
197
198static void
199kqueue_destroy (EV_P)
200{
201 close (kqueue_fd);
202
203 ev_free (kqueue_events);
204 ev_free (kqueue_changes);
205}
206
207static void
208kqueue_fork (EV_P)
209{
210 close (kqueue_fd);
211
212 while ((kqueue_fd = kqueue ()) < 0)
213 syserr ("(libev) kqueue");
214
215 fcntl (kqueue_fd, F_SETFD, FD_CLOEXEC);
216
217 /* re-register interest in fds */
218 fd_rearm_all (EV_A);
219}
220

Diff Legend

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