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.10 by root, Tue Nov 6 00:52:33 2007 UTC vs.
Revision 1.24 by root, Fri Nov 23 13:08:57 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 (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{
59 if ((oev ^ nev) & EV_READ) 55 if (oev != nev)
60 { 56 {
61 if (nev & EV_READ) 57 if (oev & EV_READ)
62 kqueue_change (fd, EVFILT_READ, EV_ADD, NOTE_EOF);
63 else
64 kqueue_change (fd, EVFILT_READ, EV_DELETE, 0); 58 kqueue_change (EV_A_ fd, EVFILT_READ , EV_DELETE, 0);
65 }
66 59
67 if ((oev ^ nev) & EV_WRITE)
68 {
69 if (nev & EV_WRITE) 60 if (oev & EV_WRITE)
70 kqueue_change (fd, EVFILT_WRITE, EV_ADD, NOTE_EOF);
71 else
72 kqueue_change (fd, EVFILT_WRITE, EV_DELETE, 0); 61 kqueue_change (EV_A_ fd, EVFILT_WRITE, EV_DELETE, 0);
73 } 62 }
63
64 /* to detect close/reopen reliably, we have to re-add */
65 /* event requests even when oev == nev */
66
67 if (nev & EV_READ)
68 kqueue_change (EV_A_ fd, EVFILT_READ , EV_ADD, NOTE_EOF);
69
70 if (nev & EV_WRITE)
71 kqueue_change (EV_A_ fd, EVFILT_WRITE, EV_ADD, NOTE_EOF);
74} 72}
75 73
76static void 74static void
77kqueue_poll (EV_P_ ev_tstamp timeout) 75kqueue_poll (EV_P_ ev_tstamp timeout)
78{ 76{
79 int res, i; 77 int res, i;
80 struct timespec ts; 78 struct timespec ts;
81 79
80 /* need to resize so there is enough space for errors */
81 if (kqueue_changecnt > kqueue_eventmax)
82 {
83 ev_free (kqueue_events);
84 kqueue_eventmax = array_roundsize (struct kevent, kqueue_changecnt);
85 kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax);
86 }
87
82 ts.tv_sec = (time_t)timeout; 88 ts.tv_sec = (time_t)timeout;
83 ts.tv_nsec = (long)(timeout - (ev_tstamp)ts.tv_sec) * 1e9; 89 ts.tv_nsec = (long)((timeout - (ev_tstamp)ts.tv_sec) * 1e9);
84 res = kevent (kqueue_fd, kqueue_changes, kqueue_changecnt, kqueue_events, kqueue_eventmax, &ts); 90 res = kevent (kqueue_fd, kqueue_changes, kqueue_changecnt, kqueue_events, kqueue_eventmax, &ts);
85 kqueue_changecnt = 0; 91 kqueue_changecnt = 0;
86 92
87 if (res < 0) 93 if (res < 0)
88 { 94 {
… …
92 return; 98 return;
93 } 99 }
94 100
95 for (i = 0; i < res; ++i) 101 for (i = 0; i < res; ++i)
96 { 102 {
103 int fd = kqueue_events [i].ident;
104
97 if (kqueue_events [i].flags & EV_ERROR) 105 if (expect_false (kqueue_events [i].flags & EV_ERROR))
98 { 106 {
107 int err = kqueue_events [i].data;
108
99 /* 109 /*
100 * Error messages that can happen, when a delete fails. 110 * errors that may happen
101 * EBADF happens when the file discriptor has been 111 * EBADF happens when the file discriptor has been
102 * closed, 112 * closed,
103 * ENOENT when the file discriptor was closed and 113 * ENOENT when the file descriptor was closed and
104 * then reopened. 114 * then reopened.
105 * EINVAL for some reasons not understood; EINVAL 115 * EINVAL for some reasons not understood; EINVAL
106 * should not be returned ever; but FreeBSD does :-\ 116 * should not be returned ever; but FreeBSD does :-\
107 * An error is also indicated when a callback deletes
108 * an event we are still processing. In that case
109 * the data field is set to ENOENT.
110 */ 117 */
111 if (kqueue_events [i].data == EBADF) 118
112 fd_kill (EV_A_ kqueue_events [i].ident); 119 /* we are only interested in errors for fds that we are interested in :) */
120 if (anfds [fd].events)
121 {
122 if (err == ENOENT) /* resubmit changes on ENOENT */
123 kqueue_modify (EV_A_ fd, 0, anfds [fd].events);
124 else if (err == EBADF) /* on EBADF, we re-check the fd */
125 {
126 if (fd_valid (fd))
127 kqueue_modify (EV_A_ fd, 0, anfds [fd].events);
128 else
129 fd_kill (EV_A_ fd);
130 }
131 else /* on all other errors, we error out on the fd */
132 fd_kill (EV_A_ fd);
133 }
113 } 134 }
114 else 135 else
115 fd_event ( 136 fd_event (
116 EV_A_ 137 EV_A_
117 kqueue_events [i].ident, 138 fd,
118 kqueue_events [i].filter == EVFILT_READ ? EV_READ 139 kqueue_events [i].filter == EVFILT_READ ? EV_READ
119 : kqueue_events [i].filter == EVFILT_WRITE ? EV_WRITE 140 : kqueue_events [i].filter == EVFILT_WRITE ? EV_WRITE
120 : 0 141 : 0
121 ); 142 );
122 } 143 }
123 144
124 if (expect_false (res == kqueue_eventmax)) 145 if (expect_false (res == kqueue_eventmax))
125 { 146 {
126 ev_free (kqueue_events); 147 ev_free (kqueue_events);
127 kqueue_eventmax = array_roundsize (kqueue_events, kqueue_eventmax << 1); 148 kqueue_eventmax = array_roundsize (struct kevent, kqueue_eventmax << 1);
128 kqueue_events = ev_malloc (sizeof (struct kevent) * kqueue_eventmax); 149 kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax);
129 } 150 }
130} 151}
131 152
132static int 153static int
133kqueue_init (EV_P_ int flags) 154kqueue_init (EV_P_ int flags)
… …
157 /* detected broken kqueue */ 178 /* detected broken kqueue */
158 close (kqueue_fd); 179 close (kqueue_fd);
159 return 0; 180 return 0;
160 } 181 }
161 182
162 method_fudge = 1e-3; /* needed to compensate for kevent returning early */ 183 backend_fudge = 1e-3; /* needed to compensate for kevent returning early */
163 method_modify = kqueue_modify; 184 backend_modify = kqueue_modify;
164 method_poll = kqueue_poll; 185 backend_poll = kqueue_poll;
165 186
166 kqueue_eventmax = 64; /* intiial number of events receivable per poll */ 187 kqueue_eventmax = 64; /* intiial number of events receivable per poll */
167 kqueue_events = ev_malloc (sizeof (struct kevent) * kqueue_eventmax); 188 kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax);
168 189
169 kqueue_changes = 0; 190 kqueue_changes = 0;
170 kqueue_changemax = 0; 191 kqueue_changemax = 0;
171 kqueue_changecnt = 0; 192 kqueue_changecnt = 0;
172 193
173 return EVMETHOD_KQUEUE; 194 return EVBACKEND_KQUEUE;
174} 195}
175 196
176static void 197static void
177kqueue_destroy (EV_P) 198kqueue_destroy (EV_P)
178{ 199{
… …
183} 204}
184 205
185static void 206static void
186kqueue_fork (EV_P) 207kqueue_fork (EV_P)
187{ 208{
188 for (;;) 209 close (kqueue_fd);
189 {
190 kqueue_fd = kqueue ();
191 210
192 if (kqueue_fd >= 0) 211 while ((kqueue_fd = kqueue ()) < 0)
193 break;
194
195 syserr ("(libev) kqueue"); 212 syserr ("(libev) kqueue");
196 }
197 213
198 fcntl (kqueue_fd, F_SETFD, FD_CLOEXEC); 214 fcntl (kqueue_fd, F_SETFD, FD_CLOEXEC);
199 215
200 /* re-register interest in fds */ 216 /* re-register interest in fds */
201 fd_rearm_all (EV_A); 217 fd_rearm_all (EV_A);

Diff Legend

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