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.19 by root, Thu Nov 22 15:42:01 2007 UTC vs.
Revision 1.23 by root, Fri Nov 23 05:29:16 2007 UTC

… …
40 struct kevent *ke; 40 struct kevent *ke;
41 41
42 ++kqueue_changecnt; 42 ++kqueue_changecnt;
43 array_needsize (struct kevent, kqueue_changes, kqueue_changemax, kqueue_changecnt, EMPTY2); 43 array_needsize (struct kevent, kqueue_changes, kqueue_changemax, kqueue_changecnt, EMPTY2);
44 44
45 ke = &kqueue_changes [kqueue_changecnt - 1]; 45 EV_SET (&kqueue_changes [kqueue_changecnt - 1], fd, filter, flags, fflags, 0, 0);
46 memset (ke, 0, sizeof (struct kevent));
47 ke->ident = fd;
48 ke->filter = filter;
49 ke->flags = flags;
50 ke->fflags = fflags;
51} 46}
52 47
53#ifndef NOTE_EOF 48#ifndef NOTE_EOF
54# define NOTE_EOF 0 49# define NOTE_EOF 0
55#endif 50#endif
56 51
57static void 52static void
58kqueue_modify (EV_P_ int fd, int oev, int nev) 53kqueue_modify (EV_P_ int fd, int oev, int nev)
59{ 54{
55 if (oev != nev)
56 {
57 if (oev & EV_READ)
58 kqueue_change (EV_A_ fd, EVFILT_READ , EV_DELETE, 0);
59
60 if (oev & EV_WRITE)
61 kqueue_change (EV_A_ fd, EVFILT_WRITE, EV_DELETE, 0);
62 }
63
60 /* to detect close/reopen reliably, we have to remove and re-add */ 64 /* to detect close/reopen reliably, we have to re-add */
61 /* event requests even when oev == nev */ 65 /* event requests even when oev == nev */
62 66
63 if (oev & EV_READ)
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
69 if (nev & EV_READ) 67 if (nev & EV_READ)
70 kqueue_change (EV_A_ fd, EVFILT_READ, EV_ADD, NOTE_EOF); 68 kqueue_change (EV_A_ fd, EVFILT_READ , EV_ADD, NOTE_EOF);
71 69
72 if (nev & EV_WRITE) 70 if (nev & EV_WRITE)
73 kqueue_change (EV_A_ fd, EVFILT_WRITE, EV_ADD, NOTE_EOF); 71 kqueue_change (EV_A_ fd, EVFILT_WRITE, EV_ADD, NOTE_EOF);
74} 72}
75 73
… …
180 /* detected broken kqueue */ 178 /* detected broken kqueue */
181 close (kqueue_fd); 179 close (kqueue_fd);
182 return 0; 180 return 0;
183 } 181 }
184 182
185 method_fudge = 1e-3; /* needed to compensate for kevent returning early */ 183 backend_fudge = 1e-3; /* needed to compensate for kevent returning early */
186 method_modify = kqueue_modify; 184 backend_modify = kqueue_modify;
187 method_poll = kqueue_poll; 185 backend_poll = kqueue_poll;
188 186
189 kqueue_eventmax = 64; /* intiial number of events receivable per poll */ 187 kqueue_eventmax = 64; /* intiial number of events receivable per poll */
190 kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax); 188 kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax);
191 189
192 kqueue_changes = 0; 190 kqueue_changes = 0;
193 kqueue_changemax = 0; 191 kqueue_changemax = 0;
194 kqueue_changecnt = 0; 192 kqueue_changecnt = 0;
195 193
196 return EVMETHOD_KQUEUE; 194 return EVBACKEND_KQUEUE;
197} 195}
198 196
199static void 197static void
200kqueue_destroy (EV_P) 198kqueue_destroy (EV_P)
201{ 199{

Diff Legend

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