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

Comparing libev/ev.c (file contents):
Revision 1.115 by root, Wed Nov 14 04:53:21 2007 UTC vs.
Revision 1.132 by root, Fri Nov 23 10:36:30 2007 UTC

… …
41# define EV_USE_MONOTONIC 1 41# define EV_USE_MONOTONIC 1
42# endif 42# endif
43# ifndef EV_USE_REALTIME 43# ifndef EV_USE_REALTIME
44# define EV_USE_REALTIME 1 44# define EV_USE_REALTIME 1
45# endif 45# endif
46# else
47# ifndef EV_USE_MONOTONIC
48# define EV_USE_MONOTONIC 0
49# endif
50# ifndef EV_USE_REALTIME
51# define EV_USE_REALTIME 0
52# endif
46# endif 53# endif
47 54
48# if HAVE_SELECT && HAVE_SYS_SELECT_H && !defined (EV_USE_SELECT) 55# ifndef EV_USE_SELECT
56# if HAVE_SELECT && HAVE_SYS_SELECT_H
49# define EV_USE_SELECT 1 57# define EV_USE_SELECT 1
58# else
59# define EV_USE_SELECT 0
60# endif
50# endif 61# endif
51 62
52# if HAVE_POLL && HAVE_POLL_H && !defined (EV_USE_POLL) 63# ifndef EV_USE_POLL
64# if HAVE_POLL && HAVE_POLL_H
53# define EV_USE_POLL 1 65# define EV_USE_POLL 1
66# else
67# define EV_USE_POLL 0
68# endif
54# endif 69# endif
55 70
56# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H && !defined (EV_USE_EPOLL) 71# ifndef EV_USE_EPOLL
72# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
57# define EV_USE_EPOLL 1 73# define EV_USE_EPOLL 1
74# else
75# define EV_USE_EPOLL 0
76# endif
58# endif 77# endif
59 78
79# ifndef EV_USE_KQUEUE
60# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE) 80# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
61# define EV_USE_KQUEUE 1 81# define EV_USE_KQUEUE 1
82# else
83# define EV_USE_KQUEUE 0
84# endif
85# endif
86
87# ifndef EV_USE_PORT
88# if HAVE_PORT_H && HAVE_PORT_CREATE
89# define EV_USE_PORT 1
90# else
91# define EV_USE_PORT 0
92# endif
62# endif 93# endif
63 94
64#endif 95#endif
65 96
66#include <math.h> 97#include <math.h>
… …
90#endif 121#endif
91 122
92/**/ 123/**/
93 124
94#ifndef EV_USE_MONOTONIC 125#ifndef EV_USE_MONOTONIC
95# define EV_USE_MONOTONIC 1 126# define EV_USE_MONOTONIC 0
127#endif
128
129#ifndef EV_USE_REALTIME
130# define EV_USE_REALTIME 0
96#endif 131#endif
97 132
98#ifndef EV_USE_SELECT 133#ifndef EV_USE_SELECT
99# define EV_USE_SELECT 1 134# define EV_USE_SELECT 1
100# define EV_SELECT_USE_FD_SET 1
101#endif 135#endif
102 136
103#ifndef EV_USE_POLL 137#ifndef EV_USE_POLL
104# ifdef _WIN32 138# ifdef _WIN32
105# define EV_USE_POLL 0 139# define EV_USE_POLL 0
… …
114 148
115#ifndef EV_USE_KQUEUE 149#ifndef EV_USE_KQUEUE
116# define EV_USE_KQUEUE 0 150# define EV_USE_KQUEUE 0
117#endif 151#endif
118 152
119#ifndef EV_USE_REALTIME 153#ifndef EV_USE_PORT
120# define EV_USE_REALTIME 1 154# define EV_USE_PORT 0
121#endif 155#endif
122 156
123/**/ 157/**/
124
125/* darwin simply cannot be helped */
126#ifdef __APPLE__
127# undef EV_USE_POLL
128# undef EV_USE_KQUEUE
129#endif
130 158
131#ifndef CLOCK_MONOTONIC 159#ifndef CLOCK_MONOTONIC
132# undef EV_USE_MONOTONIC 160# undef EV_USE_MONOTONIC
133# define EV_USE_MONOTONIC 0 161# define EV_USE_MONOTONIC 0
134#endif 162#endif
… …
143#endif 171#endif
144 172
145/**/ 173/**/
146 174
147#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 175#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
148#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */ 176#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
149#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */ 177#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
150/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */ 178/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
151 179
152#ifdef EV_H 180#ifdef EV_H
153# include EV_H 181# include EV_H
154#else 182#else
155# include "ev.h" 183# include "ev.h"
156#endif 184#endif
157 185
158#if __GNUC__ >= 3 186#if __GNUC__ >= 3
159# define expect(expr,value) __builtin_expect ((expr),(value)) 187# define expect(expr,value) __builtin_expect ((expr),(value))
160# define inline inline 188# define inline static inline
161#else 189#else
162# define expect(expr,value) (expr) 190# define expect(expr,value) (expr)
163# define inline static 191# define inline static
164#endif 192#endif
165 193
… …
258 #include "ev_vars.h" 286 #include "ev_vars.h"
259 #undef VAR 287 #undef VAR
260 }; 288 };
261 #include "ev_wrap.h" 289 #include "ev_wrap.h"
262 290
263 struct ev_loop default_loop_struct; 291 static struct ev_loop default_loop_struct;
264 static struct ev_loop *default_loop; 292 struct ev_loop *ev_default_loop_ptr;
265 293
266#else 294#else
267 295
268 ev_tstamp ev_rt_now; 296 ev_tstamp ev_rt_now;
269 #define VAR(name,decl) static decl; 297 #define VAR(name,decl) static decl;
270 #include "ev_vars.h" 298 #include "ev_vars.h"
271 #undef VAR 299 #undef VAR
272 300
273 static int default_loop; 301 static int ev_default_loop_ptr;
274 302
275#endif 303#endif
276 304
277/*****************************************************************************/ 305/*****************************************************************************/
278 306
… …
359void 387void
360ev_feed_event (EV_P_ void *w, int revents) 388ev_feed_event (EV_P_ void *w, int revents)
361{ 389{
362 W w_ = (W)w; 390 W w_ = (W)w;
363 391
364 if (w_->pending) 392 if (expect_false (w_->pending))
365 { 393 {
366 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 394 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
367 return; 395 return;
368 } 396 }
369 397
… …
403 fd_event (EV_A_ fd, revents); 431 fd_event (EV_A_ fd, revents);
404} 432}
405 433
406/*****************************************************************************/ 434/*****************************************************************************/
407 435
408static void 436inline void
409fd_reify (EV_P) 437fd_reify (EV_P)
410{ 438{
411 int i; 439 int i;
412 440
413 for (i = 0; i < fdchangecnt; ++i) 441 for (i = 0; i < fdchangecnt; ++i)
… …
430 } 458 }
431#endif 459#endif
432 460
433 anfd->reify = 0; 461 anfd->reify = 0;
434 462
435 method_modify (EV_A_ fd, anfd->events, events); 463 backend_modify (EV_A_ fd, anfd->events, events);
436 anfd->events = events; 464 anfd->events = events;
437 } 465 }
438 466
439 fdchangecnt = 0; 467 fdchangecnt = 0;
440} 468}
441 469
442static void 470static void
443fd_change (EV_P_ int fd) 471fd_change (EV_P_ int fd)
444{ 472{
445 if (anfds [fd].reify) 473 if (expect_false (anfds [fd].reify))
446 return; 474 return;
447 475
448 anfds [fd].reify = 1; 476 anfds [fd].reify = 1;
449 477
450 ++fdchangecnt; 478 ++fdchangecnt;
… …
462 ev_io_stop (EV_A_ w); 490 ev_io_stop (EV_A_ w);
463 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 491 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
464 } 492 }
465} 493}
466 494
467static int 495inline int
468fd_valid (int fd) 496fd_valid (int fd)
469{ 497{
470#ifdef _WIN32 498#ifdef _WIN32
471 return _get_osfhandle (fd) != -1; 499 return _get_osfhandle (fd) != -1;
472#else 500#else
… …
498 fd_kill (EV_A_ fd); 526 fd_kill (EV_A_ fd);
499 return; 527 return;
500 } 528 }
501} 529}
502 530
503/* usually called after fork if method needs to re-arm all fds from scratch */ 531/* usually called after fork if backend needs to re-arm all fds from scratch */
504static void 532static void
505fd_rearm_all (EV_P) 533fd_rearm_all (EV_P)
506{ 534{
507 int fd; 535 int fd;
508 536
… …
614ev_feed_signal_event (EV_P_ int signum) 642ev_feed_signal_event (EV_P_ int signum)
615{ 643{
616 WL w; 644 WL w;
617 645
618#if EV_MULTIPLICITY 646#if EV_MULTIPLICITY
619 assert (("feeding signal events is only supported in the default loop", loop == default_loop)); 647 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
620#endif 648#endif
621 649
622 --signum; 650 --signum;
623 651
624 if (signum < 0 || signum >= signalmax) 652 if (signum < 0 || signum >= signalmax)
… …
641 for (signum = signalmax; signum--; ) 669 for (signum = signalmax; signum--; )
642 if (signals [signum].gotsig) 670 if (signals [signum].gotsig)
643 ev_feed_signal_event (EV_A_ signum + 1); 671 ev_feed_signal_event (EV_A_ signum + 1);
644} 672}
645 673
646inline void 674static void
647fd_intern (int fd) 675fd_intern (int fd)
648{ 676{
649#ifdef _WIN32 677#ifdef _WIN32
650 int arg = 1; 678 int arg = 1;
651 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 679 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
699 int pid, status; 727 int pid, status;
700 728
701 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 729 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
702 { 730 {
703 /* make sure we are called again until all childs have been reaped */ 731 /* make sure we are called again until all childs have been reaped */
732 /* we need to do it this way so that the callback gets called before we continue */
704 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 733 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
705 734
706 child_reap (EV_A_ sw, pid, pid, status); 735 child_reap (EV_A_ sw, pid, pid, status);
707 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */ 736 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
708 } 737 }
709} 738}
710 739
711#endif 740#endif
712 741
713/*****************************************************************************/ 742/*****************************************************************************/
714 743
744#if EV_USE_PORT
745# include "ev_port.c"
746#endif
715#if EV_USE_KQUEUE 747#if EV_USE_KQUEUE
716# include "ev_kqueue.c" 748# include "ev_kqueue.c"
717#endif 749#endif
718#if EV_USE_EPOLL 750#if EV_USE_EPOLL
719# include "ev_epoll.c" 751# include "ev_epoll.c"
… …
748 || getgid () != getegid (); 780 || getgid () != getegid ();
749#endif 781#endif
750} 782}
751 783
752unsigned int 784unsigned int
753ev_method (EV_P) 785ev_supported_backends (void)
754{ 786{
755 return method; 787 unsigned int flags = 0;
788
789 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
790 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE;
791 if (EV_USE_EPOLL ) flags |= EVBACKEND_EPOLL;
792 if (EV_USE_POLL ) flags |= EVBACKEND_POLL;
793 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
794
795 return flags;
796}
797
798unsigned int
799ev_recommended_backends (void)
800{
801 unsigned int flags = ev_supported_backends ();
802
803#ifndef __NetBSD__
804 /* kqueue is borked on everything but netbsd apparently */
805 /* it usually doesn't work correctly on anything but sockets and pipes */
806 flags &= ~EVBACKEND_KQUEUE;
807#endif
808#ifdef __APPLE__
809 // flags &= ~EVBACKEND_KQUEUE; for documentation
810 flags &= ~EVBACKEND_POLL;
811#endif
812
813 return flags;
814}
815
816unsigned int
817ev_backend (EV_P)
818{
819 return backend;
756} 820}
757 821
758static void 822static void
759loop_init (EV_P_ unsigned int flags) 823loop_init (EV_P_ unsigned int flags)
760{ 824{
761 if (!method) 825 if (!backend)
762 { 826 {
763#if EV_USE_MONOTONIC 827#if EV_USE_MONOTONIC
764 { 828 {
765 struct timespec ts; 829 struct timespec ts;
766 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 830 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
… …
771 ev_rt_now = ev_time (); 835 ev_rt_now = ev_time ();
772 mn_now = get_clock (); 836 mn_now = get_clock ();
773 now_floor = mn_now; 837 now_floor = mn_now;
774 rtmn_diff = ev_rt_now - mn_now; 838 rtmn_diff = ev_rt_now - mn_now;
775 839
776 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS")) 840 if (!(flags & EVFLAG_NOENV)
841 && !enable_secure ()
842 && getenv ("LIBEV_FLAGS"))
777 flags = atoi (getenv ("LIBEV_FLAGS")); 843 flags = atoi (getenv ("LIBEV_FLAGS"));
778 844
779 if (!(flags & 0x0000ffff)) 845 if (!(flags & 0x0000ffffUL))
780 flags |= 0x0000ffff; 846 flags |= ev_recommended_backends ();
781 847
782 method = 0; 848 backend = 0;
849#if EV_USE_PORT
850 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
851#endif
783#if EV_USE_KQUEUE 852#if EV_USE_KQUEUE
784 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags); 853 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
785#endif 854#endif
786#if EV_USE_EPOLL 855#if EV_USE_EPOLL
787 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags); 856 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
788#endif 857#endif
789#if EV_USE_POLL 858#if EV_USE_POLL
790 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags); 859 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
791#endif 860#endif
792#if EV_USE_SELECT 861#if EV_USE_SELECT
793 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags); 862 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
794#endif 863#endif
795 864
796 ev_init (&sigev, sigcb); 865 ev_init (&sigev, sigcb);
797 ev_set_priority (&sigev, EV_MAXPRI); 866 ev_set_priority (&sigev, EV_MAXPRI);
798 } 867 }
799} 868}
800 869
801void 870static void
802loop_destroy (EV_P) 871loop_destroy (EV_P)
803{ 872{
804 int i; 873 int i;
805 874
875#if EV_USE_PORT
876 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
877#endif
806#if EV_USE_KQUEUE 878#if EV_USE_KQUEUE
807 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 879 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
808#endif 880#endif
809#if EV_USE_EPOLL 881#if EV_USE_EPOLL
810 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 882 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
811#endif 883#endif
812#if EV_USE_POLL 884#if EV_USE_POLL
813 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 885 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
814#endif 886#endif
815#if EV_USE_SELECT 887#if EV_USE_SELECT
816 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 888 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
817#endif 889#endif
818 890
819 for (i = NUMPRI; i--; ) 891 for (i = NUMPRI; i--; )
820 array_free (pending, [i]); 892 array_free (pending, [i]);
821 893
… …
827#endif 899#endif
828 array_free (idle, EMPTY0); 900 array_free (idle, EMPTY0);
829 array_free (prepare, EMPTY0); 901 array_free (prepare, EMPTY0);
830 array_free (check, EMPTY0); 902 array_free (check, EMPTY0);
831 903
832 method = 0; 904 backend = 0;
833} 905}
834 906
835static void 907static void
836loop_fork (EV_P) 908loop_fork (EV_P)
837{ 909{
910#if EV_USE_PORT
911 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
912#endif
913#if EV_USE_KQUEUE
914 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
915#endif
838#if EV_USE_EPOLL 916#if EV_USE_EPOLL
839 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 917 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
840#endif
841#if EV_USE_KQUEUE
842 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
843#endif 918#endif
844 919
845 if (ev_is_active (&sigev)) 920 if (ev_is_active (&sigev))
846 { 921 {
847 /* default loop */ 922 /* default loop */
… …
868 943
869 memset (loop, 0, sizeof (struct ev_loop)); 944 memset (loop, 0, sizeof (struct ev_loop));
870 945
871 loop_init (EV_A_ flags); 946 loop_init (EV_A_ flags);
872 947
873 if (ev_method (EV_A)) 948 if (ev_backend (EV_A))
874 return loop; 949 return loop;
875 950
876 return 0; 951 return 0;
877} 952}
878 953
… …
891 966
892#endif 967#endif
893 968
894#if EV_MULTIPLICITY 969#if EV_MULTIPLICITY
895struct ev_loop * 970struct ev_loop *
971ev_default_loop_init (unsigned int flags)
896#else 972#else
897int 973int
898#endif
899ev_default_loop (unsigned int flags) 974ev_default_loop (unsigned int flags)
975#endif
900{ 976{
901 if (sigpipe [0] == sigpipe [1]) 977 if (sigpipe [0] == sigpipe [1])
902 if (pipe (sigpipe)) 978 if (pipe (sigpipe))
903 return 0; 979 return 0;
904 980
905 if (!default_loop) 981 if (!ev_default_loop_ptr)
906 { 982 {
907#if EV_MULTIPLICITY 983#if EV_MULTIPLICITY
908 struct ev_loop *loop = default_loop = &default_loop_struct; 984 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
909#else 985#else
910 default_loop = 1; 986 ev_default_loop_ptr = 1;
911#endif 987#endif
912 988
913 loop_init (EV_A_ flags); 989 loop_init (EV_A_ flags);
914 990
915 if (ev_method (EV_A)) 991 if (ev_backend (EV_A))
916 { 992 {
917 siginit (EV_A); 993 siginit (EV_A);
918 994
919#ifndef _WIN32 995#ifndef _WIN32
920 ev_signal_init (&childev, childcb, SIGCHLD); 996 ev_signal_init (&childev, childcb, SIGCHLD);
… …
922 ev_signal_start (EV_A_ &childev); 998 ev_signal_start (EV_A_ &childev);
923 ev_unref (EV_A); /* child watcher should not keep loop alive */ 999 ev_unref (EV_A); /* child watcher should not keep loop alive */
924#endif 1000#endif
925 } 1001 }
926 else 1002 else
927 default_loop = 0; 1003 ev_default_loop_ptr = 0;
928 } 1004 }
929 1005
930 return default_loop; 1006 return ev_default_loop_ptr;
931} 1007}
932 1008
933void 1009void
934ev_default_destroy (void) 1010ev_default_destroy (void)
935{ 1011{
936#if EV_MULTIPLICITY 1012#if EV_MULTIPLICITY
937 struct ev_loop *loop = default_loop; 1013 struct ev_loop *loop = ev_default_loop_ptr;
938#endif 1014#endif
939 1015
940#ifndef _WIN32 1016#ifndef _WIN32
941 ev_ref (EV_A); /* child watcher */ 1017 ev_ref (EV_A); /* child watcher */
942 ev_signal_stop (EV_A_ &childev); 1018 ev_signal_stop (EV_A_ &childev);
… …
953 1029
954void 1030void
955ev_default_fork (void) 1031ev_default_fork (void)
956{ 1032{
957#if EV_MULTIPLICITY 1033#if EV_MULTIPLICITY
958 struct ev_loop *loop = default_loop; 1034 struct ev_loop *loop = ev_default_loop_ptr;
959#endif 1035#endif
960 1036
961 if (method) 1037 if (backend)
962 postfork = 1; 1038 postfork = 1;
963} 1039}
964 1040
965/*****************************************************************************/ 1041/*****************************************************************************/
966 1042
… …
974 return 1; 1050 return 1;
975 1051
976 return 0; 1052 return 0;
977} 1053}
978 1054
979static void 1055inline void
980call_pending (EV_P) 1056call_pending (EV_P)
981{ 1057{
982 int pri; 1058 int pri;
983 1059
984 for (pri = NUMPRI; pri--; ) 1060 for (pri = NUMPRI; pri--; )
985 while (pendingcnt [pri]) 1061 while (pendingcnt [pri])
986 { 1062 {
987 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1063 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
988 1064
989 if (p->w) 1065 if (expect_true (p->w))
990 { 1066 {
991 p->w->pending = 0; 1067 p->w->pending = 0;
992 EV_CB_INVOKE (p->w, p->events); 1068 EV_CB_INVOKE (p->w, p->events);
993 } 1069 }
994 } 1070 }
995} 1071}
996 1072
997static void 1073inline void
998timers_reify (EV_P) 1074timers_reify (EV_P)
999{ 1075{
1000 while (timercnt && ((WT)timers [0])->at <= mn_now) 1076 while (timercnt && ((WT)timers [0])->at <= mn_now)
1001 { 1077 {
1002 struct ev_timer *w = timers [0]; 1078 struct ev_timer *w = timers [0];
… …
1020 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1096 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1021 } 1097 }
1022} 1098}
1023 1099
1024#if EV_PERIODICS 1100#if EV_PERIODICS
1025static void 1101inline void
1026periodics_reify (EV_P) 1102periodics_reify (EV_P)
1027{ 1103{
1028 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1104 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1029 { 1105 {
1030 struct ev_periodic *w = periodics [0]; 1106 struct ev_periodic *w = periodics [0];
… …
1089 ev_rt_now = ev_time (); 1165 ev_rt_now = ev_time ();
1090 return 1; 1166 return 1;
1091 } 1167 }
1092} 1168}
1093 1169
1094static void 1170inline void
1095time_update (EV_P) 1171time_update (EV_P)
1096{ 1172{
1097 int i; 1173 int i;
1098 1174
1099#if EV_USE_MONOTONIC 1175#if EV_USE_MONOTONIC
… …
1198 { 1274 {
1199 block = MAX_BLOCKTIME; 1275 block = MAX_BLOCKTIME;
1200 1276
1201 if (timercnt) 1277 if (timercnt)
1202 { 1278 {
1203 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1279 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1204 if (block > to) block = to; 1280 if (block > to) block = to;
1205 } 1281 }
1206 1282
1207#if EV_PERIODICS 1283#if EV_PERIODICS
1208 if (periodiccnt) 1284 if (periodiccnt)
1209 { 1285 {
1210 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1286 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1211 if (block > to) block = to; 1287 if (block > to) block = to;
1212 } 1288 }
1213#endif 1289#endif
1214 1290
1215 if (block < 0.) block = 0.; 1291 if (expect_false (block < 0.)) block = 0.;
1216 } 1292 }
1217 1293
1218 method_poll (EV_A_ block); 1294 backend_poll (EV_A_ block);
1219 1295
1220 /* update ev_rt_now, do magic */ 1296 /* update ev_rt_now, do magic */
1221 time_update (EV_A); 1297 time_update (EV_A);
1222 1298
1223 /* queue pending timers and reschedule them */ 1299 /* queue pending timers and reschedule them */
… …
1229 /* queue idle watchers unless io or timers are pending */ 1305 /* queue idle watchers unless io or timers are pending */
1230 if (idlecnt && !any_pending (EV_A)) 1306 if (idlecnt && !any_pending (EV_A))
1231 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1307 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1232 1308
1233 /* queue check watchers, to be executed first */ 1309 /* queue check watchers, to be executed first */
1234 if (checkcnt) 1310 if (expect_false (checkcnt))
1235 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1311 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1236 1312
1237 call_pending (EV_A); 1313 call_pending (EV_A);
1238 1314
1239 if (loop_done) 1315 if (expect_false (loop_done))
1240 break; 1316 break;
1241 } 1317 }
1242 1318
1243 if (loop_done != 2) 1319 if (loop_done != 2)
1244 loop_done = 0; 1320 loop_done = 0;
… …
1306void 1382void
1307ev_io_start (EV_P_ struct ev_io *w) 1383ev_io_start (EV_P_ struct ev_io *w)
1308{ 1384{
1309 int fd = w->fd; 1385 int fd = w->fd;
1310 1386
1311 if (ev_is_active (w)) 1387 if (expect_false (ev_is_active (w)))
1312 return; 1388 return;
1313 1389
1314 assert (("ev_io_start called with negative fd", fd >= 0)); 1390 assert (("ev_io_start called with negative fd", fd >= 0));
1315 1391
1316 ev_start (EV_A_ (W)w, 1); 1392 ev_start (EV_A_ (W)w, 1);
… …
1322 1398
1323void 1399void
1324ev_io_stop (EV_P_ struct ev_io *w) 1400ev_io_stop (EV_P_ struct ev_io *w)
1325{ 1401{
1326 ev_clear_pending (EV_A_ (W)w); 1402 ev_clear_pending (EV_A_ (W)w);
1327 if (!ev_is_active (w)) 1403 if (expect_false (!ev_is_active (w)))
1328 return; 1404 return;
1329 1405
1330 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1406 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1331 1407
1332 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1408 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
… …
1336} 1412}
1337 1413
1338void 1414void
1339ev_timer_start (EV_P_ struct ev_timer *w) 1415ev_timer_start (EV_P_ struct ev_timer *w)
1340{ 1416{
1341 if (ev_is_active (w)) 1417 if (expect_false (ev_is_active (w)))
1342 return; 1418 return;
1343 1419
1344 ((WT)w)->at += mn_now; 1420 ((WT)w)->at += mn_now;
1345 1421
1346 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1422 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
… …
1355 1431
1356void 1432void
1357ev_timer_stop (EV_P_ struct ev_timer *w) 1433ev_timer_stop (EV_P_ struct ev_timer *w)
1358{ 1434{
1359 ev_clear_pending (EV_A_ (W)w); 1435 ev_clear_pending (EV_A_ (W)w);
1360 if (!ev_is_active (w)) 1436 if (expect_false (!ev_is_active (w)))
1361 return; 1437 return;
1362 1438
1363 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1439 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1364 1440
1365 if (((W)w)->active < timercnt--) 1441 if (expect_true (((W)w)->active < timercnt--))
1366 { 1442 {
1367 timers [((W)w)->active - 1] = timers [timercnt]; 1443 timers [((W)w)->active - 1] = timers [timercnt];
1368 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1444 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1369 } 1445 }
1370 1446
… …
1395 1471
1396#if EV_PERIODICS 1472#if EV_PERIODICS
1397void 1473void
1398ev_periodic_start (EV_P_ struct ev_periodic *w) 1474ev_periodic_start (EV_P_ struct ev_periodic *w)
1399{ 1475{
1400 if (ev_is_active (w)) 1476 if (expect_false (ev_is_active (w)))
1401 return; 1477 return;
1402 1478
1403 if (w->reschedule_cb) 1479 if (w->reschedule_cb)
1404 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1480 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1405 else if (w->interval) 1481 else if (w->interval)
… …
1419 1495
1420void 1496void
1421ev_periodic_stop (EV_P_ struct ev_periodic *w) 1497ev_periodic_stop (EV_P_ struct ev_periodic *w)
1422{ 1498{
1423 ev_clear_pending (EV_A_ (W)w); 1499 ev_clear_pending (EV_A_ (W)w);
1424 if (!ev_is_active (w)) 1500 if (expect_false (!ev_is_active (w)))
1425 return; 1501 return;
1426 1502
1427 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1503 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1428 1504
1429 if (((W)w)->active < periodiccnt--) 1505 if (expect_true (((W)w)->active < periodiccnt--))
1430 { 1506 {
1431 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1507 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1432 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1508 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1433 } 1509 }
1434 1510
… …
1445#endif 1521#endif
1446 1522
1447void 1523void
1448ev_idle_start (EV_P_ struct ev_idle *w) 1524ev_idle_start (EV_P_ struct ev_idle *w)
1449{ 1525{
1450 if (ev_is_active (w)) 1526 if (expect_false (ev_is_active (w)))
1451 return; 1527 return;
1452 1528
1453 ev_start (EV_A_ (W)w, ++idlecnt); 1529 ev_start (EV_A_ (W)w, ++idlecnt);
1454 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2); 1530 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1455 idles [idlecnt - 1] = w; 1531 idles [idlecnt - 1] = w;
… …
1457 1533
1458void 1534void
1459ev_idle_stop (EV_P_ struct ev_idle *w) 1535ev_idle_stop (EV_P_ struct ev_idle *w)
1460{ 1536{
1461 ev_clear_pending (EV_A_ (W)w); 1537 ev_clear_pending (EV_A_ (W)w);
1462 if (!ev_is_active (w)) 1538 if (expect_false (!ev_is_active (w)))
1463 return; 1539 return;
1464 1540
1465 idles [((W)w)->active - 1] = idles [--idlecnt]; 1541 idles [((W)w)->active - 1] = idles [--idlecnt];
1466 ev_stop (EV_A_ (W)w); 1542 ev_stop (EV_A_ (W)w);
1467} 1543}
1468 1544
1469void 1545void
1470ev_prepare_start (EV_P_ struct ev_prepare *w) 1546ev_prepare_start (EV_P_ struct ev_prepare *w)
1471{ 1547{
1472 if (ev_is_active (w)) 1548 if (expect_false (ev_is_active (w)))
1473 return; 1549 return;
1474 1550
1475 ev_start (EV_A_ (W)w, ++preparecnt); 1551 ev_start (EV_A_ (W)w, ++preparecnt);
1476 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 1552 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1477 prepares [preparecnt - 1] = w; 1553 prepares [preparecnt - 1] = w;
… …
1479 1555
1480void 1556void
1481ev_prepare_stop (EV_P_ struct ev_prepare *w) 1557ev_prepare_stop (EV_P_ struct ev_prepare *w)
1482{ 1558{
1483 ev_clear_pending (EV_A_ (W)w); 1559 ev_clear_pending (EV_A_ (W)w);
1484 if (!ev_is_active (w)) 1560 if (expect_false (!ev_is_active (w)))
1485 return; 1561 return;
1486 1562
1487 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1563 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1488 ev_stop (EV_A_ (W)w); 1564 ev_stop (EV_A_ (W)w);
1489} 1565}
1490 1566
1491void 1567void
1492ev_check_start (EV_P_ struct ev_check *w) 1568ev_check_start (EV_P_ struct ev_check *w)
1493{ 1569{
1494 if (ev_is_active (w)) 1570 if (expect_false (ev_is_active (w)))
1495 return; 1571 return;
1496 1572
1497 ev_start (EV_A_ (W)w, ++checkcnt); 1573 ev_start (EV_A_ (W)w, ++checkcnt);
1498 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2); 1574 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1499 checks [checkcnt - 1] = w; 1575 checks [checkcnt - 1] = w;
… …
1501 1577
1502void 1578void
1503ev_check_stop (EV_P_ struct ev_check *w) 1579ev_check_stop (EV_P_ struct ev_check *w)
1504{ 1580{
1505 ev_clear_pending (EV_A_ (W)w); 1581 ev_clear_pending (EV_A_ (W)w);
1506 if (!ev_is_active (w)) 1582 if (expect_false (!ev_is_active (w)))
1507 return; 1583 return;
1508 1584
1509 checks [((W)w)->active - 1] = checks [--checkcnt]; 1585 checks [((W)w)->active - 1] = checks [--checkcnt];
1510 ev_stop (EV_A_ (W)w); 1586 ev_stop (EV_A_ (W)w);
1511} 1587}
… …
1516 1592
1517void 1593void
1518ev_signal_start (EV_P_ struct ev_signal *w) 1594ev_signal_start (EV_P_ struct ev_signal *w)
1519{ 1595{
1520#if EV_MULTIPLICITY 1596#if EV_MULTIPLICITY
1521 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1597 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1522#endif 1598#endif
1523 if (ev_is_active (w)) 1599 if (expect_false (ev_is_active (w)))
1524 return; 1600 return;
1525 1601
1526 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1602 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1527 1603
1528 ev_start (EV_A_ (W)w, 1); 1604 ev_start (EV_A_ (W)w, 1);
… …
1545 1621
1546void 1622void
1547ev_signal_stop (EV_P_ struct ev_signal *w) 1623ev_signal_stop (EV_P_ struct ev_signal *w)
1548{ 1624{
1549 ev_clear_pending (EV_A_ (W)w); 1625 ev_clear_pending (EV_A_ (W)w);
1550 if (!ev_is_active (w)) 1626 if (expect_false (!ev_is_active (w)))
1551 return; 1627 return;
1552 1628
1553 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1629 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1554 ev_stop (EV_A_ (W)w); 1630 ev_stop (EV_A_ (W)w);
1555 1631
… …
1559 1635
1560void 1636void
1561ev_child_start (EV_P_ struct ev_child *w) 1637ev_child_start (EV_P_ struct ev_child *w)
1562{ 1638{
1563#if EV_MULTIPLICITY 1639#if EV_MULTIPLICITY
1564 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1640 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1565#endif 1641#endif
1566 if (ev_is_active (w)) 1642 if (expect_false (ev_is_active (w)))
1567 return; 1643 return;
1568 1644
1569 ev_start (EV_A_ (W)w, 1); 1645 ev_start (EV_A_ (W)w, 1);
1570 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1646 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1571} 1647}
1572 1648
1573void 1649void
1574ev_child_stop (EV_P_ struct ev_child *w) 1650ev_child_stop (EV_P_ struct ev_child *w)
1575{ 1651{
1576 ev_clear_pending (EV_A_ (W)w); 1652 ev_clear_pending (EV_A_ (W)w);
1577 if (!ev_is_active (w)) 1653 if (expect_false (!ev_is_active (w)))
1578 return; 1654 return;
1579 1655
1580 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1656 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1581 ev_stop (EV_A_ (W)w); 1657 ev_stop (EV_A_ (W)w);
1582} 1658}
… …
1619void 1695void
1620ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1696ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1621{ 1697{
1622 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 1698 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1623 1699
1624 if (!once) 1700 if (expect_false (!once))
1701 {
1625 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1702 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1626 else 1703 return;
1627 { 1704 }
1705
1628 once->cb = cb; 1706 once->cb = cb;
1629 once->arg = arg; 1707 once->arg = arg;
1630 1708
1631 ev_init (&once->io, once_cb_io); 1709 ev_init (&once->io, once_cb_io);
1632 if (fd >= 0) 1710 if (fd >= 0)
1633 { 1711 {
1634 ev_io_set (&once->io, fd, events); 1712 ev_io_set (&once->io, fd, events);
1635 ev_io_start (EV_A_ &once->io); 1713 ev_io_start (EV_A_ &once->io);
1636 } 1714 }
1637 1715
1638 ev_init (&once->to, once_cb_to); 1716 ev_init (&once->to, once_cb_to);
1639 if (timeout >= 0.) 1717 if (timeout >= 0.)
1640 { 1718 {
1641 ev_timer_set (&once->to, timeout, 0.); 1719 ev_timer_set (&once->to, timeout, 0.);
1642 ev_timer_start (EV_A_ &once->to); 1720 ev_timer_start (EV_A_ &once->to);
1643 }
1644 } 1721 }
1645} 1722}
1646 1723
1647#ifdef __cplusplus 1724#ifdef __cplusplus
1648} 1725}

Diff Legend

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