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

Comparing libev/ev.c (file contents):
Revision 1.31 by root, Thu Nov 1 09:05:33 2007 UTC vs.
Revision 1.49 by root, Sat Nov 3 16:16: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
… …
40#include <stdio.h> 42#include <stdio.h>
41 43
42#include <assert.h> 44#include <assert.h>
43#include <errno.h> 45#include <errno.h>
44#include <sys/types.h> 46#include <sys/types.h>
47#ifndef WIN32
45#include <sys/wait.h> 48# include <sys/wait.h>
49#endif
46#include <sys/time.h> 50#include <sys/time.h>
47#include <time.h> 51#include <time.h>
48 52
53/**/
54
49#ifndef EV_USE_MONOTONIC 55#ifndef EV_USE_MONOTONIC
50# ifdef CLOCK_MONOTONIC
51# define EV_USE_MONOTONIC 1 56# define EV_USE_MONOTONIC 1
52# endif
53#endif 57#endif
54 58
55#ifndef EV_USE_SELECT 59#ifndef EV_USE_SELECT
56# define EV_USE_SELECT 1 60# define EV_USE_SELECT 1
57#endif 61#endif
58 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
59#ifndef EV_USE_EPOLL 67#ifndef EV_USE_EPOLL
60# define EV_USE_EPOLL 0 68# define EV_USE_EPOLL 0
61#endif 69#endif
62 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
81#ifndef CLOCK_MONOTONIC
82# undef EV_USE_MONOTONIC
83# define EV_USE_MONOTONIC 0
84#endif
85
63#ifndef CLOCK_REALTIME 86#ifndef CLOCK_REALTIME
87# undef EV_USE_REALTIME
64# define EV_USE_REALTIME 0 88# define EV_USE_REALTIME 0
65#endif 89#endif
66#ifndef EV_USE_REALTIME 90
67# define EV_USE_REALTIME 1 /* posix requirement, but might be slower */ 91/**/
68#endif
69 92
70#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) */
71#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detetc time jumps) */ 94#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */
72#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */ 95#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
73#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */ 96/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */
74 97
75#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)
76 113
77typedef struct ev_watcher *W; 114typedef struct ev_watcher *W;
78typedef struct ev_watcher_list *WL; 115typedef struct ev_watcher_list *WL;
79typedef struct ev_watcher_time *WT; 116typedef struct ev_watcher_time *WT;
80 117
81static ev_tstamp now, diff; /* monotonic clock */ 118static ev_tstamp now_floor, now, diff; /* monotonic clock */
82ev_tstamp ev_now; 119ev_tstamp ev_now;
83int ev_method; 120int ev_method;
84 121
85static int have_monotonic; /* runtime */ 122static int have_monotonic; /* runtime */
86 123
… …
106 143
107static ev_tstamp 144static ev_tstamp
108get_clock (void) 145get_clock (void)
109{ 146{
110#if EV_USE_MONOTONIC 147#if EV_USE_MONOTONIC
111 if (have_monotonic) 148 if (expect_true (have_monotonic))
112 { 149 {
113 struct timespec ts; 150 struct timespec ts;
114 clock_gettime (CLOCK_MONOTONIC, &ts); 151 clock_gettime (CLOCK_MONOTONIC, &ts);
115 return ts.tv_sec + ts.tv_nsec * 1e-9; 152 return ts.tv_sec + ts.tv_nsec * 1e-9;
116 } 153 }
… …
120} 157}
121 158
122#define array_roundsize(base,n) ((n) | 4 & ~3) 159#define array_roundsize(base,n) ((n) | 4 & ~3)
123 160
124#define array_needsize(base,cur,cnt,init) \ 161#define array_needsize(base,cur,cnt,init) \
125 if ((cnt) > cur) \ 162 if (expect_false ((cnt) > cur)) \
126 { \ 163 { \
127 int newcnt = cur; \ 164 int newcnt = cur; \
128 do \ 165 do \
129 { \ 166 { \
130 newcnt = array_roundsize (base, newcnt << 1); \ 167 newcnt = array_roundsize (base, newcnt << 1); \
… …
139/*****************************************************************************/ 176/*****************************************************************************/
140 177
141typedef struct 178typedef struct
142{ 179{
143 struct ev_io *head; 180 struct ev_io *head;
144 int events; 181 unsigned char events;
182 unsigned char reify;
145} ANFD; 183} ANFD;
146 184
147static ANFD *anfds; 185static ANFD *anfds;
148static int anfdmax; 186static int anfdmax;
149 187
… …
152{ 190{
153 while (count--) 191 while (count--)
154 { 192 {
155 base->head = 0; 193 base->head = 0;
156 base->events = EV_NONE; 194 base->events = EV_NONE;
195 base->reify = 0;
196
157 ++base; 197 ++base;
158 } 198 }
159} 199}
160 200
161typedef struct 201typedef struct
162{ 202{
163 W w; 203 W w;
164 int events; 204 int events;
165} ANPENDING; 205} ANPENDING;
166 206
167static ANPENDING *pendings; 207static ANPENDING *pendings [NUMPRI];
168static int pendingmax, pendingcnt; 208static int pendingmax [NUMPRI], pendingcnt [NUMPRI];
169 209
170static void 210static void
171event (W w, int events) 211event (W w, int events)
172{ 212{
213 if (w->pending)
214 {
215 pendings [ABSPRI (w)][w->pending - 1].events |= events;
216 return;
217 }
218
173 w->pending = ++pendingcnt; 219 w->pending = ++pendingcnt [ABSPRI (w)];
174 array_needsize (pendings, pendingmax, pendingcnt, ); 220 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], );
175 pendings [pendingcnt - 1].w = w; 221 pendings [ABSPRI (w)][w->pending - 1].w = w;
176 pendings [pendingcnt - 1].events = events; 222 pendings [ABSPRI (w)][w->pending - 1].events = events;
177} 223}
178 224
179static void 225static void
180queue_events (W *events, int eventcnt, int type) 226queue_events (W *events, int eventcnt, int type)
181{ 227{
… …
219 int events = 0; 265 int events = 0;
220 266
221 for (w = anfd->head; w; w = w->next) 267 for (w = anfd->head; w; w = w->next)
222 events |= w->events; 268 events |= w->events;
223 269
224 anfd->events &= ~EV_REIFY; 270 anfd->reify = 0;
225 271
226 if (anfd->events != events) 272 if (anfd->events != events)
227 { 273 {
228 method_modify (fd, anfd->events, events); 274 method_modify (fd, anfd->events, events);
229 anfd->events = events; 275 anfd->events = events;
… …
234} 280}
235 281
236static void 282static void
237fd_change (int fd) 283fd_change (int fd)
238{ 284{
239 if (anfds [fd].events & EV_REIFY || fdchangecnt < 0) 285 if (anfds [fd].reify || fdchangecnt < 0)
240 return; 286 return;
241 287
242 anfds [fd].events |= EV_REIFY; 288 anfds [fd].reify = 1;
243 289
244 ++fdchangecnt; 290 ++fdchangecnt;
245 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 291 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
246 fdchanges [fdchangecnt - 1] = fd; 292 fdchanges [fdchangecnt - 1] = fd;
247} 293}
248 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
249/* called on EBADF to verify fds */ 308/* called on EBADF to verify fds */
250static void 309static void
251fd_recheck (void) 310fd_ebadf (void)
252{ 311{
253 int fd; 312 int fd;
254 313
255 for (fd = 0; fd < anfdmax; ++fd) 314 for (fd = 0; fd < anfdmax; ++fd)
256 if (anfds [fd].events) 315 if (anfds [fd].events)
257 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 316 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF)
258 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)
259 { 328 {
260 event ((W)anfds [fd].head, EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT); 329 close (fd);
261 ev_io_stop (anfds [fd].head); 330 fd_kill (fd);
331 return;
262 } 332 }
263} 333}
264 334
265/*****************************************************************************/ 335/*****************************************************************************/
266 336
267static struct ev_timer **timers; 337static struct ev_timer **timers;
… …
314/*****************************************************************************/ 384/*****************************************************************************/
315 385
316typedef struct 386typedef struct
317{ 387{
318 struct ev_signal *head; 388 struct ev_signal *head;
319 sig_atomic_t gotsig; 389 sig_atomic_t volatile gotsig;
320} ANSIG; 390} ANSIG;
321 391
322static ANSIG *signals; 392static ANSIG *signals;
323static int signalmax; 393static int signalmax;
324 394
325static int sigpipe [2]; 395static int sigpipe [2];
326static sig_atomic_t gotsig; 396static sig_atomic_t volatile gotsig;
327static struct ev_io sigev; 397static struct ev_io sigev;
328 398
329static void 399static void
330signals_init (ANSIG *base, int count) 400signals_init (ANSIG *base, int count)
331{ 401{
332 while (count--) 402 while (count--)
333 { 403 {
334 base->head = 0; 404 base->head = 0;
335 base->gotsig = 0; 405 base->gotsig = 0;
406
336 ++base; 407 ++base;
337 } 408 }
338} 409}
339 410
340static void 411static void
… …
342{ 413{
343 signals [signum - 1].gotsig = 1; 414 signals [signum - 1].gotsig = 1;
344 415
345 if (!gotsig) 416 if (!gotsig)
346 { 417 {
418 int old_errno = errno;
347 gotsig = 1; 419 gotsig = 1;
348 write (sigpipe [1], &gotsig, 1); 420 write (sigpipe [1], &signum, 1);
421 errno = old_errno;
349 } 422 }
350} 423}
351 424
352static void 425static void
353sigcb (struct ev_io *iow, int revents) 426sigcb (struct ev_io *iow, int revents)
354{ 427{
355 struct ev_signal *w; 428 struct ev_signal *w;
356 int sig; 429 int signum;
357 430
431 read (sigpipe [0], &revents, 1);
358 gotsig = 0; 432 gotsig = 0;
359 read (sigpipe [0], &revents, 1);
360 433
361 for (sig = signalmax; sig--; ) 434 for (signum = signalmax; signum--; )
362 if (signals [sig].gotsig) 435 if (signals [signum].gotsig)
363 { 436 {
364 signals [sig].gotsig = 0; 437 signals [signum].gotsig = 0;
365 438
366 for (w = signals [sig].head; w; w = w->next) 439 for (w = signals [signum].head; w; w = w->next)
367 event ((W)w, EV_SIGNAL); 440 event ((W)w, EV_SIGNAL);
368 } 441 }
369} 442}
370 443
371static void 444static void
372siginit (void) 445siginit (void)
373{ 446{
447#ifndef WIN32
374 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 448 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC);
375 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC); 449 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
376 450
377 /* rather than sort out wether we really need nb, set it */ 451 /* rather than sort out wether we really need nb, set it */
378 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK); 452 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
379 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK); 453 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
454#endif
380 455
381 ev_io_set (&sigev, sigpipe [0], EV_READ); 456 ev_io_set (&sigev, sigpipe [0], EV_READ);
382 ev_io_start (&sigev); 457 ev_io_start (&sigev);
383} 458}
384 459
… …
396/*****************************************************************************/ 471/*****************************************************************************/
397 472
398static struct ev_child *childs [PID_HASHSIZE]; 473static struct ev_child *childs [PID_HASHSIZE];
399static struct ev_signal childev; 474static struct ev_signal childev;
400 475
476#ifndef WIN32
477
401#ifndef WCONTINUED 478#ifndef WCONTINUED
402# define WCONTINUED 0 479# define WCONTINUED 0
403#endif 480#endif
404 481
405static void 482static void
483child_reap (struct ev_signal *sw, int chain, int pid, int status)
484{
485 struct ev_child *w;
486
487 for (w = childs [chain & (PID_HASHSIZE - 1)]; w; w = w->next)
488 if (w->pid == pid || !w->pid)
489 {
490 w->priority = sw->priority; /* need to do it *now* */
491 w->rpid = pid;
492 w->rstatus = status;
493 printf ("rpid %p %d %d\n", w, pid, w->pid);//D
494 event ((W)w, EV_CHILD);
495 }
496}
497
498static void
406childcb (struct ev_signal *sw, int revents) 499childcb (struct ev_signal *sw, int revents)
407{ 500{
408 struct ev_child *w;
409 int pid, status; 501 int pid, status;
410 502
503 printf ("chld %x\n", revents);//D
411 while ((pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)) != -1) 504 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
412 for (w = childs [pid & (PID_HASHSIZE - 1)]; w; w = w->next) 505 {
413 if (w->pid == pid || w->pid == -1) 506 /* make sure we are called again until all childs have been reaped */
414 {
415 w->status = status;
416 event ((W)w, EV_CHILD); 507 event ((W)sw, EV_SIGNAL);
417 } 508
509 child_reap (sw, pid, pid, status);
510 child_reap (sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */
511 }
418} 512}
513
514#endif
419 515
420/*****************************************************************************/ 516/*****************************************************************************/
421 517
518#if EV_USE_KQUEUE
519# include "ev_kqueue.c"
520#endif
422#if EV_USE_EPOLL 521#if EV_USE_EPOLL
423# include "ev_epoll.c" 522# include "ev_epoll.c"
424#endif 523#endif
524#if EV_USE_POLL
525# include "ev_poll.c"
526#endif
425#if EV_USE_SELECT 527#if EV_USE_SELECT
426# include "ev_select.c" 528# include "ev_select.c"
427#endif 529#endif
428 530
429int 531int
… …
436ev_version_minor (void) 538ev_version_minor (void)
437{ 539{
438 return EV_VERSION_MINOR; 540 return EV_VERSION_MINOR;
439} 541}
440 542
543/* return true if we are running with elevated privileges and should ignore env variables */
544static int
545enable_secure ()
546{
547#ifdef WIN32
548 return 0;
549#else
550 return getuid () != geteuid ()
551 || getgid () != getegid ();
552#endif
553}
554
441int ev_init (int flags) 555int ev_init (int methods)
442{ 556{
443 if (!ev_method) 557 if (!ev_method)
444 { 558 {
445#if EV_USE_MONOTONIC 559#if EV_USE_MONOTONIC
446 { 560 {
… …
448 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 562 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
449 have_monotonic = 1; 563 have_monotonic = 1;
450 } 564 }
451#endif 565#endif
452 566
453 ev_now = ev_time (); 567 ev_now = ev_time ();
454 now = get_clock (); 568 now = get_clock ();
569 now_floor = now;
455 diff = ev_now - now; 570 diff = ev_now - now;
456 571
457 if (pipe (sigpipe)) 572 if (pipe (sigpipe))
458 return 0; 573 return 0;
459 574
575 if (methods == EVMETHOD_AUTO)
576 if (!enable_secure () && getenv ("LIBEV_METHODS"))
577 methods = atoi (getenv ("LIBEV_METHODS"));
578 else
460 ev_method = EVMETHOD_NONE; 579 methods = EVMETHOD_ANY;
580
581 ev_method = 0;
582#if EV_USE_KQUEUE
583 if (!ev_method && (methods & EVMETHOD_KQUEUE)) kqueue_init (methods);
584#endif
461#if EV_USE_EPOLL 585#if EV_USE_EPOLL
462 if (ev_method == EVMETHOD_NONE) epoll_init (flags); 586 if (!ev_method && (methods & EVMETHOD_EPOLL )) epoll_init (methods);
587#endif
588#if EV_USE_POLL
589 if (!ev_method && (methods & EVMETHOD_POLL )) poll_init (methods);
463#endif 590#endif
464#if EV_USE_SELECT 591#if EV_USE_SELECT
465 if (ev_method == EVMETHOD_NONE) select_init (flags); 592 if (!ev_method && (methods & EVMETHOD_SELECT)) select_init (methods);
466#endif 593#endif
467 594
468 if (ev_method) 595 if (ev_method)
469 { 596 {
470 ev_watcher_init (&sigev, sigcb); 597 ev_watcher_init (&sigev, sigcb);
598 ev_set_priority (&sigev, EV_MAXPRI);
471 siginit (); 599 siginit ();
472 600
601#ifndef WIN32
473 ev_signal_init (&childev, childcb, SIGCHLD); 602 ev_signal_init (&childev, childcb, SIGCHLD);
603 ev_set_priority (&childev, EV_MAXPRI);
474 ev_signal_start (&childev); 604 ev_signal_start (&childev);
605#endif
475 } 606 }
476 } 607 }
477 608
478 return ev_method; 609 return ev_method;
479} 610}
480 611
481/*****************************************************************************/ 612/*****************************************************************************/
482 613
483void 614void
484ev_prefork (void) 615ev_fork_prepare (void)
485{ 616{
486 /* nop */ 617 /* nop */
487} 618}
488 619
489void 620void
490ev_postfork_parent (void) 621ev_fork_parent (void)
491{ 622{
492 /* nop */ 623 /* nop */
493} 624}
494 625
495void 626void
496ev_postfork_child (void) 627ev_fork_child (void)
497{ 628{
498#if EV_USE_EPOLL 629#if EV_USE_EPOLL
499 if (ev_method == EVMETHOD_EPOLL) 630 if (ev_method == EVMETHOD_EPOLL)
500 epoll_postfork_child (); 631 epoll_postfork_child ();
501#endif 632#endif
… …
510/*****************************************************************************/ 641/*****************************************************************************/
511 642
512static void 643static void
513call_pending (void) 644call_pending (void)
514{ 645{
646 int pri;
647
648 for (pri = NUMPRI; pri--; )
515 while (pendingcnt) 649 while (pendingcnt [pri])
516 { 650 {
517 ANPENDING *p = pendings + --pendingcnt; 651 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
518 652
519 if (p->w) 653 if (p->w)
520 { 654 {
521 p->w->pending = 0; 655 p->w->pending = 0;
522 p->w->cb (p->w, p->events); 656 p->w->cb (p->w, p->events);
523 } 657 }
524 } 658 }
525} 659}
526 660
527static void 661static void
528timers_reify (void) 662timers_reify (void)
529{ 663{
… …
532 struct ev_timer *w = timers [0]; 666 struct ev_timer *w = timers [0];
533 667
534 /* first reschedule or stop timer */ 668 /* first reschedule or stop timer */
535 if (w->repeat) 669 if (w->repeat)
536 { 670 {
671 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
537 w->at = now + w->repeat; 672 w->at = now + w->repeat;
538 assert (("timer timeout in the past, negative repeat?", w->at > now));
539 downheap ((WT *)timers, timercnt, 0); 673 downheap ((WT *)timers, timercnt, 0);
540 } 674 }
541 else 675 else
542 ev_timer_stop (w); /* nonrepeating: stop timer */ 676 ev_timer_stop (w); /* nonrepeating: stop timer */
543 677
… …
554 688
555 /* first reschedule or stop timer */ 689 /* first reschedule or stop timer */
556 if (w->interval) 690 if (w->interval)
557 { 691 {
558 w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval; 692 w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval;
559 assert (("periodic timeout in the past, negative interval?", w->at > ev_now)); 693 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > ev_now));
560 downheap ((WT *)periodics, periodiccnt, 0); 694 downheap ((WT *)periodics, periodiccnt, 0);
561 } 695 }
562 else 696 else
563 ev_periodic_stop (w); /* nonrepeating: stop timer */ 697 ev_periodic_stop (w); /* nonrepeating: stop timer */
564 698
565 event ((W)w, EV_TIMEOUT); 699 event ((W)w, EV_PERIODIC);
566 } 700 }
567} 701}
568 702
569static void 703static void
570periodics_reschedule (ev_tstamp diff) 704periodics_reschedule (ev_tstamp diff)
… …
589 } 723 }
590 } 724 }
591 } 725 }
592} 726}
593 727
728static int
729time_update_monotonic (void)
730{
731 now = get_clock ();
732
733 if (expect_true (now - now_floor < MIN_TIMEJUMP * .5))
734 {
735 ev_now = now + diff;
736 return 0;
737 }
738 else
739 {
740 now_floor = now;
741 ev_now = ev_time ();
742 return 1;
743 }
744}
745
594static void 746static void
595time_update (void) 747time_update (void)
596{ 748{
597 int i; 749 int i;
598 750
599 ev_now = ev_time (); 751#if EV_USE_MONOTONIC
600
601 if (have_monotonic) 752 if (expect_true (have_monotonic))
602 { 753 {
603 ev_tstamp odiff = diff; 754 if (time_update_monotonic ())
604
605 for (i = 4; --i; ) /* loop a few times, before making important decisions */
606 { 755 {
607 now = get_clock (); 756 ev_tstamp odiff = diff;
757
758 for (i = 4; --i; ) /* loop a few times, before making important decisions */
759 {
608 diff = ev_now - now; 760 diff = ev_now - now;
609 761
610 if (fabs (odiff - diff) < MIN_TIMEJUMP) 762 if (fabs (odiff - diff) < MIN_TIMEJUMP)
611 return; /* all is well */ 763 return; /* all is well */
612 764
613 ev_now = ev_time (); 765 ev_now = ev_time ();
766 now = get_clock ();
767 now_floor = now;
768 }
769
770 periodics_reschedule (diff - odiff);
771 /* no timer adjustment, as the monotonic clock doesn't jump */
614 } 772 }
615
616 periodics_reschedule (diff - odiff);
617 /* no timer adjustment, as the monotonic clock doesn't jump */
618 } 773 }
619 else 774 else
775#endif
620 { 776 {
777 ev_now = ev_time ();
778
621 if (now > ev_now || now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP) 779 if (expect_false (now > ev_now || now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
622 { 780 {
623 periodics_reschedule (ev_now - now); 781 periodics_reschedule (ev_now - now);
624 782
625 /* adjust timers. this is easy, as the offset is the same for all */ 783 /* adjust timers. this is easy, as the offset is the same for all */
626 for (i = 0; i < timercnt; ++i) 784 for (i = 0; i < timercnt; ++i)
… …
639 ev_loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 797 ev_loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
640 798
641 do 799 do
642 { 800 {
643 /* queue check watchers (and execute them) */ 801 /* queue check watchers (and execute them) */
644 if (preparecnt) 802 if (expect_false (preparecnt))
645 { 803 {
646 queue_events ((W *)prepares, preparecnt, EV_PREPARE); 804 queue_events ((W *)prepares, preparecnt, EV_PREPARE);
647 call_pending (); 805 call_pending ();
648 } 806 }
649 807
… …
652 810
653 /* calculate blocking time */ 811 /* calculate blocking time */
654 812
655 /* we only need this for !monotonic clockor timers, but as we basically 813 /* we only need this for !monotonic clockor timers, but as we basically
656 always have timers, we just calculate it always */ 814 always have timers, we just calculate it always */
815#if EV_USE_MONOTONIC
816 if (expect_true (have_monotonic))
817 time_update_monotonic ();
818 else
819#endif
820 {
657 ev_now = ev_time (); 821 ev_now = ev_time ();
822 now = ev_now;
823 }
658 824
659 if (flags & EVLOOP_NONBLOCK || idlecnt) 825 if (flags & EVLOOP_NONBLOCK || idlecnt)
660 block = 0.; 826 block = 0.;
661 else 827 else
662 { 828 {
663 block = MAX_BLOCKTIME; 829 block = MAX_BLOCKTIME;
664 830
665 if (timercnt) 831 if (timercnt)
666 { 832 {
667 ev_tstamp to = timers [0]->at - (have_monotonic ? get_clock () : ev_now) + method_fudge; 833 ev_tstamp to = timers [0]->at - now + method_fudge;
668 if (block > to) block = to; 834 if (block > to) block = to;
669 } 835 }
670 836
671 if (periodiccnt) 837 if (periodiccnt)
672 { 838 {
… …
725 head = &(*head)->next; 891 head = &(*head)->next;
726 } 892 }
727} 893}
728 894
729static void 895static void
730ev_clear (W w) 896ev_clear_pending (W w)
731{ 897{
732 if (w->pending) 898 if (w->pending)
733 { 899 {
734 pendings [w->pending - 1].w = 0; 900 pendings [ABSPRI (w)][w->pending - 1].w = 0;
735 w->pending = 0; 901 w->pending = 0;
736 } 902 }
737} 903}
738 904
739static void 905static void
740ev_start (W w, int active) 906ev_start (W w, int active)
741{ 907{
908 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI;
909 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
910
742 w->active = active; 911 w->active = active;
743} 912}
744 913
745static void 914static void
746ev_stop (W w) 915ev_stop (W w)
… …
751/*****************************************************************************/ 920/*****************************************************************************/
752 921
753void 922void
754ev_io_start (struct ev_io *w) 923ev_io_start (struct ev_io *w)
755{ 924{
925 int fd = w->fd;
926
756 if (ev_is_active (w)) 927 if (ev_is_active (w))
757 return; 928 return;
758 929
759 int fd = w->fd; 930 assert (("ev_io_start called with negative fd", fd >= 0));
760 931
761 ev_start ((W)w, 1); 932 ev_start ((W)w, 1);
762 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 933 array_needsize (anfds, anfdmax, fd + 1, anfds_init);
763 wlist_add ((WL *)&anfds[fd].head, (WL)w); 934 wlist_add ((WL *)&anfds[fd].head, (WL)w);
764 935
… …
766} 937}
767 938
768void 939void
769ev_io_stop (struct ev_io *w) 940ev_io_stop (struct ev_io *w)
770{ 941{
771 ev_clear ((W)w); 942 ev_clear_pending ((W)w);
772 if (!ev_is_active (w)) 943 if (!ev_is_active (w))
773 return; 944 return;
774 945
775 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 946 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
776 ev_stop ((W)w); 947 ev_stop ((W)w);
… …
784 if (ev_is_active (w)) 955 if (ev_is_active (w))
785 return; 956 return;
786 957
787 w->at += now; 958 w->at += now;
788 959
789 assert (("timer repeat value less than zero not allowed", w->repeat >= 0.)); 960 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
790 961
791 ev_start ((W)w, ++timercnt); 962 ev_start ((W)w, ++timercnt);
792 array_needsize (timers, timermax, timercnt, ); 963 array_needsize (timers, timermax, timercnt, );
793 timers [timercnt - 1] = w; 964 timers [timercnt - 1] = w;
794 upheap ((WT *)timers, timercnt - 1); 965 upheap ((WT *)timers, timercnt - 1);
795} 966}
796 967
797void 968void
798ev_timer_stop (struct ev_timer *w) 969ev_timer_stop (struct ev_timer *w)
799{ 970{
800 ev_clear ((W)w); 971 ev_clear_pending ((W)w);
801 if (!ev_is_active (w)) 972 if (!ev_is_active (w))
802 return; 973 return;
803 974
804 if (w->active < timercnt--) 975 if (w->active < timercnt--)
805 { 976 {
… …
833ev_periodic_start (struct ev_periodic *w) 1004ev_periodic_start (struct ev_periodic *w)
834{ 1005{
835 if (ev_is_active (w)) 1006 if (ev_is_active (w))
836 return; 1007 return;
837 1008
838 assert (("periodic interval value less than zero not allowed", w->interval >= 0.)); 1009 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
839 1010
840 /* this formula differs from the one in periodic_reify because we do not always round up */ 1011 /* this formula differs from the one in periodic_reify because we do not always round up */
841 if (w->interval) 1012 if (w->interval)
842 w->at += ceil ((ev_now - w->at) / w->interval) * w->interval; 1013 w->at += ceil ((ev_now - w->at) / w->interval) * w->interval;
843 1014
… …
848} 1019}
849 1020
850void 1021void
851ev_periodic_stop (struct ev_periodic *w) 1022ev_periodic_stop (struct ev_periodic *w)
852{ 1023{
853 ev_clear ((W)w); 1024 ev_clear_pending ((W)w);
854 if (!ev_is_active (w)) 1025 if (!ev_is_active (w))
855 return; 1026 return;
856 1027
857 if (w->active < periodiccnt--) 1028 if (w->active < periodiccnt--)
858 { 1029 {
… …
861 } 1032 }
862 1033
863 ev_stop ((W)w); 1034 ev_stop ((W)w);
864} 1035}
865 1036
1037#ifndef SA_RESTART
1038# define SA_RESTART 0
1039#endif
1040
866void 1041void
867ev_signal_start (struct ev_signal *w) 1042ev_signal_start (struct ev_signal *w)
868{ 1043{
869 if (ev_is_active (w)) 1044 if (ev_is_active (w))
870 return; 1045 return;
1046
1047 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
871 1048
872 ev_start ((W)w, 1); 1049 ev_start ((W)w, 1);
873 array_needsize (signals, signalmax, w->signum, signals_init); 1050 array_needsize (signals, signalmax, w->signum, signals_init);
874 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1051 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
875 1052
876 if (!w->next) 1053 if (!w->next)
877 { 1054 {
878 struct sigaction sa; 1055 struct sigaction sa;
879 sa.sa_handler = sighandler; 1056 sa.sa_handler = sighandler;
880 sigfillset (&sa.sa_mask); 1057 sigfillset (&sa.sa_mask);
881 sa.sa_flags = 0; 1058 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
882 sigaction (w->signum, &sa, 0); 1059 sigaction (w->signum, &sa, 0);
883 } 1060 }
884} 1061}
885 1062
886void 1063void
887ev_signal_stop (struct ev_signal *w) 1064ev_signal_stop (struct ev_signal *w)
888{ 1065{
889 ev_clear ((W)w); 1066 ev_clear_pending ((W)w);
890 if (!ev_is_active (w)) 1067 if (!ev_is_active (w))
891 return; 1068 return;
892 1069
893 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1070 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
894 ev_stop ((W)w); 1071 ev_stop ((W)w);
… …
909} 1086}
910 1087
911void 1088void
912ev_idle_stop (struct ev_idle *w) 1089ev_idle_stop (struct ev_idle *w)
913{ 1090{
914 ev_clear ((W)w); 1091 ev_clear_pending ((W)w);
915 if (ev_is_active (w)) 1092 if (ev_is_active (w))
916 return; 1093 return;
917 1094
918 idles [w->active - 1] = idles [--idlecnt]; 1095 idles [w->active - 1] = idles [--idlecnt];
919 ev_stop ((W)w); 1096 ev_stop ((W)w);
… …
931} 1108}
932 1109
933void 1110void
934ev_prepare_stop (struct ev_prepare *w) 1111ev_prepare_stop (struct ev_prepare *w)
935{ 1112{
936 ev_clear ((W)w); 1113 ev_clear_pending ((W)w);
937 if (ev_is_active (w)) 1114 if (ev_is_active (w))
938 return; 1115 return;
939 1116
940 prepares [w->active - 1] = prepares [--preparecnt]; 1117 prepares [w->active - 1] = prepares [--preparecnt];
941 ev_stop ((W)w); 1118 ev_stop ((W)w);
… …
953} 1130}
954 1131
955void 1132void
956ev_check_stop (struct ev_check *w) 1133ev_check_stop (struct ev_check *w)
957{ 1134{
958 ev_clear ((W)w); 1135 ev_clear_pending ((W)w);
959 if (ev_is_active (w)) 1136 if (ev_is_active (w))
960 return; 1137 return;
961 1138
962 checks [w->active - 1] = checks [--checkcnt]; 1139 checks [w->active - 1] = checks [--checkcnt];
963 ev_stop ((W)w); 1140 ev_stop ((W)w);
… …
974} 1151}
975 1152
976void 1153void
977ev_child_stop (struct ev_child *w) 1154ev_child_stop (struct ev_child *w)
978{ 1155{
979 ev_clear ((W)w); 1156 ev_clear_pending ((W)w);
980 if (ev_is_active (w)) 1157 if (ev_is_active (w))
981 return; 1158 return;
982 1159
983 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1160 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
984 ev_stop ((W)w); 1161 ev_stop ((W)w);

Diff Legend

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