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

Diff Legend

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