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

Comparing libev/ev.c (file contents):
Revision 1.39 by root, Thu Nov 1 17:17:32 2007 UTC vs.
Revision 1.47 by root, Sat Nov 3 11:44:44 2007 UTC

… …
42#include <stdio.h> 42#include <stdio.h>
43 43
44#include <assert.h> 44#include <assert.h>
45#include <errno.h> 45#include <errno.h>
46#include <sys/types.h> 46#include <sys/types.h>
47#ifndef WIN32
47#include <sys/wait.h> 48# include <sys/wait.h>
49#endif
48#include <sys/time.h> 50#include <sys/time.h>
49#include <time.h> 51#include <time.h>
50 52
53/**/
54
51#ifndef EV_USE_MONOTONIC 55#ifndef EV_USE_MONOTONIC
52# define EV_USE_MONOTONIC 1 56# define EV_USE_MONOTONIC 1
53#endif 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/**/
54 80
55#ifndef CLOCK_MONOTONIC 81#ifndef CLOCK_MONOTONIC
56# undef EV_USE_MONOTONIC 82# undef EV_USE_MONOTONIC
57# define EV_USE_MONOTONIC 0 83# define EV_USE_MONOTONIC 0
58#endif 84#endif
59 85
60#ifndef EV_USE_SELECT
61# define EV_USE_SELECT 1
62#endif
63
64#ifndef EV_USE_EPOLL
65# define EV_USE_EPOLL 0
66#endif
67
68#ifndef CLOCK_REALTIME 86#ifndef CLOCK_REALTIME
87# undef EV_USE_REALTIME
69# define EV_USE_REALTIME 0 88# define EV_USE_REALTIME 0
70#endif 89#endif
71#ifndef EV_USE_REALTIME 90
72# define EV_USE_REALTIME 1 /* posix requirement, but might be slower */ 91/**/
73#endif
74 92
75#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) */
76#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) */
77#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 */
78#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 */
79 97
80#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)
81 113
82typedef struct ev_watcher *W; 114typedef struct ev_watcher *W;
83typedef struct ev_watcher_list *WL; 115typedef struct ev_watcher_list *WL;
84typedef struct ev_watcher_time *WT; 116typedef struct ev_watcher_time *WT;
85 117
86static ev_tstamp now, diff; /* monotonic clock */ 118static ev_tstamp now_floor, now, diff; /* monotonic clock */
87ev_tstamp ev_now; 119ev_tstamp ev_now;
88int ev_method; 120int ev_method;
89 121
90static int have_monotonic; /* runtime */ 122static int have_monotonic; /* runtime */
91 123
… …
111 143
112static ev_tstamp 144static ev_tstamp
113get_clock (void) 145get_clock (void)
114{ 146{
115#if EV_USE_MONOTONIC 147#if EV_USE_MONOTONIC
116 if (have_monotonic) 148 if (expect_true (have_monotonic))
117 { 149 {
118 struct timespec ts; 150 struct timespec ts;
119 clock_gettime (CLOCK_MONOTONIC, &ts); 151 clock_gettime (CLOCK_MONOTONIC, &ts);
120 return ts.tv_sec + ts.tv_nsec * 1e-9; 152 return ts.tv_sec + ts.tv_nsec * 1e-9;
121 } 153 }
… …
125} 157}
126 158
127#define array_roundsize(base,n) ((n) | 4 & ~3) 159#define array_roundsize(base,n) ((n) | 4 & ~3)
128 160
129#define array_needsize(base,cur,cnt,init) \ 161#define array_needsize(base,cur,cnt,init) \
130 if ((cnt) > cur) \ 162 if (expect_false ((cnt) > cur)) \
131 { \ 163 { \
132 int newcnt = cur; \ 164 int newcnt = cur; \
133 do \ 165 do \
134 { \ 166 { \
135 newcnt = array_roundsize (base, newcnt << 1); \ 167 newcnt = array_roundsize (base, newcnt << 1); \
… …
170{ 202{
171 W w; 203 W w;
172 int events; 204 int events;
173} ANPENDING; 205} ANPENDING;
174 206
175static ANPENDING *pendings; 207static ANPENDING *pendings [NUMPRI];
176static int pendingmax, pendingcnt; 208static int pendingmax [NUMPRI], pendingcnt [NUMPRI];
177 209
178static void 210static void
179event (W w, int events) 211event (W w, int events)
180{ 212{
181 if (w->pending) 213 if (w->pending)
182 { 214 {
183 pendings [w->pending - 1].events |= events; 215 pendings [ABSPRI (w)][w->pending - 1].events |= events;
184 return; 216 return;
185 } 217 }
186 218
187 w->pending = ++pendingcnt; 219 w->pending = ++pendingcnt [ABSPRI (w)];
188 array_needsize (pendings, pendingmax, pendingcnt, ); 220 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], );
189 pendings [pendingcnt - 1].w = w; 221 pendings [ABSPRI (w)][w->pending - 1].w = w;
190 pendings [pendingcnt - 1].events = events; 222 pendings [ABSPRI (w)][w->pending - 1].events = events;
191} 223}
192 224
193static void 225static void
194queue_events (W *events, int eventcnt, int type) 226queue_events (W *events, int eventcnt, int type)
195{ 227{
… …
258 ++fdchangecnt; 290 ++fdchangecnt;
259 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 291 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
260 fdchanges [fdchangecnt - 1] = fd; 292 fdchanges [fdchangecnt - 1] = fd;
261} 293}
262 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
263/* called on EBADF to verify fds */ 308/* called on EBADF to verify fds */
264static void 309static void
265fd_recheck (void) 310fd_ebadf (void)
266{ 311{
267 int fd; 312 int fd;
268 313
269 for (fd = 0; fd < anfdmax; ++fd) 314 for (fd = 0; fd < anfdmax; ++fd)
270 if (anfds [fd].events) 315 if (anfds [fd].events)
271 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 316 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF)
272 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)
273 { 328 {
274 ev_io_stop (anfds [fd].head); 329 close (fd);
275 event ((W)anfds [fd].head, EV_ERROR | EV_READ | EV_WRITE); 330 fd_kill (fd);
331 return;
276 } 332 }
277} 333}
278 334
279/*****************************************************************************/ 335/*****************************************************************************/
280 336
281static struct ev_timer **timers; 337static struct ev_timer **timers;
… …
384} 440}
385 441
386static void 442static void
387siginit (void) 443siginit (void)
388{ 444{
445#ifndef WIN32
389 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 446 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC);
390 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC); 447 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
391 448
392 /* rather than sort out wether we really need nb, set it */ 449 /* rather than sort out wether we really need nb, set it */
393 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK); 450 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
394 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK); 451 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
452#endif
395 453
396 ev_io_set (&sigev, sigpipe [0], EV_READ); 454 ev_io_set (&sigev, sigpipe [0], EV_READ);
397 ev_io_start (&sigev); 455 ev_io_start (&sigev);
398} 456}
399 457
… …
411/*****************************************************************************/ 469/*****************************************************************************/
412 470
413static struct ev_child *childs [PID_HASHSIZE]; 471static struct ev_child *childs [PID_HASHSIZE];
414static struct ev_signal childev; 472static struct ev_signal childev;
415 473
474#ifndef WIN32
475
416#ifndef WCONTINUED 476#ifndef WCONTINUED
417# define WCONTINUED 0 477# define WCONTINUED 0
418#endif 478#endif
419 479
420static void 480static void
481child_reap (struct ev_signal *sw, int chain, int pid, int status)
482{
483 struct ev_child *w;
484
485 for (w = childs [chain & (PID_HASHSIZE - 1)]; w; w = w->next)
486 if (w->pid == pid || !w->pid)
487 {
488 w->priority = sw->priority; /* need to do it *now* */
489 w->rpid = pid;
490 w->rstatus = status;
491 printf ("rpid %p %d %d\n", w, pid, w->pid);//D
492 event ((W)w, EV_CHILD);
493 }
494}
495
496static void
421childcb (struct ev_signal *sw, int revents) 497childcb (struct ev_signal *sw, int revents)
422{ 498{
423 struct ev_child *w;
424 int pid, status; 499 int pid, status;
425 500
501 printf ("chld %x\n", revents);//D
426 while ((pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)) != -1) 502 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
427 for (w = childs [pid & (PID_HASHSIZE - 1)]; w; w = w->next) 503 {
428 if (w->pid == pid || !w->pid) 504 /* make sure we are called again until all childs have been reaped */
429 {
430 w->status = status;
431 event ((W)w, EV_CHILD); 505 event ((W)sw, EV_SIGNAL);
432 } 506
507 child_reap (sw, pid, pid, status);
508 child_reap (sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */
509 }
433} 510}
511
512#endif
434 513
435/*****************************************************************************/ 514/*****************************************************************************/
436 515
516#if EV_USE_KQUEUE
517# include "ev_kqueue.c"
518#endif
437#if EV_USE_EPOLL 519#if EV_USE_EPOLL
438# include "ev_epoll.c" 520# include "ev_epoll.c"
439#endif 521#endif
522#if EV_USE_POLL
523# include "ev_poll.c"
524#endif
440#if EV_USE_SELECT 525#if EV_USE_SELECT
441# include "ev_select.c" 526# include "ev_select.c"
442#endif 527#endif
443 528
444int 529int
… …
451ev_version_minor (void) 536ev_version_minor (void)
452{ 537{
453 return EV_VERSION_MINOR; 538 return EV_VERSION_MINOR;
454} 539}
455 540
541/* return true if we are running with elevated privileges and ignore env variables */
542static int
543enable_secure ()
544{
545 return getuid () != geteuid ()
546 || getgid () != getegid ();
547}
548
456int ev_init (int flags) 549int ev_init (int methods)
457{ 550{
458 if (!ev_method) 551 if (!ev_method)
459 { 552 {
460#if EV_USE_MONOTONIC 553#if EV_USE_MONOTONIC
461 { 554 {
… …
463 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 556 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
464 have_monotonic = 1; 557 have_monotonic = 1;
465 } 558 }
466#endif 559#endif
467 560
468 ev_now = ev_time (); 561 ev_now = ev_time ();
469 now = get_clock (); 562 now = get_clock ();
563 now_floor = now;
470 diff = ev_now - now; 564 diff = ev_now - now;
471 565
472 if (pipe (sigpipe)) 566 if (pipe (sigpipe))
473 return 0; 567 return 0;
474 568
569 if (methods == EVMETHOD_AUTO)
570 if (!enable_secure () && getenv ("LIBEV_METHODS"))
571 methods = atoi (getenv ("LIBEV_METHODS"));
572 else
475 ev_method = EVMETHOD_NONE; 573 methods = EVMETHOD_ANY;
574
575 ev_method = 0;
576#if EV_USE_KQUEUE
577 if (!ev_method && (methods & EVMETHOD_KQUEUE)) kqueue_init (methods);
578#endif
476#if EV_USE_EPOLL 579#if EV_USE_EPOLL
477 if (ev_method == EVMETHOD_NONE) epoll_init (flags); 580 if (!ev_method && (methods & EVMETHOD_EPOLL )) epoll_init (methods);
581#endif
582#if EV_USE_POLL
583 if (!ev_method && (methods & EVMETHOD_POLL )) poll_init (methods);
478#endif 584#endif
479#if EV_USE_SELECT 585#if EV_USE_SELECT
480 if (ev_method == EVMETHOD_NONE) select_init (flags); 586 if (!ev_method && (methods & EVMETHOD_SELECT)) select_init (methods);
481#endif 587#endif
482 588
483 if (ev_method) 589 if (ev_method)
484 { 590 {
485 ev_watcher_init (&sigev, sigcb); 591 ev_watcher_init (&sigev, sigcb);
592 ev_set_priority (&sigev, EV_MAXPRI);
486 siginit (); 593 siginit ();
487 594
595#ifndef WIN32
488 ev_signal_init (&childev, childcb, SIGCHLD); 596 ev_signal_init (&childev, childcb, SIGCHLD);
597 ev_set_priority (&childev, EV_MAXPRI);
489 ev_signal_start (&childev); 598 ev_signal_start (&childev);
599#endif
490 } 600 }
491 } 601 }
492 602
493 return ev_method; 603 return ev_method;
494} 604}
… …
525/*****************************************************************************/ 635/*****************************************************************************/
526 636
527static void 637static void
528call_pending (void) 638call_pending (void)
529{ 639{
640 int pri;
641
642 for (pri = NUMPRI; pri--; )
530 while (pendingcnt) 643 while (pendingcnt [pri])
531 { 644 {
532 ANPENDING *p = pendings + --pendingcnt; 645 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
533 646
534 if (p->w) 647 if (p->w)
535 { 648 {
536 p->w->pending = 0; 649 p->w->pending = 0;
537 p->w->cb (p->w, p->events); 650 p->w->cb (p->w, p->events);
538 } 651 }
539 } 652 }
540} 653}
541 654
542static void 655static void
543timers_reify (void) 656timers_reify (void)
544{ 657{
… …
604 } 717 }
605 } 718 }
606 } 719 }
607} 720}
608 721
722static int
723time_update_monotonic (void)
724{
725 now = get_clock ();
726
727 if (expect_true (now - now_floor < MIN_TIMEJUMP * .5))
728 {
729 ev_now = now + diff;
730 return 0;
731 }
732 else
733 {
734 now_floor = now;
735 ev_now = ev_time ();
736 return 1;
737 }
738}
739
609static void 740static void
610time_update (void) 741time_update (void)
611{ 742{
612 int i; 743 int i;
613 744
614 ev_now = ev_time (); 745#if EV_USE_MONOTONIC
615
616 if (have_monotonic) 746 if (expect_true (have_monotonic))
617 { 747 {
618 ev_tstamp odiff = diff; 748 if (time_update_monotonic ())
619
620 for (i = 4; --i; ) /* loop a few times, before making important decisions */
621 { 749 {
622 now = get_clock (); 750 ev_tstamp odiff = diff;
751
752 for (i = 4; --i; ) /* loop a few times, before making important decisions */
753 {
623 diff = ev_now - now; 754 diff = ev_now - now;
624 755
625 if (fabs (odiff - diff) < MIN_TIMEJUMP) 756 if (fabs (odiff - diff) < MIN_TIMEJUMP)
626 return; /* all is well */ 757 return; /* all is well */
627 758
628 ev_now = ev_time (); 759 ev_now = ev_time ();
760 now = get_clock ();
761 now_floor = now;
762 }
763
764 periodics_reschedule (diff - odiff);
765 /* no timer adjustment, as the monotonic clock doesn't jump */
629 } 766 }
630
631 periodics_reschedule (diff - odiff);
632 /* no timer adjustment, as the monotonic clock doesn't jump */
633 } 767 }
634 else 768 else
769#endif
635 { 770 {
771 ev_now = ev_time ();
772
636 if (now > ev_now || now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP) 773 if (expect_false (now > ev_now || now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
637 { 774 {
638 periodics_reschedule (ev_now - now); 775 periodics_reschedule (ev_now - now);
639 776
640 /* adjust timers. this is easy, as the offset is the same for all */ 777 /* adjust timers. this is easy, as the offset is the same for all */
641 for (i = 0; i < timercnt; ++i) 778 for (i = 0; i < timercnt; ++i)
… …
654 ev_loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 791 ev_loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
655 792
656 do 793 do
657 { 794 {
658 /* queue check watchers (and execute them) */ 795 /* queue check watchers (and execute them) */
659 if (preparecnt) 796 if (expect_false (preparecnt))
660 { 797 {
661 queue_events ((W *)prepares, preparecnt, EV_PREPARE); 798 queue_events ((W *)prepares, preparecnt, EV_PREPARE);
662 call_pending (); 799 call_pending ();
663 } 800 }
664 801
… …
667 804
668 /* calculate blocking time */ 805 /* calculate blocking time */
669 806
670 /* we only need this for !monotonic clockor timers, but as we basically 807 /* we only need this for !monotonic clockor timers, but as we basically
671 always have timers, we just calculate it always */ 808 always have timers, we just calculate it always */
809#if EV_USE_MONOTONIC
810 if (expect_true (have_monotonic))
811 time_update_monotonic ();
812 else
813#endif
814 {
672 ev_now = ev_time (); 815 ev_now = ev_time ();
816 now = ev_now;
817 }
673 818
674 if (flags & EVLOOP_NONBLOCK || idlecnt) 819 if (flags & EVLOOP_NONBLOCK || idlecnt)
675 block = 0.; 820 block = 0.;
676 else 821 else
677 { 822 {
678 block = MAX_BLOCKTIME; 823 block = MAX_BLOCKTIME;
679 824
680 if (timercnt) 825 if (timercnt)
681 { 826 {
682 ev_tstamp to = timers [0]->at - (have_monotonic ? get_clock () : ev_now) + method_fudge; 827 ev_tstamp to = timers [0]->at - now + method_fudge;
683 if (block > to) block = to; 828 if (block > to) block = to;
684 } 829 }
685 830
686 if (periodiccnt) 831 if (periodiccnt)
687 { 832 {
… …
744static void 889static void
745ev_clear_pending (W w) 890ev_clear_pending (W w)
746{ 891{
747 if (w->pending) 892 if (w->pending)
748 { 893 {
749 pendings [w->pending - 1].w = 0; 894 pendings [ABSPRI (w)][w->pending - 1].w = 0;
750 w->pending = 0; 895 w->pending = 0;
751 } 896 }
752} 897}
753 898
754static void 899static void
755ev_start (W w, int active) 900ev_start (W w, int active)
756{ 901{
902 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI;
903 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
904
757 w->active = active; 905 w->active = active;
758} 906}
759 907
760static void 908static void
761ev_stop (W w) 909ev_stop (W w)
… …
878 } 1026 }
879 1027
880 ev_stop ((W)w); 1028 ev_stop ((W)w);
881} 1029}
882 1030
1031#ifndef SA_RESTART
1032# define SA_RESTART 0
1033#endif
1034
883void 1035void
884ev_signal_start (struct ev_signal *w) 1036ev_signal_start (struct ev_signal *w)
885{ 1037{
886 if (ev_is_active (w)) 1038 if (ev_is_active (w))
887 return; 1039 return;
… …
895 if (!w->next) 1047 if (!w->next)
896 { 1048 {
897 struct sigaction sa; 1049 struct sigaction sa;
898 sa.sa_handler = sighandler; 1050 sa.sa_handler = sighandler;
899 sigfillset (&sa.sa_mask); 1051 sigfillset (&sa.sa_mask);
900 sa.sa_flags = 0; 1052 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
901 sigaction (w->signum, &sa, 0); 1053 sigaction (w->signum, &sa, 0);
902 } 1054 }
903} 1055}
904 1056
905void 1057void

Diff Legend

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