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

Comparing libev/ev.c (file contents):
Revision 1.20 by root, Wed Oct 31 18:28:00 2007 UTC vs.
Revision 1.44 by root, Fri Nov 2 20:59:14 2007 UTC

1/* 1/*
2 * libev event processing core, watcher management
3 *
2 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
3 * All rights reserved. 5 * All rights reserved.
4 * 6 *
5 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 8 * modification, are permitted provided that the following conditions are
… …
24 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
25 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
27 * 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.
28 */ 30 */
31#if EV_USE_CONFIG_H
32# include "config.h"
33#endif
29 34
30#include <math.h> 35#include <math.h>
31#include <stdlib.h> 36#include <stdlib.h>
32#include <unistd.h> 37#include <unistd.h>
33#include <fcntl.h> 38#include <fcntl.h>
… …
36 41
37#include <stdio.h> 42#include <stdio.h>
38 43
39#include <assert.h> 44#include <assert.h>
40#include <errno.h> 45#include <errno.h>
46#include <sys/types.h>
47#include <sys/wait.h>
41#include <sys/time.h> 48#include <sys/time.h>
42#include <time.h> 49#include <time.h>
43 50
51/**/
52
44#ifndef HAVE_MONOTONIC 53#ifndef EV_USE_MONOTONIC
54# define EV_USE_MONOTONIC 1
55#endif
56
57#ifndef EV_USE_SELECT
58# define EV_USE_SELECT 1
59#endif
60
61#ifndef EV_USE_POLL
62# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */
63#endif
64
65#ifndef EV_USE_EPOLL
66# define EV_USE_EPOLL 0
67#endif
68
69#ifndef EV_USE_KQUEUE
70# define EV_USE_KQUEUE 0
71#endif
72
73#ifndef EV_USE_REALTIME
74# define EV_USE_REALTIME 1
75#endif
76
77/**/
78
45# ifdef CLOCK_MONOTONIC 79#ifndef CLOCK_MONOTONIC
80# undef EV_USE_MONOTONIC
46# define HAVE_MONOTONIC 1 81# define EV_USE_MONOTONIC 0
47# endif 82#endif
48#endif
49 83
50#ifndef HAVE_SELECT
51# define HAVE_SELECT 1
52#endif
53
54#ifndef HAVE_EPOLL
55# define HAVE_EPOLL 0
56#endif
57
58#ifndef HAVE_REALTIME 84#ifndef CLOCK_REALTIME
59# define HAVE_REALTIME 1 /* posix requirement, but might be slower */ 85# undef EV_USE_REALTIME
86# define EV_USE_REALTIME 0
60#endif 87#endif
88
89/**/
61 90
62#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 91#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
63#define MAX_BLOCKTIME 60. 92#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */
93#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
94/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */
64 95
65#include "ev.h" 96#include "ev.h"
97
98#if __GNUC__ >= 3
99# define expect(expr,value) __builtin_expect ((expr),(value))
100# define inline inline
101#else
102# define expect(expr,value) (expr)
103# define inline static
104#endif
105
106#define expect_false(expr) expect ((expr) != 0, 0)
107#define expect_true(expr) expect ((expr) != 0, 1)
108
109#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
110#define ABSPRI(w) ((w)->priority - EV_MINPRI)
66 111
67typedef struct ev_watcher *W; 112typedef struct ev_watcher *W;
68typedef struct ev_watcher_list *WL; 113typedef struct ev_watcher_list *WL;
69typedef struct ev_watcher_time *WT; 114typedef struct ev_watcher_time *WT;
70 115
71static ev_tstamp now, diff; /* monotonic clock */ 116static ev_tstamp now_floor, now, diff; /* monotonic clock */
72ev_tstamp ev_now; 117ev_tstamp ev_now;
73int ev_method; 118int ev_method;
74 119
75static int have_monotonic; /* runtime */ 120static int have_monotonic; /* runtime */
76 121
… …
81/*****************************************************************************/ 126/*****************************************************************************/
82 127
83ev_tstamp 128ev_tstamp
84ev_time (void) 129ev_time (void)
85{ 130{
86#if HAVE_REALTIME 131#if EV_USE_REALTIME
87 struct timespec ts; 132 struct timespec ts;
88 clock_gettime (CLOCK_REALTIME, &ts); 133 clock_gettime (CLOCK_REALTIME, &ts);
89 return ts.tv_sec + ts.tv_nsec * 1e-9; 134 return ts.tv_sec + ts.tv_nsec * 1e-9;
90#else 135#else
91 struct timeval tv; 136 struct timeval tv;
… …
95} 140}
96 141
97static ev_tstamp 142static ev_tstamp
98get_clock (void) 143get_clock (void)
99{ 144{
100#if HAVE_MONOTONIC 145#if EV_USE_MONOTONIC
101 if (have_monotonic) 146 if (expect_true (have_monotonic))
102 { 147 {
103 struct timespec ts; 148 struct timespec ts;
104 clock_gettime (CLOCK_MONOTONIC, &ts); 149 clock_gettime (CLOCK_MONOTONIC, &ts);
105 return ts.tv_sec + ts.tv_nsec * 1e-9; 150 return ts.tv_sec + ts.tv_nsec * 1e-9;
106 } 151 }
107#endif 152#endif
108 153
109 return ev_time (); 154 return ev_time ();
110} 155}
111 156
157#define array_roundsize(base,n) ((n) | 4 & ~3)
158
112#define array_needsize(base,cur,cnt,init) \ 159#define array_needsize(base,cur,cnt,init) \
113 if ((cnt) > cur) \ 160 if (expect_false ((cnt) > cur)) \
114 { \ 161 { \
115 int newcnt = cur ? cur << 1 : 16; \ 162 int newcnt = cur; \
163 do \
164 { \
165 newcnt = array_roundsize (base, newcnt << 1); \
166 } \
167 while ((cnt) > newcnt); \
168 \
116 base = realloc (base, sizeof (*base) * (newcnt)); \ 169 base = realloc (base, sizeof (*base) * (newcnt)); \
117 init (base + cur, newcnt - cur); \ 170 init (base + cur, newcnt - cur); \
118 cur = newcnt; \ 171 cur = newcnt; \
119 } 172 }
120 173
121/*****************************************************************************/ 174/*****************************************************************************/
122 175
123typedef struct 176typedef struct
124{ 177{
125 struct ev_io *head; 178 struct ev_io *head;
126 unsigned char wev, rev; /* want, received event set */ 179 unsigned char events;
180 unsigned char reify;
127} ANFD; 181} ANFD;
128 182
129static ANFD *anfds; 183static ANFD *anfds;
130static int anfdmax; 184static int anfdmax;
131 185
132static int *fdchanges;
133static int fdchangemax, fdchangecnt;
134
135static void 186static void
136anfds_init (ANFD *base, int count) 187anfds_init (ANFD *base, int count)
137{ 188{
138 while (count--) 189 while (count--)
139 { 190 {
140 base->head = 0; 191 base->head = 0;
141 base->wev = base->rev = EV_NONE; 192 base->events = EV_NONE;
193 base->reify = 0;
194
142 ++base; 195 ++base;
143 } 196 }
144} 197}
145 198
146typedef struct 199typedef struct
147{ 200{
148 W w; 201 W w;
149 int events; 202 int events;
150} ANPENDING; 203} ANPENDING;
151 204
152static ANPENDING *pendings; 205static ANPENDING *pendings [NUMPRI];
153static int pendingmax, pendingcnt; 206static int pendingmax [NUMPRI], pendingcnt [NUMPRI];
154 207
155static void 208static void
156event (W w, int events) 209event (W w, int events)
157{ 210{
158 if (w->active) 211 if (w->pending)
159 { 212 {
160 w->pending = ++pendingcnt;
161 array_needsize (pendings, pendingmax, pendingcnt, );
162 pendings [pendingcnt - 1].w = w;
163 pendings [pendingcnt - 1].events = events; 213 pendings [ABSPRI (w)][w->pending - 1].events |= events;
214 return;
164 } 215 }
216
217 w->pending = ++pendingcnt [ABSPRI (w)];
218 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], );
219 pendings [ABSPRI (w)][w->pending - 1].w = w;
220 pendings [ABSPRI (w)][w->pending - 1].events = events;
221}
222
223static void
224queue_events (W *events, int eventcnt, int type)
225{
226 int i;
227
228 for (i = 0; i < eventcnt; ++i)
229 event (events [i], type);
165} 230}
166 231
167static void 232static void
168fd_event (int fd, int events) 233fd_event (int fd, int events)
169{ 234{
… …
177 if (ev) 242 if (ev)
178 event ((W)w, ev); 243 event ((W)w, ev);
179 } 244 }
180} 245}
181 246
247/*****************************************************************************/
248
249static int *fdchanges;
250static int fdchangemax, fdchangecnt;
251
182static void 252static void
183queue_events (W *events, int eventcnt, int type) 253fd_reify (void)
184{ 254{
185 int i; 255 int i;
186 256
187 for (i = 0; i < eventcnt; ++i) 257 for (i = 0; i < fdchangecnt; ++i)
188 event (events [i], type); 258 {
259 int fd = fdchanges [i];
260 ANFD *anfd = anfds + fd;
261 struct ev_io *w;
262
263 int events = 0;
264
265 for (w = anfd->head; w; w = w->next)
266 events |= w->events;
267
268 anfd->reify = 0;
269
270 if (anfd->events != events)
271 {
272 method_modify (fd, anfd->events, events);
273 anfd->events = events;
274 }
275 }
276
277 fdchangecnt = 0;
278}
279
280static void
281fd_change (int fd)
282{
283 if (anfds [fd].reify || fdchangecnt < 0)
284 return;
285
286 anfds [fd].reify = 1;
287
288 ++fdchangecnt;
289 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
290 fdchanges [fdchangecnt - 1] = fd;
291}
292
293static void
294fd_kill (int fd)
295{
296 struct ev_io *w;
297
298 printf ("killing fd %d\n", fd);//D
299 while ((w = anfds [fd].head))
300 {
301 ev_io_stop (w);
302 event ((W)w, EV_ERROR | EV_READ | EV_WRITE);
303 }
189} 304}
190 305
191/* called on EBADF to verify fds */ 306/* called on EBADF to verify fds */
192static void 307static void
193fd_recheck () 308fd_ebadf (void)
194{ 309{
195 int fd; 310 int fd;
196 311
197 for (fd = 0; fd < anfdmax; ++fd) 312 for (fd = 0; fd < anfdmax; ++fd)
198 if (anfds [fd].wev) 313 if (anfds [fd].events)
199 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 314 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF)
200 while (anfds [fd].head) 315 fd_kill (fd);
201 evio_stop (anfds [fd].head); 316}
317
318/* called on ENOMEM in select/poll to kill some fds and retry */
319static void
320fd_enomem (void)
321{
322 int fd = anfdmax;
323
324 while (fd--)
325 if (anfds [fd].events)
326 {
327 close (fd);
328 fd_kill (fd);
329 return;
330 }
202} 331}
203 332
204/*****************************************************************************/ 333/*****************************************************************************/
205 334
206static struct ev_timer **timers; 335static struct ev_timer **timers;
… …
253/*****************************************************************************/ 382/*****************************************************************************/
254 383
255typedef struct 384typedef struct
256{ 385{
257 struct ev_signal *head; 386 struct ev_signal *head;
258 sig_atomic_t gotsig; 387 sig_atomic_t volatile gotsig;
259} ANSIG; 388} ANSIG;
260 389
261static ANSIG *signals; 390static ANSIG *signals;
262static int signalmax; 391static int signalmax;
263 392
264static int sigpipe [2]; 393static int sigpipe [2];
265static sig_atomic_t gotsig; 394static sig_atomic_t volatile gotsig;
266static struct ev_io sigev; 395static struct ev_io sigev;
267 396
268static void 397static void
269signals_init (ANSIG *base, int count) 398signals_init (ANSIG *base, int count)
270{ 399{
271 while (count--) 400 while (count--)
272 { 401 {
273 base->head = 0; 402 base->head = 0;
274 base->gotsig = 0; 403 base->gotsig = 0;
404
275 ++base; 405 ++base;
276 } 406 }
277} 407}
278 408
279static void 409static void
… …
282 signals [signum - 1].gotsig = 1; 412 signals [signum - 1].gotsig = 1;
283 413
284 if (!gotsig) 414 if (!gotsig)
285 { 415 {
286 gotsig = 1; 416 gotsig = 1;
287 write (sigpipe [1], &gotsig, 1); 417 write (sigpipe [1], &signum, 1);
288 } 418 }
289} 419}
290 420
291static void 421static void
292sigcb (struct ev_io *iow, int revents) 422sigcb (struct ev_io *iow, int revents)
293{ 423{
294 struct ev_signal *w; 424 struct ev_signal *w;
295 int sig; 425 int signum;
296 426
427 read (sigpipe [0], &revents, 1);
297 gotsig = 0; 428 gotsig = 0;
298 read (sigpipe [0], &revents, 1);
299 429
300 for (sig = signalmax; sig--; ) 430 for (signum = signalmax; signum--; )
301 if (signals [sig].gotsig) 431 if (signals [signum].gotsig)
302 { 432 {
303 signals [sig].gotsig = 0; 433 signals [signum].gotsig = 0;
304 434
305 for (w = signals [sig].head; w; w = w->next) 435 for (w = signals [signum].head; w; w = w->next)
306 event ((W)w, EV_SIGNAL); 436 event ((W)w, EV_SIGNAL);
307 } 437 }
308} 438}
309 439
310static void 440static void
… …
315 445
316 /* rather than sort out wether we really need nb, set it */ 446 /* rather than sort out wether we really need nb, set it */
317 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK); 447 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
318 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK); 448 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
319 449
320 evio_set (&sigev, sigpipe [0], EV_READ); 450 ev_io_set (&sigev, sigpipe [0], EV_READ);
321 evio_start (&sigev); 451 ev_io_start (&sigev);
322} 452}
323 453
324/*****************************************************************************/ 454/*****************************************************************************/
325 455
326static struct ev_idle **idles; 456static struct ev_idle **idles;
… …
332static struct ev_check **checks; 462static struct ev_check **checks;
333static int checkmax, checkcnt; 463static int checkmax, checkcnt;
334 464
335/*****************************************************************************/ 465/*****************************************************************************/
336 466
467static struct ev_child *childs [PID_HASHSIZE];
468static struct ev_signal childev;
469
470#ifndef WCONTINUED
471# define WCONTINUED 0
472#endif
473
474static void
475childcb (struct ev_signal *sw, int revents)
476{
477 struct ev_child *w;
478 int pid, status;
479
480 while ((pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)) != -1)
481 for (w = childs [pid & (PID_HASHSIZE - 1)]; w; w = w->next)
482 if (w->pid == pid || !w->pid)
483 {
484 w->status = status;
485 event ((W)w, EV_CHILD);
486 }
487}
488
489/*****************************************************************************/
490
491#if EV_USE_KQUEUE
492# include "ev_kqueue.c"
493#endif
337#if HAVE_EPOLL 494#if EV_USE_EPOLL
338# include "ev_epoll.c" 495# include "ev_epoll.c"
339#endif 496#endif
497#if EV_USE_POLL
498# include "ev_poll.c"
499#endif
340#if HAVE_SELECT 500#if EV_USE_SELECT
341# include "ev_select.c" 501# include "ev_select.c"
342#endif 502#endif
343 503
504int
505ev_version_major (void)
506{
507 return EV_VERSION_MAJOR;
508}
509
510int
511ev_version_minor (void)
512{
513 return EV_VERSION_MINOR;
514}
515
516/* return true if we are running with elevated privileges and ignore env variables */
517static int
518enable_secure ()
519{
520 return getuid () != geteuid ()
521 || getgid () != getegid ();
522}
523
344int ev_init (int flags) 524int ev_init (int methods)
345{ 525{
346#if HAVE_MONOTONIC
347 {
348 struct timespec ts;
349 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
350 have_monotonic = 1;
351 }
352#endif
353
354 ev_now = ev_time ();
355 now = get_clock ();
356 diff = ev_now - now;
357
358 if (pipe (sigpipe))
359 return 0;
360
361 ev_method = EVMETHOD_NONE;
362#if HAVE_EPOLL
363 if (ev_method == EVMETHOD_NONE) epoll_init (flags);
364#endif
365#if HAVE_SELECT
366 if (ev_method == EVMETHOD_NONE) select_init (flags);
367#endif
368
369 if (ev_method) 526 if (!ev_method)
527 {
528#if EV_USE_MONOTONIC
370 { 529 {
530 struct timespec ts;
531 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
532 have_monotonic = 1;
533 }
534#endif
535
536 ev_now = ev_time ();
537 now = get_clock ();
538 now_floor = now;
539 diff = ev_now - now;
540
541 if (pipe (sigpipe))
542 return 0;
543
544 if (methods == EVMETHOD_AUTO)
545 if (!enable_secure () && getenv ("LIBEV_METHODS"))
546 methods = atoi (getenv ("LIBEV_METHODS"));
547 else
548 methods = EVMETHOD_ANY;
549
550 ev_method = 0;
551#if EV_USE_KQUEUE
552 if (!ev_method && (methods & EVMETHOD_KQUEUE)) kqueue_init (methods);
553#endif
554#if EV_USE_EPOLL
555 if (!ev_method && (methods & EVMETHOD_EPOLL )) epoll_init (methods);
556#endif
557#if EV_USE_POLL
558 if (!ev_method && (methods & EVMETHOD_POLL )) poll_init (methods);
559#endif
560#if EV_USE_SELECT
561 if (!ev_method && (methods & EVMETHOD_SELECT)) select_init (methods);
562#endif
563
564 if (ev_method)
565 {
371 evw_init (&sigev, sigcb); 566 ev_watcher_init (&sigev, sigcb);
372 siginit (); 567 siginit ();
568
569 ev_signal_init (&childev, childcb, SIGCHLD);
570 ev_signal_start (&childev);
571 }
373 } 572 }
374 573
375 return ev_method; 574 return ev_method;
376} 575}
377 576
378/*****************************************************************************/ 577/*****************************************************************************/
379 578
380void ev_prefork (void) 579void
580ev_fork_prepare (void)
381{ 581{
382 /* nop */ 582 /* nop */
383} 583}
384 584
585void
385void ev_postfork_parent (void) 586ev_fork_parent (void)
386{ 587{
387 /* nop */ 588 /* nop */
388} 589}
389 590
591void
390void ev_postfork_child (void) 592ev_fork_child (void)
391{ 593{
392#if HAVE_EPOLL 594#if EV_USE_EPOLL
393 if (ev_method == EVMETHOD_EPOLL) 595 if (ev_method == EVMETHOD_EPOLL)
394 epoll_postfork_child (); 596 epoll_postfork_child ();
395#endif 597#endif
396 598
397 evio_stop (&sigev); 599 ev_io_stop (&sigev);
398 close (sigpipe [0]); 600 close (sigpipe [0]);
399 close (sigpipe [1]); 601 close (sigpipe [1]);
400 pipe (sigpipe); 602 pipe (sigpipe);
401 siginit (); 603 siginit ();
402} 604}
403 605
404/*****************************************************************************/ 606/*****************************************************************************/
405 607
406static void 608static void
407fd_reify (void) 609call_pending (void)
408{ 610{
409 int i; 611 int pri;
410 612
411 for (i = 0; i < fdchangecnt; ++i) 613 for (pri = NUMPRI; pri--; )
412 { 614 while (pendingcnt [pri])
413 int fd = fdchanges [i];
414 ANFD *anfd = anfds + fd;
415 struct ev_io *w;
416
417 int wev = 0;
418
419 for (w = anfd->head; w; w = w->next)
420 wev |= w->events;
421
422 if (anfd->wev != wev)
423 { 615 {
424 method_modify (fd, anfd->wev, wev);
425 anfd->wev = wev;
426 }
427 }
428
429 fdchangecnt = 0;
430}
431
432static void
433call_pending ()
434{
435 while (pendingcnt)
436 {
437 ANPENDING *p = pendings + --pendingcnt; 616 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
438 617
439 if (p->w) 618 if (p->w)
440 { 619 {
441 p->w->pending = 0; 620 p->w->pending = 0;
442 p->w->cb (p->w, p->events); 621 p->w->cb (p->w, p->events);
443 } 622 }
444 } 623 }
445} 624}
446 625
447static void 626static void
448timers_reify () 627timers_reify (void)
449{ 628{
450 while (timercnt && timers [0]->at <= now) 629 while (timercnt && timers [0]->at <= now)
451 { 630 {
452 struct ev_timer *w = timers [0]; 631 struct ev_timer *w = timers [0];
453
454 event ((W)w, EV_TIMEOUT);
455 632
456 /* first reschedule or stop timer */ 633 /* first reschedule or stop timer */
457 if (w->repeat) 634 if (w->repeat)
458 { 635 {
636 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
459 w->at = now + w->repeat; 637 w->at = now + w->repeat;
460 assert (("timer timeout in the past, negative repeat?", w->at > now));
461 downheap ((WT *)timers, timercnt, 0); 638 downheap ((WT *)timers, timercnt, 0);
462 } 639 }
463 else 640 else
464 evtimer_stop (w); /* nonrepeating: stop timer */ 641 ev_timer_stop (w); /* nonrepeating: stop timer */
465 }
466}
467 642
643 event ((W)w, EV_TIMEOUT);
644 }
645}
646
468static void 647static void
469periodics_reify () 648periodics_reify (void)
470{ 649{
471 while (periodiccnt && periodics [0]->at <= ev_now) 650 while (periodiccnt && periodics [0]->at <= ev_now)
472 { 651 {
473 struct ev_periodic *w = periodics [0]; 652 struct ev_periodic *w = periodics [0];
474 653
475 /* first reschedule or stop timer */ 654 /* first reschedule or stop timer */
476 if (w->interval) 655 if (w->interval)
477 { 656 {
478 w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval; 657 w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval;
479 assert (("periodic timeout in the past, negative interval?", w->at > ev_now)); 658 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > ev_now));
480 downheap ((WT *)periodics, periodiccnt, 0); 659 downheap ((WT *)periodics, periodiccnt, 0);
481 } 660 }
482 else 661 else
483 evperiodic_stop (w); /* nonrepeating: stop timer */ 662 ev_periodic_stop (w); /* nonrepeating: stop timer */
484 663
485 event ((W)w, EV_TIMEOUT); 664 event ((W)w, EV_PERIODIC);
486 } 665 }
487} 666}
488 667
489static void 668static void
490periodics_reschedule (ev_tstamp diff) 669periodics_reschedule (ev_tstamp diff)
… …
500 { 679 {
501 ev_tstamp diff = ceil ((ev_now - w->at) / w->interval) * w->interval; 680 ev_tstamp diff = ceil ((ev_now - w->at) / w->interval) * w->interval;
502 681
503 if (fabs (diff) >= 1e-4) 682 if (fabs (diff) >= 1e-4)
504 { 683 {
505 evperiodic_stop (w); 684 ev_periodic_stop (w);
506 evperiodic_start (w); 685 ev_periodic_start (w);
507 686
508 i = 0; /* restart loop, inefficient, but time jumps should be rare */ 687 i = 0; /* restart loop, inefficient, but time jumps should be rare */
509 } 688 }
510 } 689 }
511 } 690 }
512} 691}
513 692
514static void 693static int
694time_update_monotonic (void)
695{
696 now = get_clock ();
697
698 if (expect_true (now - now_floor < MIN_TIMEJUMP * .5))
699 {
700 ev_now = now + diff;
701 return 0;
702 }
703 else
704 {
705 now_floor = now;
706 ev_now = ev_time ();
707 return 1;
708 }
709}
710
711static void
515time_update () 712time_update (void)
516{ 713{
517 int i; 714 int i;
518 715
519 ev_now = ev_time (); 716#if EV_USE_MONOTONIC
520
521 if (have_monotonic) 717 if (expect_true (have_monotonic))
522 { 718 {
719 if (time_update_monotonic ())
720 {
523 ev_tstamp odiff = diff; 721 ev_tstamp odiff = diff;
524 722
525 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 723 for (i = 4; --i; ) /* loop a few times, before making important decisions */
526 { 724 {
527 now = get_clock ();
528 diff = ev_now - now; 725 diff = ev_now - now;
529 726
530 if (fabs (odiff - diff) < MIN_TIMEJUMP) 727 if (fabs (odiff - diff) < MIN_TIMEJUMP)
531 return; /* all is well */ 728 return; /* all is well */
532 729
533 ev_now = ev_time (); 730 ev_now = ev_time ();
731 now = get_clock ();
732 now_floor = now;
534 } 733 }
535 734
536 periodics_reschedule (diff - odiff); 735 periodics_reschedule (diff - odiff);
537 /* no timer adjustment, as the monotonic clock doesn't jump */ 736 /* no timer adjustment, as the monotonic clock doesn't jump */
737 }
538 } 738 }
539 else 739 else
740#endif
540 { 741 {
742 ev_now = ev_time ();
743
541 if (now > ev_now || now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP) 744 if (expect_false (now > ev_now || now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
542 { 745 {
543 periodics_reschedule (ev_now - now); 746 periodics_reschedule (ev_now - now);
544 747
545 /* adjust timers. this is easy, as the offset is the same for all */ 748 /* adjust timers. this is easy, as the offset is the same for all */
546 for (i = 0; i < timercnt; ++i) 749 for (i = 0; i < timercnt; ++i)
… …
554int ev_loop_done; 757int ev_loop_done;
555 758
556void ev_loop (int flags) 759void ev_loop (int flags)
557{ 760{
558 double block; 761 double block;
559 ev_loop_done = flags & EVLOOP_ONESHOT ? 1 : 0; 762 ev_loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
560 763
561 do 764 do
562 { 765 {
563 /* queue check watchers (and execute them) */ 766 /* queue check watchers (and execute them) */
564 if (checkcnt) 767 if (expect_false (preparecnt))
565 { 768 {
566 queue_events ((W *)prepares, preparecnt, EV_PREPARE); 769 queue_events ((W *)prepares, preparecnt, EV_PREPARE);
567 call_pending (); 770 call_pending ();
568 } 771 }
569 772
570 /* update fd-related kernel structures */ 773 /* update fd-related kernel structures */
571 fd_reify (); 774 fd_reify ();
572 775
573 /* calculate blocking time */ 776 /* calculate blocking time */
574 777
575 /* we only need this for !monotonic clock, but as we always have timers, we just calculate it every time */ 778 /* we only need this for !monotonic clockor timers, but as we basically
779 always have timers, we just calculate it always */
780#if EV_USE_MONOTONIC
781 if (expect_true (have_monotonic))
782 time_update_monotonic ();
783 else
784#endif
785 {
576 ev_now = ev_time (); 786 ev_now = ev_time ();
787 now = ev_now;
788 }
577 789
578 if (flags & EVLOOP_NONBLOCK || idlecnt) 790 if (flags & EVLOOP_NONBLOCK || idlecnt)
579 block = 0.; 791 block = 0.;
580 else 792 else
581 { 793 {
582 block = MAX_BLOCKTIME; 794 block = MAX_BLOCKTIME;
583 795
584 if (timercnt) 796 if (timercnt)
585 { 797 {
586 ev_tstamp to = timers [0]->at - (have_monotonic ? get_clock () : ev_now) + method_fudge; 798 ev_tstamp to = timers [0]->at - now + method_fudge;
587 if (block > to) block = to; 799 if (block > to) block = to;
588 } 800 }
589 801
590 if (periodiccnt) 802 if (periodiccnt)
591 { 803 {
… …
644 head = &(*head)->next; 856 head = &(*head)->next;
645 } 857 }
646} 858}
647 859
648static void 860static void
649ev_clear (W w) 861ev_clear_pending (W w)
650{ 862{
651 if (w->pending) 863 if (w->pending)
652 { 864 {
653 pendings [w->pending - 1].w = 0; 865 pendings [ABSPRI (w)][w->pending - 1].w = 0;
654 w->pending = 0; 866 w->pending = 0;
655 } 867 }
656} 868}
657 869
658static void 870static void
659ev_start (W w, int active) 871ev_start (W w, int active)
660{ 872{
873 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI;
874 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
875
661 w->active = active; 876 w->active = active;
662} 877}
663 878
664static void 879static void
665ev_stop (W w) 880ev_stop (W w)
… …
668} 883}
669 884
670/*****************************************************************************/ 885/*****************************************************************************/
671 886
672void 887void
673evio_start (struct ev_io *w) 888ev_io_start (struct ev_io *w)
674{ 889{
890 int fd = w->fd;
891
675 if (ev_is_active (w)) 892 if (ev_is_active (w))
676 return; 893 return;
677 894
678 int fd = w->fd; 895 assert (("ev_io_start called with negative fd", fd >= 0));
679 896
680 ev_start ((W)w, 1); 897 ev_start ((W)w, 1);
681 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 898 array_needsize (anfds, anfdmax, fd + 1, anfds_init);
682 wlist_add ((WL *)&anfds[fd].head, (WL)w); 899 wlist_add ((WL *)&anfds[fd].head, (WL)w);
683 900
684 ++fdchangecnt; 901 fd_change (fd);
685 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
686 fdchanges [fdchangecnt - 1] = fd;
687} 902}
688 903
689void 904void
690evio_stop (struct ev_io *w) 905ev_io_stop (struct ev_io *w)
691{ 906{
692 ev_clear ((W)w); 907 ev_clear_pending ((W)w);
693 if (!ev_is_active (w)) 908 if (!ev_is_active (w))
694 return; 909 return;
695 910
696 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 911 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
697 ev_stop ((W)w); 912 ev_stop ((W)w);
698 913
699 ++fdchangecnt; 914 fd_change (w->fd);
700 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
701 fdchanges [fdchangecnt - 1] = w->fd;
702} 915}
703 916
704void 917void
705evtimer_start (struct ev_timer *w) 918ev_timer_start (struct ev_timer *w)
706{ 919{
707 if (ev_is_active (w)) 920 if (ev_is_active (w))
708 return; 921 return;
709 922
710 w->at += now; 923 w->at += now;
711 924
712 assert (("timer repeat value less than zero not allowed", w->repeat >= 0.)); 925 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
713 926
714 ev_start ((W)w, ++timercnt); 927 ev_start ((W)w, ++timercnt);
715 array_needsize (timers, timermax, timercnt, ); 928 array_needsize (timers, timermax, timercnt, );
716 timers [timercnt - 1] = w; 929 timers [timercnt - 1] = w;
717 upheap ((WT *)timers, timercnt - 1); 930 upheap ((WT *)timers, timercnt - 1);
718} 931}
719 932
720void 933void
721evtimer_stop (struct ev_timer *w) 934ev_timer_stop (struct ev_timer *w)
722{ 935{
723 ev_clear ((W)w); 936 ev_clear_pending ((W)w);
724 if (!ev_is_active (w)) 937 if (!ev_is_active (w))
725 return; 938 return;
726 939
727 if (w->active < timercnt--) 940 if (w->active < timercnt--)
728 { 941 {
… …
734 947
735 ev_stop ((W)w); 948 ev_stop ((W)w);
736} 949}
737 950
738void 951void
739evtimer_again (struct ev_timer *w) 952ev_timer_again (struct ev_timer *w)
740{ 953{
741 if (ev_is_active (w)) 954 if (ev_is_active (w))
742 { 955 {
743 if (w->repeat) 956 if (w->repeat)
744 { 957 {
745 w->at = now + w->repeat; 958 w->at = now + w->repeat;
746 downheap ((WT *)timers, timercnt, w->active - 1); 959 downheap ((WT *)timers, timercnt, w->active - 1);
747 } 960 }
748 else 961 else
749 evtimer_stop (w); 962 ev_timer_stop (w);
750 } 963 }
751 else if (w->repeat) 964 else if (w->repeat)
752 evtimer_start (w); 965 ev_timer_start (w);
753} 966}
754 967
755void 968void
756evperiodic_start (struct ev_periodic *w) 969ev_periodic_start (struct ev_periodic *w)
757{ 970{
758 if (ev_is_active (w)) 971 if (ev_is_active (w))
759 return; 972 return;
760 973
761 assert (("periodic interval value less than zero not allowed", w->interval >= 0.)); 974 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
762 975
763 /* this formula differs from the one in periodic_reify because we do not always round up */ 976 /* this formula differs from the one in periodic_reify because we do not always round up */
764 if (w->interval) 977 if (w->interval)
765 w->at += ceil ((ev_now - w->at) / w->interval) * w->interval; 978 w->at += ceil ((ev_now - w->at) / w->interval) * w->interval;
766 979
… …
769 periodics [periodiccnt - 1] = w; 982 periodics [periodiccnt - 1] = w;
770 upheap ((WT *)periodics, periodiccnt - 1); 983 upheap ((WT *)periodics, periodiccnt - 1);
771} 984}
772 985
773void 986void
774evperiodic_stop (struct ev_periodic *w) 987ev_periodic_stop (struct ev_periodic *w)
775{ 988{
776 ev_clear ((W)w); 989 ev_clear_pending ((W)w);
777 if (!ev_is_active (w)) 990 if (!ev_is_active (w))
778 return; 991 return;
779 992
780 if (w->active < periodiccnt--) 993 if (w->active < periodiccnt--)
781 { 994 {
… …
785 998
786 ev_stop ((W)w); 999 ev_stop ((W)w);
787} 1000}
788 1001
789void 1002void
790evsignal_start (struct ev_signal *w) 1003ev_signal_start (struct ev_signal *w)
791{ 1004{
792 if (ev_is_active (w)) 1005 if (ev_is_active (w))
793 return; 1006 return;
1007
1008 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
794 1009
795 ev_start ((W)w, 1); 1010 ev_start ((W)w, 1);
796 array_needsize (signals, signalmax, w->signum, signals_init); 1011 array_needsize (signals, signalmax, w->signum, signals_init);
797 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1012 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
798 1013
… …
805 sigaction (w->signum, &sa, 0); 1020 sigaction (w->signum, &sa, 0);
806 } 1021 }
807} 1022}
808 1023
809void 1024void
810evsignal_stop (struct ev_signal *w) 1025ev_signal_stop (struct ev_signal *w)
811{ 1026{
812 ev_clear ((W)w); 1027 ev_clear_pending ((W)w);
813 if (!ev_is_active (w)) 1028 if (!ev_is_active (w))
814 return; 1029 return;
815 1030
816 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1031 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
817 ev_stop ((W)w); 1032 ev_stop ((W)w);
818 1033
819 if (!signals [w->signum - 1].head) 1034 if (!signals [w->signum - 1].head)
820 signal (w->signum, SIG_DFL); 1035 signal (w->signum, SIG_DFL);
821} 1036}
822 1037
1038void
823void evidle_start (struct ev_idle *w) 1039ev_idle_start (struct ev_idle *w)
824{ 1040{
825 if (ev_is_active (w)) 1041 if (ev_is_active (w))
826 return; 1042 return;
827 1043
828 ev_start ((W)w, ++idlecnt); 1044 ev_start ((W)w, ++idlecnt);
829 array_needsize (idles, idlemax, idlecnt, ); 1045 array_needsize (idles, idlemax, idlecnt, );
830 idles [idlecnt - 1] = w; 1046 idles [idlecnt - 1] = w;
831} 1047}
832 1048
1049void
833void evidle_stop (struct ev_idle *w) 1050ev_idle_stop (struct ev_idle *w)
834{ 1051{
835 ev_clear ((W)w); 1052 ev_clear_pending ((W)w);
836 if (ev_is_active (w)) 1053 if (ev_is_active (w))
837 return; 1054 return;
838 1055
839 idles [w->active - 1] = idles [--idlecnt]; 1056 idles [w->active - 1] = idles [--idlecnt];
840 ev_stop ((W)w); 1057 ev_stop ((W)w);
841} 1058}
842 1059
1060void
843void evprepare_start (struct ev_prepare *w) 1061ev_prepare_start (struct ev_prepare *w)
844{ 1062{
845 if (ev_is_active (w)) 1063 if (ev_is_active (w))
846 return; 1064 return;
847 1065
848 ev_start ((W)w, ++preparecnt); 1066 ev_start ((W)w, ++preparecnt);
849 array_needsize (prepares, preparemax, preparecnt, ); 1067 array_needsize (prepares, preparemax, preparecnt, );
850 prepares [preparecnt - 1] = w; 1068 prepares [preparecnt - 1] = w;
851} 1069}
852 1070
1071void
853void evprepare_stop (struct ev_prepare *w) 1072ev_prepare_stop (struct ev_prepare *w)
854{ 1073{
855 ev_clear ((W)w); 1074 ev_clear_pending ((W)w);
856 if (ev_is_active (w)) 1075 if (ev_is_active (w))
857 return; 1076 return;
858 1077
859 prepares [w->active - 1] = prepares [--preparecnt]; 1078 prepares [w->active - 1] = prepares [--preparecnt];
860 ev_stop ((W)w); 1079 ev_stop ((W)w);
861} 1080}
862 1081
1082void
863void evcheck_start (struct ev_check *w) 1083ev_check_start (struct ev_check *w)
864{ 1084{
865 if (ev_is_active (w)) 1085 if (ev_is_active (w))
866 return; 1086 return;
867 1087
868 ev_start ((W)w, ++checkcnt); 1088 ev_start ((W)w, ++checkcnt);
869 array_needsize (checks, checkmax, checkcnt, ); 1089 array_needsize (checks, checkmax, checkcnt, );
870 checks [checkcnt - 1] = w; 1090 checks [checkcnt - 1] = w;
871} 1091}
872 1092
1093void
873void evcheck_stop (struct ev_check *w) 1094ev_check_stop (struct ev_check *w)
874{ 1095{
875 ev_clear ((W)w); 1096 ev_clear_pending ((W)w);
876 if (ev_is_active (w)) 1097 if (ev_is_active (w))
877 return; 1098 return;
878 1099
879 checks [w->active - 1] = checks [--checkcnt]; 1100 checks [w->active - 1] = checks [--checkcnt];
1101 ev_stop ((W)w);
1102}
1103
1104void
1105ev_child_start (struct ev_child *w)
1106{
1107 if (ev_is_active (w))
1108 return;
1109
1110 ev_start ((W)w, 1);
1111 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1112}
1113
1114void
1115ev_child_stop (struct ev_child *w)
1116{
1117 ev_clear_pending ((W)w);
1118 if (ev_is_active (w))
1119 return;
1120
1121 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
880 ev_stop ((W)w); 1122 ev_stop ((W)w);
881} 1123}
882 1124
883/*****************************************************************************/ 1125/*****************************************************************************/
884 1126
… …
894once_cb (struct ev_once *once, int revents) 1136once_cb (struct ev_once *once, int revents)
895{ 1137{
896 void (*cb)(int revents, void *arg) = once->cb; 1138 void (*cb)(int revents, void *arg) = once->cb;
897 void *arg = once->arg; 1139 void *arg = once->arg;
898 1140
899 evio_stop (&once->io); 1141 ev_io_stop (&once->io);
900 evtimer_stop (&once->to); 1142 ev_timer_stop (&once->to);
901 free (once); 1143 free (once);
902 1144
903 cb (revents, arg); 1145 cb (revents, arg);
904} 1146}
905 1147
… …
919ev_once (int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1161ev_once (int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
920{ 1162{
921 struct ev_once *once = malloc (sizeof (struct ev_once)); 1163 struct ev_once *once = malloc (sizeof (struct ev_once));
922 1164
923 if (!once) 1165 if (!once)
924 cb (EV_ERROR, arg); 1166 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
925 else 1167 else
926 { 1168 {
927 once->cb = cb; 1169 once->cb = cb;
928 once->arg = arg; 1170 once->arg = arg;
929 1171
930 evw_init (&once->io, once_cb_io); 1172 ev_watcher_init (&once->io, once_cb_io);
931
932 if (fd >= 0) 1173 if (fd >= 0)
933 { 1174 {
934 evio_set (&once->io, fd, events); 1175 ev_io_set (&once->io, fd, events);
935 evio_start (&once->io); 1176 ev_io_start (&once->io);
936 } 1177 }
937 1178
938 evw_init (&once->to, once_cb_to); 1179 ev_watcher_init (&once->to, once_cb_to);
939
940 if (timeout >= 0.) 1180 if (timeout >= 0.)
941 { 1181 {
942 evtimer_set (&once->to, timeout, 0.); 1182 ev_timer_set (&once->to, timeout, 0.);
943 evtimer_start (&once->to); 1183 ev_timer_start (&once->to);
944 } 1184 }
945 } 1185 }
946} 1186}
947 1187
948/*****************************************************************************/ 1188/*****************************************************************************/
… …
959 1199
960static void 1200static void
961ocb (struct ev_timer *w, int revents) 1201ocb (struct ev_timer *w, int revents)
962{ 1202{
963 //fprintf (stderr, "timer %f,%f (%x) (%f) d%p\n", w->at, w->repeat, revents, w->at - ev_time (), w->data); 1203 //fprintf (stderr, "timer %f,%f (%x) (%f) d%p\n", w->at, w->repeat, revents, w->at - ev_time (), w->data);
964 evtimer_stop (w); 1204 ev_timer_stop (w);
965 evtimer_start (w); 1205 ev_timer_start (w);
966} 1206}
967 1207
968static void 1208static void
969scb (struct ev_signal *w, int revents) 1209scb (struct ev_signal *w, int revents)
970{ 1210{
971 fprintf (stderr, "signal %x,%d\n", revents, w->signum); 1211 fprintf (stderr, "signal %x,%d\n", revents, w->signum);
972 evio_stop (&wio); 1212 ev_io_stop (&wio);
973 evio_start (&wio); 1213 ev_io_start (&wio);
974} 1214}
975 1215
976static void 1216static void
977gcb (struct ev_signal *w, int revents) 1217gcb (struct ev_signal *w, int revents)
978{ 1218{
… …
982 1222
983int main (void) 1223int main (void)
984{ 1224{
985 ev_init (0); 1225 ev_init (0);
986 1226
987 evio_init (&wio, sin_cb, 0, EV_READ); 1227 ev_io_init (&wio, sin_cb, 0, EV_READ);
988 evio_start (&wio); 1228 ev_io_start (&wio);
989 1229
990 struct ev_timer t[10000]; 1230 struct ev_timer t[10000];
991 1231
992#if 0 1232#if 0
993 int i; 1233 int i;
994 for (i = 0; i < 10000; ++i) 1234 for (i = 0; i < 10000; ++i)
995 { 1235 {
996 struct ev_timer *w = t + i; 1236 struct ev_timer *w = t + i;
997 evw_init (w, ocb, i); 1237 ev_watcher_init (w, ocb, i);
998 evtimer_init_abs (w, ocb, drand48 (), 0.99775533); 1238 ev_timer_init_abs (w, ocb, drand48 (), 0.99775533);
999 evtimer_start (w); 1239 ev_timer_start (w);
1000 if (drand48 () < 0.5) 1240 if (drand48 () < 0.5)
1001 evtimer_stop (w); 1241 ev_timer_stop (w);
1002 } 1242 }
1003#endif 1243#endif
1004 1244
1005 struct ev_timer t1; 1245 struct ev_timer t1;
1006 evtimer_init (&t1, ocb, 5, 10); 1246 ev_timer_init (&t1, ocb, 5, 10);
1007 evtimer_start (&t1); 1247 ev_timer_start (&t1);
1008 1248
1009 struct ev_signal sig; 1249 struct ev_signal sig;
1010 evsignal_init (&sig, scb, SIGQUIT); 1250 ev_signal_init (&sig, scb, SIGQUIT);
1011 evsignal_start (&sig); 1251 ev_signal_start (&sig);
1012 1252
1013 struct ev_check cw; 1253 struct ev_check cw;
1014 evcheck_init (&cw, gcb); 1254 ev_check_init (&cw, gcb);
1015 evcheck_start (&cw); 1255 ev_check_start (&cw);
1016 1256
1017 struct ev_idle iw; 1257 struct ev_idle iw;
1018 evidle_init (&iw, gcb); 1258 ev_idle_init (&iw, gcb);
1019 evidle_start (&iw); 1259 ev_idle_start (&iw);
1020 1260
1021 ev_loop (0); 1261 ev_loop (0);
1022 1262
1023 return 0; 1263 return 0;
1024} 1264}

Diff Legend

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