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.15 by root, Sun Nov 11 16:59:35 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 (struct kevent, 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 if (oev != nev)
61 {
62 if (oev & EV_READ)
63 kqueue_change (EV_A_ fd, EVFILT_READ , EV_DELETE, 0);
64
65 if (oev & EV_WRITE)
66 kqueue_change (EV_A_ fd, EVFILT_WRITE, EV_DELETE, 0);
67 }
68
59 /* to detect close/reopen reliably, we have to remove and re-add */ 69 /* to detect close/reopen reliably, we have to re-add */
60 /* event requests even when oev == nev */ 70 /* event requests even when oev == nev */
61 71
62 if (oev & EV_READ)
63 kqueue_change (EV_A_ fd, EVFILT_READ, EV_DELETE, 0);
64
65 if (oev & EV_WRITE)
66 kqueue_change (EV_A_ fd, EVFILT_WRITE, EV_DELETE, 0);
67
68 if (nev & EV_READ) 72 if (nev & EV_READ)
69 kqueue_change (EV_A_ fd, EVFILT_READ, EV_ADD, NOTE_EOF); 73 kqueue_change (EV_A_ fd, EVFILT_READ , EV_ADD, NOTE_EOF);
70 74
71 if (nev & EV_WRITE) 75 if (nev & EV_WRITE)
72 kqueue_change (EV_A_ fd, EVFILT_WRITE, EV_ADD, NOTE_EOF); 76 kqueue_change (EV_A_ fd, EVFILT_WRITE, EV_ADD, NOTE_EOF);
73} 77}
74 78
… …
85 kqueue_eventmax = array_roundsize (struct kevent, kqueue_changecnt); 89 kqueue_eventmax = array_roundsize (struct kevent, kqueue_changecnt);
86 kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax); 90 kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax);
87 } 91 }
88 92
89 ts.tv_sec = (time_t)timeout; 93 ts.tv_sec = (time_t)timeout;
90 ts.tv_nsec = (long)(timeout - (ev_tstamp)ts.tv_sec) * 1e9; 94 ts.tv_nsec = (long)((timeout - (ev_tstamp)ts.tv_sec) * 1e9);
91 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);
92 kqueue_changecnt = 0; 96 kqueue_changecnt = 0;
93 97
94 if (res < 0) 98 if (res < 0)
95 { 99 {
… …
179 /* detected broken kqueue */ 183 /* detected broken kqueue */
180 close (kqueue_fd); 184 close (kqueue_fd);
181 return 0; 185 return 0;
182 } 186 }
183 187
184 method_fudge = 1e-3; /* needed to compensate for kevent returning early */ 188 backend_fudge = 1e-3; /* needed to compensate for kevent returning early */
185 method_modify = kqueue_modify; 189 backend_modify = kqueue_modify;
186 method_poll = kqueue_poll; 190 backend_poll = kqueue_poll;
187 191
188 kqueue_eventmax = 64; /* intiial number of events receivable per poll */ 192 kqueue_eventmax = 64; /* intiial number of events receivable per poll */
189 kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax); 193 kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax);
190 194
191 kqueue_changes = 0; 195 kqueue_changes = 0;
192 kqueue_changemax = 0; 196 kqueue_changemax = 0;
193 kqueue_changecnt = 0; 197 kqueue_changecnt = 0;
194 198
195 return EVMETHOD_KQUEUE; 199 return EVBACKEND_KQUEUE;
196} 200}
197 201
198static void 202static void
199kqueue_destroy (EV_P) 203kqueue_destroy (EV_P)
200{ 204{

Diff Legend

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