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

Diff Legend

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