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

Comparing libev/ev.c (file contents):
Revision 1.110 by root, Mon Nov 12 05:56:49 2007 UTC vs.
Revision 1.129 by root, Fri Nov 23 05:00:44 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
… …
167#define expect_true(expr) expect ((expr) != 0, 1) 195#define expect_true(expr) expect ((expr) != 0, 1)
168 196
169#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 197#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
170#define ABSPRI(w) ((w)->priority - EV_MINPRI) 198#define ABSPRI(w) ((w)->priority - EV_MINPRI)
171 199
172#define EMPTY /* required for microsofts broken pseudo-c compiler */ 200#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
201#define EMPTY2(a,b) /* used to suppress some warnings */
173 202
174typedef struct ev_watcher *W; 203typedef struct ev_watcher *W;
175typedef struct ev_watcher_list *WL; 204typedef struct ev_watcher_list *WL;
176typedef struct ev_watcher_time *WT; 205typedef struct ev_watcher_time *WT;
177 206
… …
257 #include "ev_vars.h" 286 #include "ev_vars.h"
258 #undef VAR 287 #undef VAR
259 }; 288 };
260 #include "ev_wrap.h" 289 #include "ev_wrap.h"
261 290
262 struct ev_loop default_loop_struct; 291 static struct ev_loop default_loop_struct;
263 static struct ev_loop *default_loop; 292 struct ev_loop *ev_default_loop_ptr;
264 293
265#else 294#else
266 295
267 ev_tstamp ev_rt_now; 296 ev_tstamp ev_rt_now;
268 #define VAR(name,decl) static decl; 297 #define VAR(name,decl) static decl;
269 #include "ev_vars.h" 298 #include "ev_vars.h"
270 #undef VAR 299 #undef VAR
271 300
272 static int default_loop; 301 static int ev_default_loop_ptr;
273 302
274#endif 303#endif
275 304
276/*****************************************************************************/ 305/*****************************************************************************/
277 306
… …
358void 387void
359ev_feed_event (EV_P_ void *w, int revents) 388ev_feed_event (EV_P_ void *w, int revents)
360{ 389{
361 W w_ = (W)w; 390 W w_ = (W)w;
362 391
363 if (w_->pending) 392 if (expect_false (w_->pending))
364 { 393 {
365 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 394 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
366 return; 395 return;
367 } 396 }
368 397
369 w_->pending = ++pendingcnt [ABSPRI (w_)]; 398 w_->pending = ++pendingcnt [ABSPRI (w_)];
370 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void)); 399 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
371 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 400 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
372 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 401 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
373} 402}
374 403
375static void 404static void
… …
402 fd_event (EV_A_ fd, revents); 431 fd_event (EV_A_ fd, revents);
403} 432}
404 433
405/*****************************************************************************/ 434/*****************************************************************************/
406 435
407static void 436inline void
408fd_reify (EV_P) 437fd_reify (EV_P)
409{ 438{
410 int i; 439 int i;
411 440
412 for (i = 0; i < fdchangecnt; ++i) 441 for (i = 0; i < fdchangecnt; ++i)
… …
439} 468}
440 469
441static void 470static void
442fd_change (EV_P_ int fd) 471fd_change (EV_P_ int fd)
443{ 472{
444 if (anfds [fd].reify) 473 if (expect_false (anfds [fd].reify))
445 return; 474 return;
446 475
447 anfds [fd].reify = 1; 476 anfds [fd].reify = 1;
448 477
449 ++fdchangecnt; 478 ++fdchangecnt;
450 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 479 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
451 fdchanges [fdchangecnt - 1] = fd; 480 fdchanges [fdchangecnt - 1] = fd;
452} 481}
453 482
454static void 483static void
455fd_kill (EV_P_ int fd) 484fd_kill (EV_P_ int fd)
… …
461 ev_io_stop (EV_A_ w); 490 ev_io_stop (EV_A_ w);
462 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);
463 } 492 }
464} 493}
465 494
466static int 495inline int
467fd_valid (int fd) 496fd_valid (int fd)
468{ 497{
469#ifdef _WIN32 498#ifdef _WIN32
470 return _get_osfhandle (fd) != -1; 499 return _get_osfhandle (fd) != -1;
471#else 500#else
… …
613ev_feed_signal_event (EV_P_ int signum) 642ev_feed_signal_event (EV_P_ int signum)
614{ 643{
615 WL w; 644 WL w;
616 645
617#if EV_MULTIPLICITY 646#if EV_MULTIPLICITY
618 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));
619#endif 648#endif
620 649
621 --signum; 650 --signum;
622 651
623 if (signum < 0 || signum >= signalmax) 652 if (signum < 0 || signum >= signalmax)
… …
640 for (signum = signalmax; signum--; ) 669 for (signum = signalmax; signum--; )
641 if (signals [signum].gotsig) 670 if (signals [signum].gotsig)
642 ev_feed_signal_event (EV_A_ signum + 1); 671 ev_feed_signal_event (EV_A_ signum + 1);
643} 672}
644 673
645inline void 674static void
646fd_intern (int fd) 675fd_intern (int fd)
647{ 676{
648#ifdef _WIN32 677#ifdef _WIN32
649 int arg = 1; 678 int arg = 1;
650 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 679 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
709 738
710#endif 739#endif
711 740
712/*****************************************************************************/ 741/*****************************************************************************/
713 742
743#if EV_USE_PORT
744# include "ev_port.c"
745#endif
714#if EV_USE_KQUEUE 746#if EV_USE_KQUEUE
715# include "ev_kqueue.c" 747# include "ev_kqueue.c"
716#endif 748#endif
717#if EV_USE_EPOLL 749#if EV_USE_EPOLL
718# include "ev_epoll.c" 750# include "ev_epoll.c"
… …
746 return getuid () != geteuid () 778 return getuid () != geteuid ()
747 || getgid () != getegid (); 779 || getgid () != getegid ();
748#endif 780#endif
749} 781}
750 782
751int 783unsigned int
752ev_method (EV_P) 784ev_supported_backends (void)
753{ 785{
754 return method; 786}
787
788unsigned int
789ev_recommended_backends (void)
790{
791 unsigned int flags;
792
793 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
794 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE;
795 if (EV_USE_EPOLL ) flags |= EVBACKEND_EPOLL;
796 if (EV_USE_POLL ) flags |= EVBACKEND_POLL;
797 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
798
799 return flags;
800}
801
802unsigned int
803ev_backend (EV_P)
804{
805 unsigned int flags = ev_recommended_backends ();
806
807#ifndef __NetBSD__
808 /* kqueue is borked on everything but netbsd apparently */
809 /* it usually doesn't work correctly on anything but sockets and pipes */
810 flags &= ~EVBACKEND_KQUEUE;
811#endif
812#ifdef __APPLE__
813 // flags &= ~EVBACKEND_KQUEUE; for documentation
814 flags &= ~EVBACKEND_POLL;
815#endif
816
817 return flags;
755} 818}
756 819
757static void 820static void
758loop_init (EV_P_ unsigned int flags) 821loop_init (EV_P_ unsigned int flags)
759{ 822{
… …
770 ev_rt_now = ev_time (); 833 ev_rt_now = ev_time ();
771 mn_now = get_clock (); 834 mn_now = get_clock ();
772 now_floor = mn_now; 835 now_floor = mn_now;
773 rtmn_diff = ev_rt_now - mn_now; 836 rtmn_diff = ev_rt_now - mn_now;
774 837
775 if (!(flags & EVMETHOD_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS")) 838 if (!(flags & EVFLAG_NOENV)
839 && !enable_secure ()
840 && getenv ("LIBEV_FLAGS"))
776 flags = atoi (getenv ("LIBEV_FLAGS")); 841 flags = atoi (getenv ("LIBEV_FLAGS"));
777 842
778 if (!(flags & 0x0000ffff)) 843 if (!(flags & 0x0000ffffUL))
779 flags |= 0x0000ffff; 844 flags |= ev_recommended_backends ();
780 845
781 method = 0; 846 method = 0;
847#if EV_USE_PORT
848 if (!method && (flags & EVBACKEND_PORT )) method = port_init (EV_A_ flags);
849#endif
782#if EV_USE_KQUEUE 850#if EV_USE_KQUEUE
783 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags); 851 if (!method && (flags & EVBACKEND_KQUEUE)) method = kqueue_init (EV_A_ flags);
784#endif 852#endif
785#if EV_USE_EPOLL 853#if EV_USE_EPOLL
786 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags); 854 if (!method && (flags & EVBACKEND_EPOLL )) method = epoll_init (EV_A_ flags);
787#endif 855#endif
788#if EV_USE_POLL 856#if EV_USE_POLL
789 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags); 857 if (!method && (flags & EVBACKEND_POLL )) method = poll_init (EV_A_ flags);
790#endif 858#endif
791#if EV_USE_SELECT 859#if EV_USE_SELECT
792 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags); 860 if (!method && (flags & EVBACKEND_SELECT)) method = select_init (EV_A_ flags);
793#endif 861#endif
794 862
795 ev_init (&sigev, sigcb); 863 ev_init (&sigev, sigcb);
796 ev_set_priority (&sigev, EV_MAXPRI); 864 ev_set_priority (&sigev, EV_MAXPRI);
797 } 865 }
798} 866}
799 867
800void 868static void
801loop_destroy (EV_P) 869loop_destroy (EV_P)
802{ 870{
803 int i; 871 int i;
804 872
873#if EV_USE_PORT
874 if (method == EVBACKEND_PORT ) port_destroy (EV_A);
875#endif
805#if EV_USE_KQUEUE 876#if EV_USE_KQUEUE
806 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 877 if (method == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
807#endif 878#endif
808#if EV_USE_EPOLL 879#if EV_USE_EPOLL
809 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 880 if (method == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
810#endif 881#endif
811#if EV_USE_POLL 882#if EV_USE_POLL
812 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 883 if (method == EVBACKEND_POLL ) poll_destroy (EV_A);
813#endif 884#endif
814#if EV_USE_SELECT 885#if EV_USE_SELECT
815 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 886 if (method == EVBACKEND_SELECT) select_destroy (EV_A);
816#endif 887#endif
817 888
818 for (i = NUMPRI; i--; ) 889 for (i = NUMPRI; i--; )
819 array_free (pending, [i]); 890 array_free (pending, [i]);
820 891
821 /* have to use the microsoft-never-gets-it-right macro */ 892 /* have to use the microsoft-never-gets-it-right macro */
822 array_free (fdchange, EMPTY); 893 array_free (fdchange, EMPTY0);
823 array_free (timer, EMPTY); 894 array_free (timer, EMPTY0);
824#if EV_PERIODICS 895#if EV_PERIODICS
825 array_free (periodic, EMPTY); 896 array_free (periodic, EMPTY0);
826#endif 897#endif
827 array_free (idle, EMPTY); 898 array_free (idle, EMPTY0);
828 array_free (prepare, EMPTY); 899 array_free (prepare, EMPTY0);
829 array_free (check, EMPTY); 900 array_free (check, EMPTY0);
830 901
831 method = 0; 902 method = 0;
832} 903}
833 904
834static void 905static void
835loop_fork (EV_P) 906loop_fork (EV_P)
836{ 907{
908#if EV_USE_PORT
909 if (method == EVBACKEND_PORT ) port_fork (EV_A);
910#endif
911#if EV_USE_KQUEUE
912 if (method == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
913#endif
837#if EV_USE_EPOLL 914#if EV_USE_EPOLL
838 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 915 if (method == EVBACKEND_EPOLL ) epoll_fork (EV_A);
839#endif
840#if EV_USE_KQUEUE
841 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
842#endif 916#endif
843 917
844 if (ev_is_active (&sigev)) 918 if (ev_is_active (&sigev))
845 { 919 {
846 /* default loop */ 920 /* default loop */
… …
890 964
891#endif 965#endif
892 966
893#if EV_MULTIPLICITY 967#if EV_MULTIPLICITY
894struct ev_loop * 968struct ev_loop *
969ev_default_loop_init (unsigned int flags)
895#else 970#else
896int 971int
897#endif
898ev_default_loop (unsigned int flags) 972ev_default_loop (unsigned int flags)
973#endif
899{ 974{
900 if (sigpipe [0] == sigpipe [1]) 975 if (sigpipe [0] == sigpipe [1])
901 if (pipe (sigpipe)) 976 if (pipe (sigpipe))
902 return 0; 977 return 0;
903 978
904 if (!default_loop) 979 if (!ev_default_loop_ptr)
905 { 980 {
906#if EV_MULTIPLICITY 981#if EV_MULTIPLICITY
907 struct ev_loop *loop = default_loop = &default_loop_struct; 982 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
908#else 983#else
909 default_loop = 1; 984 ev_default_loop_ptr = 1;
910#endif 985#endif
911 986
912 loop_init (EV_A_ flags); 987 loop_init (EV_A_ flags);
913 988
914 if (ev_method (EV_A)) 989 if (ev_method (EV_A))
… …
921 ev_signal_start (EV_A_ &childev); 996 ev_signal_start (EV_A_ &childev);
922 ev_unref (EV_A); /* child watcher should not keep loop alive */ 997 ev_unref (EV_A); /* child watcher should not keep loop alive */
923#endif 998#endif
924 } 999 }
925 else 1000 else
926 default_loop = 0; 1001 ev_default_loop_ptr = 0;
927 } 1002 }
928 1003
929 return default_loop; 1004 return ev_default_loop_ptr;
930} 1005}
931 1006
932void 1007void
933ev_default_destroy (void) 1008ev_default_destroy (void)
934{ 1009{
935#if EV_MULTIPLICITY 1010#if EV_MULTIPLICITY
936 struct ev_loop *loop = default_loop; 1011 struct ev_loop *loop = ev_default_loop_ptr;
937#endif 1012#endif
938 1013
939#ifndef _WIN32 1014#ifndef _WIN32
940 ev_ref (EV_A); /* child watcher */ 1015 ev_ref (EV_A); /* child watcher */
941 ev_signal_stop (EV_A_ &childev); 1016 ev_signal_stop (EV_A_ &childev);
… …
952 1027
953void 1028void
954ev_default_fork (void) 1029ev_default_fork (void)
955{ 1030{
956#if EV_MULTIPLICITY 1031#if EV_MULTIPLICITY
957 struct ev_loop *loop = default_loop; 1032 struct ev_loop *loop = ev_default_loop_ptr;
958#endif 1033#endif
959 1034
960 if (method) 1035 if (method)
961 postfork = 1; 1036 postfork = 1;
962} 1037}
… …
973 return 1; 1048 return 1;
974 1049
975 return 0; 1050 return 0;
976} 1051}
977 1052
978static void 1053inline void
979call_pending (EV_P) 1054call_pending (EV_P)
980{ 1055{
981 int pri; 1056 int pri;
982 1057
983 for (pri = NUMPRI; pri--; ) 1058 for (pri = NUMPRI; pri--; )
984 while (pendingcnt [pri]) 1059 while (pendingcnt [pri])
985 { 1060 {
986 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1061 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
987 1062
988 if (p->w) 1063 if (expect_true (p->w))
989 { 1064 {
990 p->w->pending = 0; 1065 p->w->pending = 0;
991 EV_CB_INVOKE (p->w, p->events); 1066 EV_CB_INVOKE (p->w, p->events);
992 } 1067 }
993 } 1068 }
994} 1069}
995 1070
996static void 1071inline void
997timers_reify (EV_P) 1072timers_reify (EV_P)
998{ 1073{
999 while (timercnt && ((WT)timers [0])->at <= mn_now) 1074 while (timercnt && ((WT)timers [0])->at <= mn_now)
1000 { 1075 {
1001 struct ev_timer *w = timers [0]; 1076 struct ev_timer *w = timers [0];
… …
1019 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1094 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1020 } 1095 }
1021} 1096}
1022 1097
1023#if EV_PERIODICS 1098#if EV_PERIODICS
1024static void 1099inline void
1025periodics_reify (EV_P) 1100periodics_reify (EV_P)
1026{ 1101{
1027 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1102 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1028 { 1103 {
1029 struct ev_periodic *w = periodics [0]; 1104 struct ev_periodic *w = periodics [0];
… …
1088 ev_rt_now = ev_time (); 1163 ev_rt_now = ev_time ();
1089 return 1; 1164 return 1;
1090 } 1165 }
1091} 1166}
1092 1167
1093static void 1168inline void
1094time_update (EV_P) 1169time_update (EV_P)
1095{ 1170{
1096 int i; 1171 int i;
1097 1172
1098#if EV_USE_MONOTONIC 1173#if EV_USE_MONOTONIC
… …
1159ev_loop (EV_P_ int flags) 1234ev_loop (EV_P_ int flags)
1160{ 1235{
1161 double block; 1236 double block;
1162 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1237 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1163 1238
1164 do 1239 while (activecnt)
1165 { 1240 {
1166 /* queue check watchers (and execute them) */ 1241 /* queue check watchers (and execute them) */
1167 if (expect_false (preparecnt)) 1242 if (expect_false (preparecnt))
1168 { 1243 {
1169 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1244 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
… …
1209 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1284 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1210 if (block > to) block = to; 1285 if (block > to) block = to;
1211 } 1286 }
1212#endif 1287#endif
1213 1288
1214 if (block < 0.) block = 0.; 1289 if (expect_false (block < 0.)) block = 0.;
1215 } 1290 }
1216 1291
1217 method_poll (EV_A_ block); 1292 method_poll (EV_A_ block);
1218 1293
1219 /* update ev_rt_now, do magic */ 1294 /* update ev_rt_now, do magic */
… …
1228 /* queue idle watchers unless io or timers are pending */ 1303 /* queue idle watchers unless io or timers are pending */
1229 if (idlecnt && !any_pending (EV_A)) 1304 if (idlecnt && !any_pending (EV_A))
1230 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1305 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1231 1306
1232 /* queue check watchers, to be executed first */ 1307 /* queue check watchers, to be executed first */
1233 if (checkcnt) 1308 if (expect_false (checkcnt))
1234 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1309 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1235 1310
1236 call_pending (EV_A); 1311 call_pending (EV_A);
1312
1313 if (expect_false (loop_done))
1314 break;
1237 } 1315 }
1238 while (activecnt && !loop_done);
1239 1316
1240 if (loop_done != 2) 1317 if (loop_done != 2)
1241 loop_done = 0; 1318 loop_done = 0;
1242} 1319}
1243 1320
… …
1303void 1380void
1304ev_io_start (EV_P_ struct ev_io *w) 1381ev_io_start (EV_P_ struct ev_io *w)
1305{ 1382{
1306 int fd = w->fd; 1383 int fd = w->fd;
1307 1384
1308 if (ev_is_active (w)) 1385 if (expect_false (ev_is_active (w)))
1309 return; 1386 return;
1310 1387
1311 assert (("ev_io_start called with negative fd", fd >= 0)); 1388 assert (("ev_io_start called with negative fd", fd >= 0));
1312 1389
1313 ev_start (EV_A_ (W)w, 1); 1390 ev_start (EV_A_ (W)w, 1);
… …
1319 1396
1320void 1397void
1321ev_io_stop (EV_P_ struct ev_io *w) 1398ev_io_stop (EV_P_ struct ev_io *w)
1322{ 1399{
1323 ev_clear_pending (EV_A_ (W)w); 1400 ev_clear_pending (EV_A_ (W)w);
1324 if (!ev_is_active (w)) 1401 if (expect_false (!ev_is_active (w)))
1325 return; 1402 return;
1326 1403
1327 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1404 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1328 1405
1329 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1406 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
… …
1333} 1410}
1334 1411
1335void 1412void
1336ev_timer_start (EV_P_ struct ev_timer *w) 1413ev_timer_start (EV_P_ struct ev_timer *w)
1337{ 1414{
1338 if (ev_is_active (w)) 1415 if (expect_false (ev_is_active (w)))
1339 return; 1416 return;
1340 1417
1341 ((WT)w)->at += mn_now; 1418 ((WT)w)->at += mn_now;
1342 1419
1343 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1420 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1344 1421
1345 ev_start (EV_A_ (W)w, ++timercnt); 1422 ev_start (EV_A_ (W)w, ++timercnt);
1346 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1423 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1347 timers [timercnt - 1] = w; 1424 timers [timercnt - 1] = w;
1348 upheap ((WT *)timers, timercnt - 1); 1425 upheap ((WT *)timers, timercnt - 1);
1349 1426
1350 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1427 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1351} 1428}
1352 1429
1353void 1430void
1354ev_timer_stop (EV_P_ struct ev_timer *w) 1431ev_timer_stop (EV_P_ struct ev_timer *w)
1355{ 1432{
1356 ev_clear_pending (EV_A_ (W)w); 1433 ev_clear_pending (EV_A_ (W)w);
1357 if (!ev_is_active (w)) 1434 if (expect_false (!ev_is_active (w)))
1358 return; 1435 return;
1359 1436
1360 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1437 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1361 1438
1362 if (((W)w)->active < timercnt--) 1439 if (expect_true (((W)w)->active < timercnt--))
1363 { 1440 {
1364 timers [((W)w)->active - 1] = timers [timercnt]; 1441 timers [((W)w)->active - 1] = timers [timercnt];
1365 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1442 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1366 } 1443 }
1367 1444
… …
1382 } 1459 }
1383 else 1460 else
1384 ev_timer_stop (EV_A_ w); 1461 ev_timer_stop (EV_A_ w);
1385 } 1462 }
1386 else if (w->repeat) 1463 else if (w->repeat)
1464 {
1465 w->at = w->repeat;
1387 ev_timer_start (EV_A_ w); 1466 ev_timer_start (EV_A_ w);
1467 }
1388} 1468}
1389 1469
1390#if EV_PERIODICS 1470#if EV_PERIODICS
1391void 1471void
1392ev_periodic_start (EV_P_ struct ev_periodic *w) 1472ev_periodic_start (EV_P_ struct ev_periodic *w)
1393{ 1473{
1394 if (ev_is_active (w)) 1474 if (expect_false (ev_is_active (w)))
1395 return; 1475 return;
1396 1476
1397 if (w->reschedule_cb) 1477 if (w->reschedule_cb)
1398 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1478 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1399 else if (w->interval) 1479 else if (w->interval)
… …
1402 /* this formula differs from the one in periodic_reify because we do not always round up */ 1482 /* this formula differs from the one in periodic_reify because we do not always round up */
1403 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1483 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1404 } 1484 }
1405 1485
1406 ev_start (EV_A_ (W)w, ++periodiccnt); 1486 ev_start (EV_A_ (W)w, ++periodiccnt);
1407 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1487 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1408 periodics [periodiccnt - 1] = w; 1488 periodics [periodiccnt - 1] = w;
1409 upheap ((WT *)periodics, periodiccnt - 1); 1489 upheap ((WT *)periodics, periodiccnt - 1);
1410 1490
1411 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1491 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1412} 1492}
1413 1493
1414void 1494void
1415ev_periodic_stop (EV_P_ struct ev_periodic *w) 1495ev_periodic_stop (EV_P_ struct ev_periodic *w)
1416{ 1496{
1417 ev_clear_pending (EV_A_ (W)w); 1497 ev_clear_pending (EV_A_ (W)w);
1418 if (!ev_is_active (w)) 1498 if (expect_false (!ev_is_active (w)))
1419 return; 1499 return;
1420 1500
1421 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1501 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1422 1502
1423 if (((W)w)->active < periodiccnt--) 1503 if (expect_true (((W)w)->active < periodiccnt--))
1424 { 1504 {
1425 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1505 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1426 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1506 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1427 } 1507 }
1428 1508
… …
1439#endif 1519#endif
1440 1520
1441void 1521void
1442ev_idle_start (EV_P_ struct ev_idle *w) 1522ev_idle_start (EV_P_ struct ev_idle *w)
1443{ 1523{
1444 if (ev_is_active (w)) 1524 if (expect_false (ev_is_active (w)))
1445 return; 1525 return;
1446 1526
1447 ev_start (EV_A_ (W)w, ++idlecnt); 1527 ev_start (EV_A_ (W)w, ++idlecnt);
1448 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1528 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1449 idles [idlecnt - 1] = w; 1529 idles [idlecnt - 1] = w;
1450} 1530}
1451 1531
1452void 1532void
1453ev_idle_stop (EV_P_ struct ev_idle *w) 1533ev_idle_stop (EV_P_ struct ev_idle *w)
1454{ 1534{
1455 ev_clear_pending (EV_A_ (W)w); 1535 ev_clear_pending (EV_A_ (W)w);
1456 if (!ev_is_active (w)) 1536 if (expect_false (!ev_is_active (w)))
1457 return; 1537 return;
1458 1538
1459 idles [((W)w)->active - 1] = idles [--idlecnt]; 1539 idles [((W)w)->active - 1] = idles [--idlecnt];
1460 ev_stop (EV_A_ (W)w); 1540 ev_stop (EV_A_ (W)w);
1461} 1541}
1462 1542
1463void 1543void
1464ev_prepare_start (EV_P_ struct ev_prepare *w) 1544ev_prepare_start (EV_P_ struct ev_prepare *w)
1465{ 1545{
1466 if (ev_is_active (w)) 1546 if (expect_false (ev_is_active (w)))
1467 return; 1547 return;
1468 1548
1469 ev_start (EV_A_ (W)w, ++preparecnt); 1549 ev_start (EV_A_ (W)w, ++preparecnt);
1470 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1550 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1471 prepares [preparecnt - 1] = w; 1551 prepares [preparecnt - 1] = w;
1472} 1552}
1473 1553
1474void 1554void
1475ev_prepare_stop (EV_P_ struct ev_prepare *w) 1555ev_prepare_stop (EV_P_ struct ev_prepare *w)
1476{ 1556{
1477 ev_clear_pending (EV_A_ (W)w); 1557 ev_clear_pending (EV_A_ (W)w);
1478 if (!ev_is_active (w)) 1558 if (expect_false (!ev_is_active (w)))
1479 return; 1559 return;
1480 1560
1481 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1561 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1482 ev_stop (EV_A_ (W)w); 1562 ev_stop (EV_A_ (W)w);
1483} 1563}
1484 1564
1485void 1565void
1486ev_check_start (EV_P_ struct ev_check *w) 1566ev_check_start (EV_P_ struct ev_check *w)
1487{ 1567{
1488 if (ev_is_active (w)) 1568 if (expect_false (ev_is_active (w)))
1489 return; 1569 return;
1490 1570
1491 ev_start (EV_A_ (W)w, ++checkcnt); 1571 ev_start (EV_A_ (W)w, ++checkcnt);
1492 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1572 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1493 checks [checkcnt - 1] = w; 1573 checks [checkcnt - 1] = w;
1494} 1574}
1495 1575
1496void 1576void
1497ev_check_stop (EV_P_ struct ev_check *w) 1577ev_check_stop (EV_P_ struct ev_check *w)
1498{ 1578{
1499 ev_clear_pending (EV_A_ (W)w); 1579 ev_clear_pending (EV_A_ (W)w);
1500 if (!ev_is_active (w)) 1580 if (expect_false (!ev_is_active (w)))
1501 return; 1581 return;
1502 1582
1503 checks [((W)w)->active - 1] = checks [--checkcnt]; 1583 checks [((W)w)->active - 1] = checks [--checkcnt];
1504 ev_stop (EV_A_ (W)w); 1584 ev_stop (EV_A_ (W)w);
1505} 1585}
… …
1510 1590
1511void 1591void
1512ev_signal_start (EV_P_ struct ev_signal *w) 1592ev_signal_start (EV_P_ struct ev_signal *w)
1513{ 1593{
1514#if EV_MULTIPLICITY 1594#if EV_MULTIPLICITY
1515 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1595 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1516#endif 1596#endif
1517 if (ev_is_active (w)) 1597 if (expect_false (ev_is_active (w)))
1518 return; 1598 return;
1519 1599
1520 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1600 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1521 1601
1522 ev_start (EV_A_ (W)w, 1); 1602 ev_start (EV_A_ (W)w, 1);
… …
1539 1619
1540void 1620void
1541ev_signal_stop (EV_P_ struct ev_signal *w) 1621ev_signal_stop (EV_P_ struct ev_signal *w)
1542{ 1622{
1543 ev_clear_pending (EV_A_ (W)w); 1623 ev_clear_pending (EV_A_ (W)w);
1544 if (!ev_is_active (w)) 1624 if (expect_false (!ev_is_active (w)))
1545 return; 1625 return;
1546 1626
1547 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1627 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1548 ev_stop (EV_A_ (W)w); 1628 ev_stop (EV_A_ (W)w);
1549 1629
… …
1553 1633
1554void 1634void
1555ev_child_start (EV_P_ struct ev_child *w) 1635ev_child_start (EV_P_ struct ev_child *w)
1556{ 1636{
1557#if EV_MULTIPLICITY 1637#if EV_MULTIPLICITY
1558 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1638 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1559#endif 1639#endif
1560 if (ev_is_active (w)) 1640 if (expect_false (ev_is_active (w)))
1561 return; 1641 return;
1562 1642
1563 ev_start (EV_A_ (W)w, 1); 1643 ev_start (EV_A_ (W)w, 1);
1564 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1644 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1565} 1645}
1566 1646
1567void 1647void
1568ev_child_stop (EV_P_ struct ev_child *w) 1648ev_child_stop (EV_P_ struct ev_child *w)
1569{ 1649{
1570 ev_clear_pending (EV_A_ (W)w); 1650 ev_clear_pending (EV_A_ (W)w);
1571 if (!ev_is_active (w)) 1651 if (expect_false (!ev_is_active (w)))
1572 return; 1652 return;
1573 1653
1574 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1654 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1575 ev_stop (EV_A_ (W)w); 1655 ev_stop (EV_A_ (W)w);
1576} 1656}
… …
1613void 1693void
1614ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1694ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1615{ 1695{
1616 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 1696 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1617 1697
1618 if (!once) 1698 if (expect_false (!once))
1699 {
1619 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1700 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1620 else 1701 return;
1621 { 1702 }
1703
1622 once->cb = cb; 1704 once->cb = cb;
1623 once->arg = arg; 1705 once->arg = arg;
1624 1706
1625 ev_init (&once->io, once_cb_io); 1707 ev_init (&once->io, once_cb_io);
1626 if (fd >= 0) 1708 if (fd >= 0)
1627 { 1709 {
1628 ev_io_set (&once->io, fd, events); 1710 ev_io_set (&once->io, fd, events);
1629 ev_io_start (EV_A_ &once->io); 1711 ev_io_start (EV_A_ &once->io);
1630 } 1712 }
1631 1713
1632 ev_init (&once->to, once_cb_to); 1714 ev_init (&once->to, once_cb_to);
1633 if (timeout >= 0.) 1715 if (timeout >= 0.)
1634 { 1716 {
1635 ev_timer_set (&once->to, timeout, 0.); 1717 ev_timer_set (&once->to, timeout, 0.);
1636 ev_timer_start (EV_A_ &once->to); 1718 ev_timer_start (EV_A_ &once->to);
1637 }
1638 } 1719 }
1639} 1720}
1640 1721
1641#ifdef __cplusplus 1722#ifdef __cplusplus
1642} 1723}

Diff Legend

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