ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libev/event.c
(Generate patch)

Comparing libev/event.c (file contents):
Revision 1.6 by root, Sat Nov 3 20:24:42 2007 UTC vs.
Revision 1.29 by root, Mon Nov 12 08:00:28 2007 UTC

… …
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#include <stddef.h> 32#include <stddef.h>
33#include <stdlib.h> 33#include <stdlib.h>
34#include <assert.h>
35
36#ifndef WIN32
34#include <sys/time.h> 37# include <sys/time.h>
38#endif
35 39
40#ifdef EV_EVENT_H
41# include EV_EVENT_H
42#else
36#include "event.h" 43# include "event.h"
44#endif
37 45
46#if EV_MULTIPLICITY
47# define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base
48# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base
49#else
50# define dLOOPev
51# define dLOOPbase
52#endif
53
54/* never accessed, will always be cast from/to ev_loop */
38struct event_base 55struct event_base
39{ 56{
40 int dummy; 57 int dummy;
41}; 58};
42 59
43static int x_actives;
44
45static struct event_base x_base, *x_cur; 60static struct event_base *x_cur;
46 61
47static void 62static void
48tv_set (struct timeval *tv, ev_tstamp at) 63tv_set (struct timeval *tv, ev_tstamp at)
49{ 64{
50 tv->tv_sec = (long)at; 65 tv->tv_sec = (long)at;
… …
72 return "libev"; 87 return "libev";
73} 88}
74 89
75void *event_init (void) 90void *event_init (void)
76{ 91{
77 if (!x_cur && ev_init (0)) 92#if EV_MULTIPLICITY
78 return x_cur = &x_base; 93 if (x_cur)
94 x_cur = (struct event_base *)ev_loop_new (EVFLAG_AUTO);
95 else
96 x_cur = (struct event_base *)ev_default_loop (EVFLAG_AUTO);
97#else
98 assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur));
79 99
100 x_cur = (struct event_base *)(long)ev_default_loop (EVFLAG_AUTO);
101#endif
102
80 return 0; 103 return x_cur;
81} 104}
82 105
83void event_base_free (struct event_base *base) 106void event_base_free (struct event_base *base)
84{ 107{
85 /* nop */ 108 dLOOPbase;
109
110#if EV_MULTIPLICITY
111 if (ev_default_loop (EVFLAG_AUTO) != loop)
112 ev_loop_destroy (loop);
113#endif
86} 114}
87 115
88int event_dispatch (void) 116int event_dispatch (void)
89{ 117{
90 return event_base_dispatch (x_cur); 118 return event_base_dispatch (x_cur);
… …
108} 136}
109 137
110static void 138static void
111x_cb (struct event *ev, int revents) 139x_cb (struct event *ev, int revents)
112{ 140{
141 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL;
142
143 ev->ev_res = revents;
144 ev->ev_callback (ev->ev_fd, (short)revents, ev->ev_arg);
145}
146
147static void
148x_cb_sig (EV_P_ struct ev_signal *w, int revents)
149{
150 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.sig));
151
152 if (revents & EV_ERROR)
153 event_del (ev);
154
155 x_cb (ev, revents);
156}
157
158static void
159x_cb_io (EV_P_ struct ev_io *w, int revents)
160{
161 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io));
162
163 if (revents & EV_ERROR)
164 event_del (ev);
165 else if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w))
166 {
167 ev_io_stop (EV_A_ w);
168 ev->ev_flags &= ~EVLIST_INSERTED;
169 }
170
171 x_cb (ev, revents);
172}
173
174static void
175x_cb_to (EV_P_ struct ev_timer *w, int revents)
176{
177 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, to));
178
179 event_del (ev);
180
181 x_cb (ev, revents);
182}
183
184void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg)
185{
113 if (ev->ev_events & EV_SIGNAL) 186 if (events & EV_SIGNAL)
114 { 187 ev_init (&ev->iosig.sig, x_cb_sig);
115 /* sig */
116 if (ev_is_active (&ev->iosig.sig))
117 {
118 ev_signal_stop (&ev->iosig.sig);
119 --x_actives;
120 }
121 }
122 else 188 else
123 {
124 /* io */
125 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (&ev->iosig.io))
126 {
127 ev_io_stop (&ev->iosig.io);
128 --x_actives;
129 }
130 }
131
132 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL;
133
134 if (revents & EV_TIMEOUT)
135 --x_actives;
136
137 ev->ev_res = revents;
138 ev->ev_callback (ev->ev_fd, revents, ev->ev_arg);
139}
140
141static void
142x_cb_io (struct ev_io *w, int revents)
143{
144 x_cb ((struct event *)(((char *)w) - offsetof (struct event, iosig.io)), revents);
145}
146
147static void
148x_cb_to (struct ev_timer *w, int revents)
149{
150 x_cb ((struct event *)(((char *)w) - offsetof (struct event, to)), revents);
151}
152
153static void
154x_cb_sig (struct ev_signal *w, int revents)
155{
156 x_cb ((struct event *)(((char *)w) - offsetof (struct event, iosig.sig)), revents);
157}
158
159void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg)
160{
161 if (events & EV_SIGNAL)
162 ev_watcher_init (&ev->iosig.sig, x_cb_sig);
163 else
164 ev_watcher_init (&ev->iosig.io, x_cb_io); 189 ev_init (&ev->iosig.io, x_cb_io);
165 190
166 ev_watcher_init (&ev->to, x_cb_to); 191 ev_init (&ev->to, x_cb_to);
167 192
168 ev->ev_base = x_cur; 193 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */
169 ev->ev_fd = fd; 194 ev->ev_fd = fd;
170 ev->ev_events = events; 195 ev->ev_events = events;
171 ev->ev_pri = 0; 196 ev->ev_pri = 0;
172 ev->ev_callback = cb; 197 ev->ev_callback = cb;
173 ev->ev_arg = arg; 198 ev->ev_arg = arg;
174 ev->ev_res = 0; 199 ev->ev_res = 0;
200 ev->ev_flags = EVLIST_INIT;
175} 201}
176 202
177int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 203int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
178{ 204{
179 return event_base_once (x_cur, fd, events, cb, arg, tv); 205 return event_base_once (x_cur, fd, events, cb, arg, tv);
180} 206}
181 207
182int event_add (struct event *ev, struct timeval *tv) 208int event_add (struct event *ev, struct timeval *tv)
183{ 209{
210 dLOOPev;
211
184 /* disable all watchers */ 212 /* disable all watchers */
185 event_del (ev); 213 event_del (ev);
186 214
187 if (ev->ev_events & EV_SIGNAL) 215 if (ev->ev_events & EV_SIGNAL)
188 { 216 {
189 ev_signal_set (&ev->iosig.sig, ev->ev_fd); 217 ev_signal_set (&ev->iosig.sig, ev->ev_fd);
190 ev_signal_start (&ev->iosig.sig); 218 ev_signal_start (EV_A_ &ev->iosig.sig);
191 ++x_actives; 219
220 ev->ev_flags |= EVLIST_SIGNAL;
192 } 221 }
193 else if (ev->ev_events & (EV_READ | EV_WRITE)) 222 else if (ev->ev_events & (EV_READ | EV_WRITE))
194 { 223 {
195 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE)); 224 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE));
196 ev_io_start (&ev->iosig.io); 225 ev_io_start (EV_A_ &ev->iosig.io);
197 ++x_actives; 226
227 ev->ev_flags |= EVLIST_INSERTED;
198 } 228 }
199 229
200 if (tv) 230 if (tv)
201 { 231 {
202 ev_timer_set (&ev->to, tv_get (tv), 0.); 232 ev_timer_set (&ev->to, tv_get (tv), 0.);
203 ev_timer_start (&ev->to); 233 ev_timer_start (EV_A_ &ev->to);
204 ++x_actives; 234
235 ev->ev_flags |= EVLIST_TIMEOUT;
205 } 236 }
237
238 ev->ev_flags |= EVLIST_ACTIVE;
206 239
207 return 0; 240 return 0;
208} 241}
209 242
210int event_del (struct event *ev) 243int event_del (struct event *ev)
211{ 244{
245 dLOOPev;
246
212 if (ev->ev_events & EV_SIGNAL) 247 if (ev->ev_events & EV_SIGNAL)
213 { 248 {
214 /* sig */ 249 /* sig */
215 if (ev_is_active (&ev->iosig.sig)) 250 if (ev_is_active (&ev->iosig.sig))
216 {
217 ev_signal_stop (&ev->iosig.sig); 251 ev_signal_stop (EV_A_ &ev->iosig.sig);
218 --x_actives;
219 }
220 } 252 }
221 else 253 else if (ev->ev_events & (EV_READ | EV_WRITE))
222 { 254 {
223 /* io */ 255 /* io */
224 if (ev_is_active (&ev->iosig.io)) 256 if (ev_is_active (&ev->iosig.io))
225 {
226 ev_io_stop (&ev->iosig.io); 257 ev_io_stop (EV_A_ &ev->iosig.io);
227 --x_actives;
228 }
229 } 258 }
230 259
231 if (ev_is_active (&ev->to)) 260 if (ev_is_active (&ev->to))
232 {
233 ev_timer_stop (&ev->to); 261 ev_timer_stop (EV_A_ &ev->to);
234 --x_actives;
235 }
236 262
263 ev->ev_flags = EVLIST_INIT;
264
237 return 0; 265 return 0;
266}
267
268void event_active (struct event *ev, int res, short ncalls)
269{
270 dLOOPev;
271
272 if (res & EV_TIMEOUT)
273 ev_feed_event (EV_A_ &ev->to, res & EV_TIMEOUT);
274
275 if (res & EV_SIGNAL)
276 ev_feed_event (EV_A_ &ev->iosig.sig, res & EV_SIGNAL);
277
278 if (res & (EV_READ | EV_WRITE))
279 ev_feed_event (EV_A_ &ev->iosig.io, res & (EV_READ | EV_WRITE));
238} 280}
239 281
240int event_pending (struct event *ev, short events, struct timeval *tv) 282int event_pending (struct event *ev, short events, struct timeval *tv)
241{ 283{
242 short revents = 0; 284 short revents = 0;
285 dLOOPev;
286
243 287
244 if (ev->ev_events & EV_SIGNAL) 288 if (ev->ev_events & EV_SIGNAL)
245 { 289 {
246 /* sig */ 290 /* sig */
247 if (ev->iosig.sig.pending) 291 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
248 revents |= EV_SIGNAL; 292 revents |= EV_SIGNAL;
249 } 293 }
250 else 294 else if (ev->ev_events & (EV_READ | EV_WRITE))
251 { 295 {
252 /* io */ 296 /* io */
253 if (ev->iosig.io.pending) 297 if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))
254 revents |= ev->ev_events & (EV_READ | EV_WRITE); 298 revents |= ev->ev_events & (EV_READ | EV_WRITE);
255 } 299 }
256 300
257 if (ev->to.pending) 301 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to))
258 { 302 {
259 revents |= EV_TIMEOUT; 303 revents |= EV_TIMEOUT;
260 304
261 if (tv) 305 if (tv)
262 tv_set (tv, ev_now); /* not sure if this is right :) */ 306 tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */
263 } 307 }
264 308
265 return events & revents; 309 return events & revents;
266} 310}
267 311
… …
284 return 0; 328 return 0;
285} 329}
286 330
287int event_base_loop (struct event_base *base, int flags) 331int event_base_loop (struct event_base *base, int flags)
288{ 332{
289 do 333 dLOOPbase;
290 { 334
291 ev_loop (flags | EVLOOP_ONESHOT); 335 ev_loop (EV_A_ flags);
292 }
293 while (!(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) && x_actives && !ev_loop_done);
294 336
295 return 0; 337 return 0;
296} 338}
297 339
298int event_base_dispatch (struct event_base *base) 340int event_base_dispatch (struct event_base *base)
299{ 341{
300 return event_base_loop (base, 0); 342 return event_base_loop (base, 0);
301} 343}
302 344
303static void 345static void
304x_loopexit_cb (int revents, void *arg) 346x_loopexit_cb (int revents, void *base)
305{ 347{
306 ev_loop_done = 2; 348 dLOOPbase;
349
350 ev_unloop (EV_A_ EVUNLOOP_ONCE);
307} 351}
308 352
309int event_base_loopexit (struct event_base *base, struct timeval *tv) 353int event_base_loopexit (struct event_base *base, struct timeval *tv)
310{ 354{
311 ev_tstamp after = tv_get (tv); 355 ev_tstamp after = tv_get (tv);
356 dLOOPbase;
312 357
313 ev_once (-1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base); 358 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base);
314 359
315 return -1; 360 return -1;
316} 361}
317 362
318struct x_once 363struct x_once
… …
323}; 368};
324 369
325static void 370static void
326x_once_cb (int revents, void *arg) 371x_once_cb (int revents, void *arg)
327{ 372{
328 struct x_once *once = arg; 373 struct x_once *once = (struct x_once *)arg;
329 374
330 once->cb (once->fd, revents, once->arg); 375 once->cb (once->fd, (short)revents, once->arg);
331 free (once); 376 free (once);
332} 377}
333 378
334int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 379int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
335{ 380{
336 struct x_once *once = malloc (sizeof (struct x_once)); 381 struct x_once *once = (struct x_once *)malloc (sizeof (struct x_once));
382 dLOOPbase;
337 383
338 if (!once) 384 if (!once)
339 return -1; 385 return -1;
340 386
341 once->fd = fd; 387 once->fd = fd;
342 once->cb = cb; 388 once->cb = cb;
343 once->arg = arg; 389 once->arg = arg;
344 390
345 ev_once (fd, events & (EV_READ | EV_WRITE), tv_get (tv), x_once_cb, (void *)once); 391 ev_once (EV_A_ fd, events & (EV_READ | EV_WRITE), tv_get (tv), x_once_cb, (void *)once);
346 392
347 return 0; 393 return 0;
348} 394}
349 395
350int event_base_priority_init (struct event_base *base, int npri) 396int event_base_priority_init (struct event_base *base, int npri)
351{ 397{
352 return 0; 398 /*dLOOPbase;*/
353}
354 399
400 return 0;
401}
402

Diff Legend

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