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

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

Diff Legend

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