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.14 by root, Tue Nov 6 18:49:32 2007 UTC vs.
Revision 1.17 by root, Mon Nov 12 20:03:39 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;
… …
81 /* need to resize so there is enough space for errors */ 82 /* need to resize so there is enough space for errors */
82 if (kqueue_changecnt > kqueue_eventmax) 83 if (kqueue_changecnt > kqueue_eventmax)
83 { 84 {
84 ev_free (kqueue_events); 85 ev_free (kqueue_events);
85 kqueue_eventmax = array_roundsize (struct kevent, kqueue_changecnt); 86 kqueue_eventmax = array_roundsize (struct kevent, kqueue_changecnt);
86 kqueue_events = ev_malloc (sizeof (struct kevent) * kqueue_eventmax); 87 kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax);
87 } 88 }
88 89
89 ts.tv_sec = (time_t)timeout; 90 ts.tv_sec = (time_t)timeout;
90 ts.tv_nsec = (long)(timeout - (ev_tstamp)ts.tv_sec) * 1e9; 91 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); 92 res = kevent (kqueue_fd, kqueue_changes, kqueue_changecnt, kqueue_events, kqueue_eventmax, &ts);
… …
145 146
146 if (expect_false (res == kqueue_eventmax)) 147 if (expect_false (res == kqueue_eventmax))
147 { 148 {
148 ev_free (kqueue_events); 149 ev_free (kqueue_events);
149 kqueue_eventmax = array_roundsize (struct kevent, kqueue_eventmax << 1); 150 kqueue_eventmax = array_roundsize (struct kevent, kqueue_eventmax << 1);
150 kqueue_events = ev_malloc (sizeof (struct kevent) * kqueue_eventmax); 151 kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax);
151 } 152 }
152} 153}
153 154
154static int 155static int
155kqueue_init (EV_P_ int flags) 156kqueue_init (EV_P_ int flags)
… …
184 method_fudge = 1e-3; /* needed to compensate for kevent returning early */ 185 method_fudge = 1e-3; /* needed to compensate for kevent returning early */
185 method_modify = kqueue_modify; 186 method_modify = kqueue_modify;
186 method_poll = kqueue_poll; 187 method_poll = kqueue_poll;
187 188
188 kqueue_eventmax = 64; /* intiial number of events receivable per poll */ 189 kqueue_eventmax = 64; /* intiial number of events receivable per poll */
189 kqueue_events = ev_malloc (sizeof (struct kevent) * kqueue_eventmax); 190 kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax);
190 191
191 kqueue_changes = 0; 192 kqueue_changes = 0;
192 kqueue_changemax = 0; 193 kqueue_changemax = 0;
193 kqueue_changecnt = 0; 194 kqueue_changecnt = 0;
194 195

Diff Legend

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