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.8 by root, Sun Nov 4 18:29:44 2007 UTC vs.
Revision 1.22 by root, Fri Nov 23 05:28:17 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 ke = &kqueue_changes [kqueue_changecnt - 1];
45 memset (ke, 0, sizeof (struct kevent)); 46 memset (ke, 0, sizeof (struct kevent));
46 ke->ident = fd; 47 ke->ident = fd;
47 ke->filter = filter; 48 ke->filter = filter;
… …
54#endif 55#endif
55 56
56static void 57static void
57kqueue_modify (EV_P_ int fd, int oev, int nev) 58kqueue_modify (EV_P_ int fd, int oev, int nev)
58{ 59{
59 if ((oev ^ nev) & EV_READ) 60 if (oev != nev)
60 { 61 {
61 if (nev & EV_READ) 62 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); 63 kqueue_change (EV_A_ fd, EVFILT_READ , EV_DELETE, 0);
65 }
66 64
67 if ((oev ^ nev) & EV_WRITE)
68 {
69 if (nev & EV_WRITE) 65 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); 66 kqueue_change (EV_A_ fd, EVFILT_WRITE, EV_DELETE, 0);
73 } 67 }
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);
74} 77}
75 78
76static void 79static void
77kqueue_poll (EV_P_ ev_tstamp timeout) 80kqueue_poll (EV_P_ ev_tstamp timeout)
78{ 81{
79 int res, i; 82 int res, i;
80 struct timespec ts; 83 struct timespec ts;
81 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
82 ts.tv_sec = (time_t)timeout; 93 ts.tv_sec = (time_t)timeout;
83 ts.tv_nsec = (long)(timeout - (ev_tstamp)ts.tv_sec) * 1e9; 94 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); 95 res = kevent (kqueue_fd, kqueue_changes, kqueue_changecnt, kqueue_events, kqueue_eventmax, &ts);
85 kqueue_changecnt = 0; 96 kqueue_changecnt = 0;
86 97
87 if (res < 0) 98 if (res < 0)
99 {
100 if (errno != EINTR)
101 syserr ("(libev) kevent");
102
88 return; 103 return;
104 }
89 105
90 for (i = 0; i < res; ++i) 106 for (i = 0; i < res; ++i)
91 { 107 {
108 int fd = kqueue_events [i].ident;
109
92 if (kqueue_events [i].flags & EV_ERROR) 110 if (kqueue_events [i].flags & EV_ERROR)
93 { 111 {
112 int err = kqueue_events [i].data;
113
94 /* 114 /*
95 * Error messages that can happen, when a delete fails. 115 * errors that may happen
96 * EBADF happens when the file discriptor has been 116 * EBADF happens when the file discriptor has been
97 * closed, 117 * closed,
98 * ENOENT when the file discriptor was closed and 118 * ENOENT when the file descriptor was closed and
99 * then reopened. 119 * then reopened.
100 * EINVAL for some reasons not understood; EINVAL 120 * EINVAL for some reasons not understood; EINVAL
101 * should not be returned ever; but FreeBSD does :-\ 121 * should not be returned ever; but FreeBSD does :-\
102 * An error is also indicated when a callback deletes
103 * an event we are still processing. In that case
104 * the data field is set to ENOENT.
105 */ 122 */
106 if (kqueue_events [i].data == EBADF) 123
107 fd_kill (EV_A_ kqueue_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 }
108 } 139 }
109 else 140 else
110 fd_event ( 141 fd_event (
111 EV_A_ 142 EV_A_
112 kqueue_events [i].ident, 143 fd,
113 kqueue_events [i].filter == EVFILT_READ ? EV_READ 144 kqueue_events [i].filter == EVFILT_READ ? EV_READ
114 : kqueue_events [i].filter == EVFILT_WRITE ? EV_WRITE 145 : kqueue_events [i].filter == EVFILT_WRITE ? EV_WRITE
115 : 0 146 : 0
116 ); 147 );
117 } 148 }
118 149
119 if (expect_false (res == kqueue_eventmax)) 150 if (expect_false (res == kqueue_eventmax))
120 { 151 {
121 free (kqueue_events); 152 ev_free (kqueue_events);
122 kqueue_eventmax = array_roundsize (kqueue_events, kqueue_eventmax << 1); 153 kqueue_eventmax = array_roundsize (struct kevent, kqueue_eventmax << 1);
123 kqueue_events = malloc (sizeof (struct kevent) * kqueue_eventmax); 154 kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax);
124 } 155 }
125} 156}
126 157
127static int 158static int
128kqueue_init (EV_P_ int flags) 159kqueue_init (EV_P_ int flags)
… …
152 /* detected broken kqueue */ 183 /* detected broken kqueue */
153 close (kqueue_fd); 184 close (kqueue_fd);
154 return 0; 185 return 0;
155 } 186 }
156 187
157 method_fudge = 1e-3; /* needed to compensate for kevent returning early */ 188 backend_fudge = 1e-3; /* needed to compensate for kevent returning early */
158 method_modify = kqueue_modify; 189 backend_modify = kqueue_modify;
159 method_poll = kqueue_poll; 190 backend_poll = kqueue_poll;
160 191
161 kqueue_eventmax = 64; /* intiial number of events receivable per poll */ 192 kqueue_eventmax = 64; /* intiial number of events receivable per poll */
162 kqueue_events = malloc (sizeof (struct kevent) * kqueue_eventmax); 193 kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax);
163 194
164 kqueue_changes = 0; 195 kqueue_changes = 0;
165 kqueue_changemax = 0; 196 kqueue_changemax = 0;
166 kqueue_changecnt = 0; 197 kqueue_changecnt = 0;
167 198
168 return EVMETHOD_KQUEUE; 199 return EVBACKEND_KQUEUE;
169} 200}
170 201
171static void 202static void
172kqueue_destroy (EV_P) 203kqueue_destroy (EV_P)
173{ 204{
174 close (kqueue_fd); 205 close (kqueue_fd);
175 206
176 free (kqueue_events); 207 ev_free (kqueue_events);
177 free (kqueue_changes); 208 ev_free (kqueue_changes);
178} 209}
179 210
180static void 211static void
181kqueue_fork (EV_P) 212kqueue_fork (EV_P)
182{ 213{
214 close (kqueue_fd);
215
183 kqueue_fd = kqueue (); 216 while ((kqueue_fd = kqueue ()) < 0)
217 syserr ("(libev) kqueue");
218
184 fcntl (kqueue_fd, F_SETFD, FD_CLOEXEC); 219 fcntl (kqueue_fd, F_SETFD, FD_CLOEXEC);
185 220
186 /* re-register interest in fds */ 221 /* re-register interest in fds */
187 fd_rearm_all (EV_A); 222 fd_rearm_all (EV_A);
188} 223}

Diff Legend

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