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.5 by root, Sat Nov 3 16:23:59 2007 UTC vs.
Revision 1.15 by root, Sun Nov 11 16:59:35 2007 UTC

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