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.11 by root, Tue Nov 6 01:17:16 2007 UTC vs.
Revision 1.18 by root, Thu Nov 22 15:40:56 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);
92 fprintf (stderr, "to %ld:%09ld %f\n", ts.tv_sec, ts.tv_nsec, res);//D
84 res = kevent (kqueue_fd, kqueue_changes, kqueue_changecnt, kqueue_events, kqueue_eventmax, &ts); 93 res = kevent (kqueue_fd, kqueue_changes, kqueue_changecnt, kqueue_events, kqueue_eventmax, &ts);
85 kqueue_changecnt = 0; 94 kqueue_changecnt = 0;
86 95
87 if (res < 0) 96 if (res < 0)
88 { 97 {
… …
92 return; 101 return;
93 } 102 }
94 103
95 for (i = 0; i < res; ++i) 104 for (i = 0; i < res; ++i)
96 { 105 {
106 int fd = kqueue_events [i].ident;
107
97 if (kqueue_events [i].flags & EV_ERROR) 108 if (kqueue_events [i].flags & EV_ERROR)
98 { 109 {
110 int err = kqueue_events [i].data;
111
99 /* 112 /*
100 * Error messages that can happen, when a delete fails. 113 * errors that may happen
101 * EBADF happens when the file discriptor has been 114 * EBADF happens when the file discriptor has been
102 * closed, 115 * closed,
103 * ENOENT when the file discriptor was closed and 116 * ENOENT when the file descriptor was closed and
104 * then reopened. 117 * then reopened.
105 * EINVAL for some reasons not understood; EINVAL 118 * EINVAL for some reasons not understood; EINVAL
106 * should not be returned ever; but FreeBSD does :-\ 119 * 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 */ 120 */
111 if (kqueue_events [i].data == EBADF) 121
112 fd_kill (EV_A_ kqueue_events [i].ident); 122 /* we are only interested in errors for fds that we are interested in :) */
123 if (anfds [fd].events)
124 {
125 if (err == ENOENT) /* resubmit changes on ENOENT */
126 kqueue_modify (EV_A_ fd, 0, anfds [fd].events);
127 else if (err == EBADF) /* on EBADF, we re-check the fd */
128 {
129 if (fd_valid (fd))
130 kqueue_modify (EV_A_ fd, 0, anfds [fd].events);
131 else
132 fd_kill (EV_A_ fd);
133 }
134 else /* on all other errors, we error out on the fd */
135 fd_kill (EV_A_ fd);
136 }
113 } 137 }
114 else 138 else
115 fd_event ( 139 fd_event (
116 EV_A_ 140 EV_A_
117 kqueue_events [i].ident, 141 fd,
118 kqueue_events [i].filter == EVFILT_READ ? EV_READ 142 kqueue_events [i].filter == EVFILT_READ ? EV_READ
119 : kqueue_events [i].filter == EVFILT_WRITE ? EV_WRITE 143 : kqueue_events [i].filter == EVFILT_WRITE ? EV_WRITE
120 : 0 144 : 0
121 ); 145 );
122 } 146 }
123 147
124 if (expect_false (res == kqueue_eventmax)) 148 if (expect_false (res == kqueue_eventmax))
125 { 149 {
126 ev_free (kqueue_events); 150 ev_free (kqueue_events);
127 kqueue_eventmax = array_roundsize (kqueue_events, kqueue_eventmax << 1); 151 kqueue_eventmax = array_roundsize (struct kevent, kqueue_eventmax << 1);
128 kqueue_events = ev_malloc (sizeof (struct kevent) * kqueue_eventmax); 152 kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax);
129 } 153 }
130} 154}
131 155
132static int 156static int
133kqueue_init (EV_P_ int flags) 157kqueue_init (EV_P_ int flags)
… …
162 method_fudge = 1e-3; /* needed to compensate for kevent returning early */ 186 method_fudge = 1e-3; /* needed to compensate for kevent returning early */
163 method_modify = kqueue_modify; 187 method_modify = kqueue_modify;
164 method_poll = kqueue_poll; 188 method_poll = kqueue_poll;
165 189
166 kqueue_eventmax = 64; /* intiial number of events receivable per poll */ 190 kqueue_eventmax = 64; /* intiial number of events receivable per poll */
167 kqueue_events = ev_malloc (sizeof (struct kevent) * kqueue_eventmax); 191 kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax);
168 192
169 kqueue_changes = 0; 193 kqueue_changes = 0;
170 kqueue_changemax = 0; 194 kqueue_changemax = 0;
171 kqueue_changecnt = 0; 195 kqueue_changecnt = 0;
172 196

Diff Legend

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