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

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

Diff Legend

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