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.3 by root, Fri Nov 2 22:54:19 2007 UTC vs.
Revision 1.10 by root, Tue Nov 6 00:52:33 2007 UTC

1
2/* 1/*
3 * Copyright 2007 Marc Alexander Lehmann <libev@schmorp.de> 2 * Copyright 2007 Marc Alexander Lehmann <libev@schmorp.de>
4 * Copyright 2000-2002 Niels Provos <provos@citi.umich.edu> 3 * Copyright 2000-2002 Niels Provos <provos@citi.umich.edu>
5 * All rights reserved. 4 * All rights reserved.
6 * 5 *
… …
33#include <sys/queue.h> 32#include <sys/queue.h>
34#include <sys/event.h> 33#include <sys/event.h>
35#include <string.h> 34#include <string.h>
36#include <errno.h> 35#include <errno.h>
37 36
38static int kq_fd;
39static struct kevent *kq_changes;
40static int kq_changemax, kq_changecnt;
41static struct kevent *kq_events;
42static int kq_eventmax;
43
44static void 37static void
45kqueue_change (int fd, int filter, int flags, int fflags) 38kqueue_change (EV_P_ int fd, int filter, int flags, int fflags)
46{ 39{
47 struct kevent *ke; 40 struct kevent *ke;
48 41
49 array_needsize (kq_changes, kq_changemax, ++kq_changecnt, ); 42 array_needsize (kqueue_changes, kqueue_changemax, ++kqueue_changecnt, );
50 43
51 ke = &kq_changes [kq_changecnt - 1]; 44 ke = &kqueue_changes [kqueue_changecnt - 1];
52 memset (ke, 0, sizeof (struct kevent)); 45 memset (ke, 0, sizeof (struct kevent));
53 ke->ident = fd; 46 ke->ident = fd;
54 ke->filter = filter; 47 ke->filter = filter;
55 ke->flags = flags; 48 ke->flags = flags;
56 ke->fflags = fflags; 49 ke->fflags = fflags;
57} 50}
58 51
52#ifndef NOTE_EOF
53# define NOTE_EOF 0
54#endif
55
59static void 56static void
60kqueue_modify (int fd, int oev, int nev) 57kqueue_modify (EV_P_ int fd, int oev, int nev)
61{ 58{
62 if ((oev ^ new) & EV_READ) 59 if ((oev ^ nev) & EV_READ)
63 { 60 {
64 if (nev & EV_READ) 61 if (nev & EV_READ)
65 kqueue_change (fd, EVFILT_READ, EV_ADD, NOTE_EOF); 62 kqueue_change (fd, EVFILT_READ, EV_ADD, NOTE_EOF);
66 else 63 else
67 kqueue_change (fd, EVFILT_READ, EV_DELETE, 0); 64 kqueue_change (fd, EVFILT_READ, EV_DELETE, 0);
68 } 65 }
69 66
70 if ((oev ^ new) & EV_WRITE) 67 if ((oev ^ nev) & EV_WRITE)
71 { 68 {
72 if (nev & EV_WRITE) 69 if (nev & EV_WRITE)
73 kqueue_change (fd, EVFILT_WRITE, EV_ADD, NOTE_EOF); 70 kqueue_change (fd, EVFILT_WRITE, EV_ADD, NOTE_EOF);
74 else 71 else
75 kqueue_change (fd, EVFILT_WRITE, EV_DELETE, 0); 72 kqueue_change (fd, EVFILT_WRITE, EV_DELETE, 0);
76 } 73 }
77} 74}
78 75
79static void 76static void
80kqueue_poll (ev_tstamp timeout) 77kqueue_poll (EV_P_ ev_tstamp timeout)
81{ 78{
82 int res, i; 79 int res, i;
83 struct timespec ts; 80 struct timespec ts;
84 81
85 ts.tv_sec = (time_t)timeout; 82 ts.tv_sec = (time_t)timeout;
86 ts.tv_nsec = (long)(timeout - (ev_tstamp)ts.tv_sec) * 1e9; 83 ts.tv_nsec = (long)(timeout - (ev_tstamp)ts.tv_sec) * 1e9;
87 res = kevent (kq_fd, kq_changes, kq_changecnt, kq_events, kq_eventmax, &ts); 84 res = kevent (kqueue_fd, kqueue_changes, kqueue_changecnt, kqueue_events, kqueue_eventmax, &ts);
88 kq_changecnt = 0; 85 kqueue_changecnt = 0;
89 86
90 if (res < 0) 87 if (res < 0)
88 {
89 if (errno != EINTR)
90 syserr ("(libev) kevent");
91
91 return; 92 return;
93 }
92 94
93 for (i = 0; i < res; ++i) 95 for (i = 0; i < res; ++i)
94 { 96 {
95 if (kq_events [i].flags & EV_ERROR) 97 if (kqueue_events [i].flags & EV_ERROR)
96 { 98 {
97 /* 99 /*
98 * Error messages that can happen, when a delete fails. 100 * Error messages that can happen, when a delete fails.
99 * EBADF happens when the file discriptor has been 101 * EBADF happens when the file discriptor has been
100 * closed, 102 * closed,
… …
104 * should not be returned ever; but FreeBSD does :-\ 106 * should not be returned ever; but FreeBSD does :-\
105 * An error is also indicated when a callback deletes 107 * An error is also indicated when a callback deletes
106 * an event we are still processing. In that case 108 * an event we are still processing. In that case
107 * the data field is set to ENOENT. 109 * the data field is set to ENOENT.
108 */ 110 */
109 if (events [i].data == EBADF) 111 if (kqueue_events [i].data == EBADF)
110 fd_kill (events [i].ident); 112 fd_kill (EV_A_ kqueue_events [i].ident);
111 } 113 }
112 else 114 else
113 fd_event ( 115 fd_event (
116 EV_A_
114 events [i].ident, 117 kqueue_events [i].ident,
115 events [i].filter == EVFILT_READ ? EV_READ 118 kqueue_events [i].filter == EVFILT_READ ? EV_READ
116 : events [i].filter == EVFILT_WRITE ? EV_WRITE 119 : kqueue_events [i].filter == EVFILT_WRITE ? EV_WRITE
117 : 0 120 : 0
118 ); 121 );
119 } 122 }
120 123
121 if (expect_false (res == kq_eventmax)) 124 if (expect_false (res == kqueue_eventmax))
122 { 125 {
123 free (kq_events); 126 ev_free (kqueue_events);
124 kq_eventmax = array_roundsize (kq_events, kq_eventmax << 1); 127 kqueue_eventmax = array_roundsize (kqueue_events, kqueue_eventmax << 1);
125 kq_events = malloc (sizeof (struct kevent) * kq_eventmax); 128 kqueue_events = ev_malloc (sizeof (struct kevent) * kqueue_eventmax);
126 } 129 }
127} 130}
128 131
129static void 132static int
130kqueue_init (struct event_base *base) 133kqueue_init (EV_P_ int flags)
131{ 134{
132 struct kevent ch, ev; 135 struct kevent ch, ev;
133 136
134 /* Initalize the kernel queue */ 137 /* Initalize the kernel queue */
135 if ((kq_fd = kqueue ()) < 0) 138 if ((kqueue_fd = kqueue ()) < 0)
136 return; 139 return 0;
140
141 fcntl (kqueue_fd, F_SETFD, FD_CLOEXEC); /* not sure if necessary, hopefully doesn't hurt */
137 142
138 /* Check for Mac OS X kqueue bug. */ 143 /* Check for Mac OS X kqueue bug. */
139 ch.ident = -1; 144 ch.ident = -1;
140 ch.filter = EVFILT_READ; 145 ch.filter = EVFILT_READ;
141 ch.flags = EV_ADD; 146 ch.flags = EV_ADD;
142 147
143 /* 148 /*
144 * If kqueue works, then kevent will succeed, and it will 149 * If kqueue works, then kevent will succeed, and it will
145 * stick an error in events[0]. If kqueue is broken, then 150 * stick an error in ev. If kqueue is broken, then
146 * kevent will fail. 151 * kevent will fail.
147 */ 152 */
148 if (kevent (kq_fd, &ch, 1, &ev, 1, 0) != 1 153 if (kevent (kqueue_fd, &ch, 1, &ev, 1, 0) != 1
149 || ev.ident != -1 154 || ev.ident != -1
150 || ev.flags != EV_ERROR) 155 || ev.flags != EV_ERROR)
151 { 156 {
152 /* detected broken kqueue */ 157 /* detected broken kqueue */
153 close (kq_fd); 158 close (kqueue_fd);
154 return; 159 return 0;
155 } 160 }
156 161
157 ev_method = EVMETHOD_KQUEUE;
158 method_fudge = 1e-3; /* needed to compensate for kevent returning early */ 162 method_fudge = 1e-3; /* needed to compensate for kevent returning early */
159 method_modify = kq_modify; 163 method_modify = kqueue_modify;
160 method_poll = kq_poll; 164 method_poll = kqueue_poll;
161 165
162 kq_eventmax = 64; /* intiial number of events receivable per poll */ 166 kqueue_eventmax = 64; /* intiial number of events receivable per poll */
163 kq_events = malloc (sizeof (struct kevent) * kq_eventmax); 167 kqueue_events = ev_malloc (sizeof (struct kevent) * kqueue_eventmax);
164}
165 168
169 kqueue_changes = 0;
170 kqueue_changemax = 0;
171 kqueue_changecnt = 0;
172
173 return EVMETHOD_KQUEUE;
174}
175
176static void
177kqueue_destroy (EV_P)
178{
179 close (kqueue_fd);
180
181 ev_free (kqueue_events);
182 ev_free (kqueue_changes);
183}
184
185static void
186kqueue_fork (EV_P)
187{
188 for (;;)
189 {
190 kqueue_fd = kqueue ();
191
192 if (kqueue_fd >= 0)
193 break;
194
195 syserr ("(libev) kqueue");
196 }
197
198 fcntl (kqueue_fd, F_SETFD, FD_CLOEXEC);
199
200 /* re-register interest in fds */
201 fd_rearm_all (EV_A);
202}
203

Diff Legend

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