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.18 by root, Thu Nov 22 15:40:56 2007 UTC vs.
Revision 1.24 by root, Fri Nov 23 13:08:57 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
… …
87 kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax); 85 kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax);
88 } 86 }
89 87
90 ts.tv_sec = (time_t)timeout; 88 ts.tv_sec = (time_t)timeout;
91 ts.tv_nsec = (long)((timeout - (ev_tstamp)ts.tv_sec) * 1e9); 89 ts.tv_nsec = (long)((timeout - (ev_tstamp)ts.tv_sec) * 1e9);
92 fprintf (stderr, "to %ld:%09ld %f\n", ts.tv_sec, ts.tv_nsec, res);//D
93 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);
94 kqueue_changecnt = 0; 91 kqueue_changecnt = 0;
95 92
96 if (res < 0) 93 if (res < 0)
97 { 94 {
… …
103 100
104 for (i = 0; i < res; ++i) 101 for (i = 0; i < res; ++i)
105 { 102 {
106 int fd = kqueue_events [i].ident; 103 int fd = kqueue_events [i].ident;
107 104
108 if (kqueue_events [i].flags & EV_ERROR) 105 if (expect_false (kqueue_events [i].flags & EV_ERROR))
109 { 106 {
110 int err = kqueue_events [i].data; 107 int err = kqueue_events [i].data;
111 108
112 /* 109 /*
113 * errors that may happen 110 * errors that may happen
… …
181 /* detected broken kqueue */ 178 /* detected broken kqueue */
182 close (kqueue_fd); 179 close (kqueue_fd);
183 return 0; 180 return 0;
184 } 181 }
185 182
186 method_fudge = 1e-3; /* needed to compensate for kevent returning early */ 183 backend_fudge = 1e-3; /* needed to compensate for kevent returning early */
187 method_modify = kqueue_modify; 184 backend_modify = kqueue_modify;
188 method_poll = kqueue_poll; 185 backend_poll = kqueue_poll;
189 186
190 kqueue_eventmax = 64; /* intiial number of events receivable per poll */ 187 kqueue_eventmax = 64; /* intiial number of events receivable per poll */
191 kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax); 188 kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax);
192 189
193 kqueue_changes = 0; 190 kqueue_changes = 0;
194 kqueue_changemax = 0; 191 kqueue_changemax = 0;
195 kqueue_changecnt = 0; 192 kqueue_changecnt = 0;
196 193
197 return EVMETHOD_KQUEUE; 194 return EVBACKEND_KQUEUE;
198} 195}
199 196
200static void 197static void
201kqueue_destroy (EV_P) 198kqueue_destroy (EV_P)
202{ 199{

Diff Legend

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