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.128 by root, Thu Nov 22 12:28:27 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 158
125/* darwin simply cannot be helped */ 159/* darwin simply cannot be helped */
… …
143#endif 177#endif
144 178
145/**/ 179/**/
146 180
147#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 181#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) */ 182#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 */ 183#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 */ 184/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
151 185
152#ifdef EV_H 186#ifdef EV_H
153# include EV_H 187# include EV_H
154#else 188#else
155# include "ev.h" 189# include "ev.h"
156#endif 190#endif
157 191
158#if __GNUC__ >= 3 192#if __GNUC__ >= 3
159# define expect(expr,value) __builtin_expect ((expr),(value)) 193# define expect(expr,value) __builtin_expect ((expr),(value))
160# define inline inline 194# define inline static inline
161#else 195#else
162# define expect(expr,value) (expr) 196# define expect(expr,value) (expr)
163# define inline static 197# define inline static
164#endif 198#endif
165 199
… …
167#define expect_true(expr) expect ((expr) != 0, 1) 201#define expect_true(expr) expect ((expr) != 0, 1)
168 202
169#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 203#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
170#define ABSPRI(w) ((w)->priority - EV_MINPRI) 204#define ABSPRI(w) ((w)->priority - EV_MINPRI)
171 205
172#define EMPTY /* required for microsofts broken pseudo-c compiler */ 206#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
207#define EMPTY2(a,b) /* used to suppress some warnings */
173 208
174typedef struct ev_watcher *W; 209typedef struct ev_watcher *W;
175typedef struct ev_watcher_list *WL; 210typedef struct ev_watcher_list *WL;
176typedef struct ev_watcher_time *WT; 211typedef struct ev_watcher_time *WT;
177 212
… …
257 #include "ev_vars.h" 292 #include "ev_vars.h"
258 #undef VAR 293 #undef VAR
259 }; 294 };
260 #include "ev_wrap.h" 295 #include "ev_wrap.h"
261 296
262 struct ev_loop default_loop_struct; 297 static struct ev_loop default_loop_struct;
263 static struct ev_loop *default_loop; 298 struct ev_loop *ev_default_loop_ptr;
264 299
265#else 300#else
266 301
267 ev_tstamp ev_rt_now; 302 ev_tstamp ev_rt_now;
268 #define VAR(name,decl) static decl; 303 #define VAR(name,decl) static decl;
269 #include "ev_vars.h" 304 #include "ev_vars.h"
270 #undef VAR 305 #undef VAR
271 306
272 static int default_loop; 307 static int ev_default_loop_ptr;
273 308
274#endif 309#endif
275 310
276/*****************************************************************************/ 311/*****************************************************************************/
277 312
… …
358void 393void
359ev_feed_event (EV_P_ void *w, int revents) 394ev_feed_event (EV_P_ void *w, int revents)
360{ 395{
361 W w_ = (W)w; 396 W w_ = (W)w;
362 397
363 if (w_->pending) 398 if (expect_false (w_->pending))
364 { 399 {
365 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 400 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
366 return; 401 return;
367 } 402 }
368 403
369 w_->pending = ++pendingcnt [ABSPRI (w_)]; 404 w_->pending = ++pendingcnt [ABSPRI (w_)];
370 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void)); 405 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
371 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 406 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
372 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 407 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
373} 408}
374 409
375static void 410static void
… …
402 fd_event (EV_A_ fd, revents); 437 fd_event (EV_A_ fd, revents);
403} 438}
404 439
405/*****************************************************************************/ 440/*****************************************************************************/
406 441
407static void 442inline void
408fd_reify (EV_P) 443fd_reify (EV_P)
409{ 444{
410 int i; 445 int i;
411 446
412 for (i = 0; i < fdchangecnt; ++i) 447 for (i = 0; i < fdchangecnt; ++i)
… …
439} 474}
440 475
441static void 476static void
442fd_change (EV_P_ int fd) 477fd_change (EV_P_ int fd)
443{ 478{
444 if (anfds [fd].reify) 479 if (expect_false (anfds [fd].reify))
445 return; 480 return;
446 481
447 anfds [fd].reify = 1; 482 anfds [fd].reify = 1;
448 483
449 ++fdchangecnt; 484 ++fdchangecnt;
450 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 485 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
451 fdchanges [fdchangecnt - 1] = fd; 486 fdchanges [fdchangecnt - 1] = fd;
452} 487}
453 488
454static void 489static void
455fd_kill (EV_P_ int fd) 490fd_kill (EV_P_ int fd)
… …
461 ev_io_stop (EV_A_ w); 496 ev_io_stop (EV_A_ w);
462 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 497 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
463 } 498 }
464} 499}
465 500
466static int 501inline int
467fd_valid (int fd) 502fd_valid (int fd)
468{ 503{
469#ifdef _WIN32 504#ifdef _WIN32
470 return _get_osfhandle (fd) != -1; 505 return _get_osfhandle (fd) != -1;
471#else 506#else
… …
613ev_feed_signal_event (EV_P_ int signum) 648ev_feed_signal_event (EV_P_ int signum)
614{ 649{
615 WL w; 650 WL w;
616 651
617#if EV_MULTIPLICITY 652#if EV_MULTIPLICITY
618 assert (("feeding signal events is only supported in the default loop", loop == default_loop)); 653 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
619#endif 654#endif
620 655
621 --signum; 656 --signum;
622 657
623 if (signum < 0 || signum >= signalmax) 658 if (signum < 0 || signum >= signalmax)
… …
640 for (signum = signalmax; signum--; ) 675 for (signum = signalmax; signum--; )
641 if (signals [signum].gotsig) 676 if (signals [signum].gotsig)
642 ev_feed_signal_event (EV_A_ signum + 1); 677 ev_feed_signal_event (EV_A_ signum + 1);
643} 678}
644 679
645inline void 680static void
646fd_intern (int fd) 681fd_intern (int fd)
647{ 682{
648#ifdef _WIN32 683#ifdef _WIN32
649 int arg = 1; 684 int arg = 1;
650 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 685 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
709 744
710#endif 745#endif
711 746
712/*****************************************************************************/ 747/*****************************************************************************/
713 748
749#if EV_USE_PORT
750# include "ev_port.c"
751#endif
714#if EV_USE_KQUEUE 752#if EV_USE_KQUEUE
715# include "ev_kqueue.c" 753# include "ev_kqueue.c"
716#endif 754#endif
717#if EV_USE_EPOLL 755#if EV_USE_EPOLL
718# include "ev_epoll.c" 756# include "ev_epoll.c"
… …
746 return getuid () != geteuid () 784 return getuid () != geteuid ()
747 || getgid () != getegid (); 785 || getgid () != getegid ();
748#endif 786#endif
749} 787}
750 788
751int 789unsigned int
752ev_method (EV_P) 790ev_method (EV_P)
753{ 791{
754 return method; 792 return method;
755} 793}
756 794
… …
770 ev_rt_now = ev_time (); 808 ev_rt_now = ev_time ();
771 mn_now = get_clock (); 809 mn_now = get_clock ();
772 now_floor = mn_now; 810 now_floor = mn_now;
773 rtmn_diff = ev_rt_now - mn_now; 811 rtmn_diff = ev_rt_now - mn_now;
774 812
775 if (!(flags & EVMETHOD_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS")) 813 if (!(flags & EVFLAG_NOENV)
814 && !enable_secure ()
815 && getenv ("LIBEV_FLAGS"))
776 flags = atoi (getenv ("LIBEV_FLAGS")); 816 flags = atoi (getenv ("LIBEV_FLAGS"));
777 817
778 if (!(flags & 0x0000ffff)) 818 if (!(flags & EVMETHOD_ALL))
779 flags |= 0x0000ffff; 819 {
820 flags |= EVMETHOD_ALL;
821#if EV_USE_KQUEUE && !defined (__NetBSD__)
822 /* kqueue is borked on everything but netbsd apparently */
823 /* it usually doesn't work correctly on anything but sockets and pipes */
824 flags &= ~EVMETHOD_KQUEUE;
825#endif
826 }
780 827
781 method = 0; 828 method = 0;
829#if EV_USE_PORT
830 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags);
831#endif
782#if EV_USE_KQUEUE 832#if EV_USE_KQUEUE
783 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags); 833 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
784#endif 834#endif
785#if EV_USE_EPOLL 835#if EV_USE_EPOLL
786 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags); 836 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
… …
795 ev_init (&sigev, sigcb); 845 ev_init (&sigev, sigcb);
796 ev_set_priority (&sigev, EV_MAXPRI); 846 ev_set_priority (&sigev, EV_MAXPRI);
797 } 847 }
798} 848}
799 849
800void 850static void
801loop_destroy (EV_P) 851loop_destroy (EV_P)
802{ 852{
803 int i; 853 int i;
804 854
855#if EV_USE_PORT
856 if (method == EVMETHOD_PORT ) port_destroy (EV_A);
857#endif
805#if EV_USE_KQUEUE 858#if EV_USE_KQUEUE
806 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 859 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
807#endif 860#endif
808#if EV_USE_EPOLL 861#if EV_USE_EPOLL
809 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 862 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
… …
817 870
818 for (i = NUMPRI; i--; ) 871 for (i = NUMPRI; i--; )
819 array_free (pending, [i]); 872 array_free (pending, [i]);
820 873
821 /* have to use the microsoft-never-gets-it-right macro */ 874 /* have to use the microsoft-never-gets-it-right macro */
822 array_free (fdchange, EMPTY); 875 array_free (fdchange, EMPTY0);
823 array_free (timer, EMPTY); 876 array_free (timer, EMPTY0);
824#if EV_PERIODICS 877#if EV_PERIODICS
825 array_free (periodic, EMPTY); 878 array_free (periodic, EMPTY0);
826#endif 879#endif
827 array_free (idle, EMPTY); 880 array_free (idle, EMPTY0);
828 array_free (prepare, EMPTY); 881 array_free (prepare, EMPTY0);
829 array_free (check, EMPTY); 882 array_free (check, EMPTY0);
830 883
831 method = 0; 884 method = 0;
832} 885}
833 886
834static void 887static void
835loop_fork (EV_P) 888loop_fork (EV_P)
836{ 889{
890#if EV_USE_PORT
891 if (method == EVMETHOD_PORT ) port_fork (EV_A);
892#endif
893#if EV_USE_KQUEUE
894 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
895#endif
837#if EV_USE_EPOLL 896#if EV_USE_EPOLL
838 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 897 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
839#endif
840#if EV_USE_KQUEUE
841 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
842#endif 898#endif
843 899
844 if (ev_is_active (&sigev)) 900 if (ev_is_active (&sigev))
845 { 901 {
846 /* default loop */ 902 /* default loop */
… …
890 946
891#endif 947#endif
892 948
893#if EV_MULTIPLICITY 949#if EV_MULTIPLICITY
894struct ev_loop * 950struct ev_loop *
951ev_default_loop_init (unsigned int flags)
895#else 952#else
896int 953int
897#endif
898ev_default_loop (unsigned int flags) 954ev_default_loop (unsigned int flags)
955#endif
899{ 956{
900 if (sigpipe [0] == sigpipe [1]) 957 if (sigpipe [0] == sigpipe [1])
901 if (pipe (sigpipe)) 958 if (pipe (sigpipe))
902 return 0; 959 return 0;
903 960
904 if (!default_loop) 961 if (!ev_default_loop_ptr)
905 { 962 {
906#if EV_MULTIPLICITY 963#if EV_MULTIPLICITY
907 struct ev_loop *loop = default_loop = &default_loop_struct; 964 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
908#else 965#else
909 default_loop = 1; 966 ev_default_loop_ptr = 1;
910#endif 967#endif
911 968
912 loop_init (EV_A_ flags); 969 loop_init (EV_A_ flags);
913 970
914 if (ev_method (EV_A)) 971 if (ev_method (EV_A))
… …
921 ev_signal_start (EV_A_ &childev); 978 ev_signal_start (EV_A_ &childev);
922 ev_unref (EV_A); /* child watcher should not keep loop alive */ 979 ev_unref (EV_A); /* child watcher should not keep loop alive */
923#endif 980#endif
924 } 981 }
925 else 982 else
926 default_loop = 0; 983 ev_default_loop_ptr = 0;
927 } 984 }
928 985
929 return default_loop; 986 return ev_default_loop_ptr;
930} 987}
931 988
932void 989void
933ev_default_destroy (void) 990ev_default_destroy (void)
934{ 991{
935#if EV_MULTIPLICITY 992#if EV_MULTIPLICITY
936 struct ev_loop *loop = default_loop; 993 struct ev_loop *loop = ev_default_loop_ptr;
937#endif 994#endif
938 995
939#ifndef _WIN32 996#ifndef _WIN32
940 ev_ref (EV_A); /* child watcher */ 997 ev_ref (EV_A); /* child watcher */
941 ev_signal_stop (EV_A_ &childev); 998 ev_signal_stop (EV_A_ &childev);
… …
952 1009
953void 1010void
954ev_default_fork (void) 1011ev_default_fork (void)
955{ 1012{
956#if EV_MULTIPLICITY 1013#if EV_MULTIPLICITY
957 struct ev_loop *loop = default_loop; 1014 struct ev_loop *loop = ev_default_loop_ptr;
958#endif 1015#endif
959 1016
960 if (method) 1017 if (method)
961 postfork = 1; 1018 postfork = 1;
962} 1019}
… …
973 return 1; 1030 return 1;
974 1031
975 return 0; 1032 return 0;
976} 1033}
977 1034
978static void 1035inline void
979call_pending (EV_P) 1036call_pending (EV_P)
980{ 1037{
981 int pri; 1038 int pri;
982 1039
983 for (pri = NUMPRI; pri--; ) 1040 for (pri = NUMPRI; pri--; )
984 while (pendingcnt [pri]) 1041 while (pendingcnt [pri])
985 { 1042 {
986 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1043 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
987 1044
988 if (p->w) 1045 if (expect_true (p->w))
989 { 1046 {
990 p->w->pending = 0; 1047 p->w->pending = 0;
991 EV_CB_INVOKE (p->w, p->events); 1048 EV_CB_INVOKE (p->w, p->events);
992 } 1049 }
993 } 1050 }
994} 1051}
995 1052
996static void 1053inline void
997timers_reify (EV_P) 1054timers_reify (EV_P)
998{ 1055{
999 while (timercnt && ((WT)timers [0])->at <= mn_now) 1056 while (timercnt && ((WT)timers [0])->at <= mn_now)
1000 { 1057 {
1001 struct ev_timer *w = timers [0]; 1058 struct ev_timer *w = timers [0];
… …
1019 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1076 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1020 } 1077 }
1021} 1078}
1022 1079
1023#if EV_PERIODICS 1080#if EV_PERIODICS
1024static void 1081inline void
1025periodics_reify (EV_P) 1082periodics_reify (EV_P)
1026{ 1083{
1027 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1084 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1028 { 1085 {
1029 struct ev_periodic *w = periodics [0]; 1086 struct ev_periodic *w = periodics [0];
… …
1088 ev_rt_now = ev_time (); 1145 ev_rt_now = ev_time ();
1089 return 1; 1146 return 1;
1090 } 1147 }
1091} 1148}
1092 1149
1093static void 1150inline void
1094time_update (EV_P) 1151time_update (EV_P)
1095{ 1152{
1096 int i; 1153 int i;
1097 1154
1098#if EV_USE_MONOTONIC 1155#if EV_USE_MONOTONIC
… …
1159ev_loop (EV_P_ int flags) 1216ev_loop (EV_P_ int flags)
1160{ 1217{
1161 double block; 1218 double block;
1162 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1219 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1163 1220
1164 do 1221 while (activecnt)
1165 { 1222 {
1166 /* queue check watchers (and execute them) */ 1223 /* queue check watchers (and execute them) */
1167 if (expect_false (preparecnt)) 1224 if (expect_false (preparecnt))
1168 { 1225 {
1169 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1226 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
… …
1209 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1266 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1210 if (block > to) block = to; 1267 if (block > to) block = to;
1211 } 1268 }
1212#endif 1269#endif
1213 1270
1214 if (block < 0.) block = 0.; 1271 if (expect_false (block < 0.)) block = 0.;
1215 } 1272 }
1216 1273
1217 method_poll (EV_A_ block); 1274 method_poll (EV_A_ block);
1218 1275
1219 /* update ev_rt_now, do magic */ 1276 /* update ev_rt_now, do magic */
… …
1228 /* queue idle watchers unless io or timers are pending */ 1285 /* queue idle watchers unless io or timers are pending */
1229 if (idlecnt && !any_pending (EV_A)) 1286 if (idlecnt && !any_pending (EV_A))
1230 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1287 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1231 1288
1232 /* queue check watchers, to be executed first */ 1289 /* queue check watchers, to be executed first */
1233 if (checkcnt) 1290 if (expect_false (checkcnt))
1234 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1291 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1235 1292
1236 call_pending (EV_A); 1293 call_pending (EV_A);
1294
1295 if (expect_false (loop_done))
1296 break;
1237 } 1297 }
1238 while (activecnt && !loop_done);
1239 1298
1240 if (loop_done != 2) 1299 if (loop_done != 2)
1241 loop_done = 0; 1300 loop_done = 0;
1242} 1301}
1243 1302
… …
1303void 1362void
1304ev_io_start (EV_P_ struct ev_io *w) 1363ev_io_start (EV_P_ struct ev_io *w)
1305{ 1364{
1306 int fd = w->fd; 1365 int fd = w->fd;
1307 1366
1308 if (ev_is_active (w)) 1367 if (expect_false (ev_is_active (w)))
1309 return; 1368 return;
1310 1369
1311 assert (("ev_io_start called with negative fd", fd >= 0)); 1370 assert (("ev_io_start called with negative fd", fd >= 0));
1312 1371
1313 ev_start (EV_A_ (W)w, 1); 1372 ev_start (EV_A_ (W)w, 1);
… …
1319 1378
1320void 1379void
1321ev_io_stop (EV_P_ struct ev_io *w) 1380ev_io_stop (EV_P_ struct ev_io *w)
1322{ 1381{
1323 ev_clear_pending (EV_A_ (W)w); 1382 ev_clear_pending (EV_A_ (W)w);
1324 if (!ev_is_active (w)) 1383 if (expect_false (!ev_is_active (w)))
1325 return; 1384 return;
1326 1385
1327 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1386 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1328 1387
1329 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1388 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
… …
1333} 1392}
1334 1393
1335void 1394void
1336ev_timer_start (EV_P_ struct ev_timer *w) 1395ev_timer_start (EV_P_ struct ev_timer *w)
1337{ 1396{
1338 if (ev_is_active (w)) 1397 if (expect_false (ev_is_active (w)))
1339 return; 1398 return;
1340 1399
1341 ((WT)w)->at += mn_now; 1400 ((WT)w)->at += mn_now;
1342 1401
1343 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1402 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1344 1403
1345 ev_start (EV_A_ (W)w, ++timercnt); 1404 ev_start (EV_A_ (W)w, ++timercnt);
1346 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1405 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1347 timers [timercnt - 1] = w; 1406 timers [timercnt - 1] = w;
1348 upheap ((WT *)timers, timercnt - 1); 1407 upheap ((WT *)timers, timercnt - 1);
1349 1408
1350 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1409 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1351} 1410}
1352 1411
1353void 1412void
1354ev_timer_stop (EV_P_ struct ev_timer *w) 1413ev_timer_stop (EV_P_ struct ev_timer *w)
1355{ 1414{
1356 ev_clear_pending (EV_A_ (W)w); 1415 ev_clear_pending (EV_A_ (W)w);
1357 if (!ev_is_active (w)) 1416 if (expect_false (!ev_is_active (w)))
1358 return; 1417 return;
1359 1418
1360 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1419 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1361 1420
1362 if (((W)w)->active < timercnt--) 1421 if (expect_true (((W)w)->active < timercnt--))
1363 { 1422 {
1364 timers [((W)w)->active - 1] = timers [timercnt]; 1423 timers [((W)w)->active - 1] = timers [timercnt];
1365 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1424 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1366 } 1425 }
1367 1426
… …
1382 } 1441 }
1383 else 1442 else
1384 ev_timer_stop (EV_A_ w); 1443 ev_timer_stop (EV_A_ w);
1385 } 1444 }
1386 else if (w->repeat) 1445 else if (w->repeat)
1446 {
1447 w->at = w->repeat;
1387 ev_timer_start (EV_A_ w); 1448 ev_timer_start (EV_A_ w);
1449 }
1388} 1450}
1389 1451
1390#if EV_PERIODICS 1452#if EV_PERIODICS
1391void 1453void
1392ev_periodic_start (EV_P_ struct ev_periodic *w) 1454ev_periodic_start (EV_P_ struct ev_periodic *w)
1393{ 1455{
1394 if (ev_is_active (w)) 1456 if (expect_false (ev_is_active (w)))
1395 return; 1457 return;
1396 1458
1397 if (w->reschedule_cb) 1459 if (w->reschedule_cb)
1398 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1460 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1399 else if (w->interval) 1461 else if (w->interval)
… …
1402 /* this formula differs from the one in periodic_reify because we do not always round up */ 1464 /* 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; 1465 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1404 } 1466 }
1405 1467
1406 ev_start (EV_A_ (W)w, ++periodiccnt); 1468 ev_start (EV_A_ (W)w, ++periodiccnt);
1407 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1469 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1408 periodics [periodiccnt - 1] = w; 1470 periodics [periodiccnt - 1] = w;
1409 upheap ((WT *)periodics, periodiccnt - 1); 1471 upheap ((WT *)periodics, periodiccnt - 1);
1410 1472
1411 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1473 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1412} 1474}
1413 1475
1414void 1476void
1415ev_periodic_stop (EV_P_ struct ev_periodic *w) 1477ev_periodic_stop (EV_P_ struct ev_periodic *w)
1416{ 1478{
1417 ev_clear_pending (EV_A_ (W)w); 1479 ev_clear_pending (EV_A_ (W)w);
1418 if (!ev_is_active (w)) 1480 if (expect_false (!ev_is_active (w)))
1419 return; 1481 return;
1420 1482
1421 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1483 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1422 1484
1423 if (((W)w)->active < periodiccnt--) 1485 if (expect_true (((W)w)->active < periodiccnt--))
1424 { 1486 {
1425 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1487 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1426 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1488 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1427 } 1489 }
1428 1490
… …
1439#endif 1501#endif
1440 1502
1441void 1503void
1442ev_idle_start (EV_P_ struct ev_idle *w) 1504ev_idle_start (EV_P_ struct ev_idle *w)
1443{ 1505{
1444 if (ev_is_active (w)) 1506 if (expect_false (ev_is_active (w)))
1445 return; 1507 return;
1446 1508
1447 ev_start (EV_A_ (W)w, ++idlecnt); 1509 ev_start (EV_A_ (W)w, ++idlecnt);
1448 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1510 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1449 idles [idlecnt - 1] = w; 1511 idles [idlecnt - 1] = w;
1450} 1512}
1451 1513
1452void 1514void
1453ev_idle_stop (EV_P_ struct ev_idle *w) 1515ev_idle_stop (EV_P_ struct ev_idle *w)
1454{ 1516{
1455 ev_clear_pending (EV_A_ (W)w); 1517 ev_clear_pending (EV_A_ (W)w);
1456 if (!ev_is_active (w)) 1518 if (expect_false (!ev_is_active (w)))
1457 return; 1519 return;
1458 1520
1459 idles [((W)w)->active - 1] = idles [--idlecnt]; 1521 idles [((W)w)->active - 1] = idles [--idlecnt];
1460 ev_stop (EV_A_ (W)w); 1522 ev_stop (EV_A_ (W)w);
1461} 1523}
1462 1524
1463void 1525void
1464ev_prepare_start (EV_P_ struct ev_prepare *w) 1526ev_prepare_start (EV_P_ struct ev_prepare *w)
1465{ 1527{
1466 if (ev_is_active (w)) 1528 if (expect_false (ev_is_active (w)))
1467 return; 1529 return;
1468 1530
1469 ev_start (EV_A_ (W)w, ++preparecnt); 1531 ev_start (EV_A_ (W)w, ++preparecnt);
1470 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1532 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1471 prepares [preparecnt - 1] = w; 1533 prepares [preparecnt - 1] = w;
1472} 1534}
1473 1535
1474void 1536void
1475ev_prepare_stop (EV_P_ struct ev_prepare *w) 1537ev_prepare_stop (EV_P_ struct ev_prepare *w)
1476{ 1538{
1477 ev_clear_pending (EV_A_ (W)w); 1539 ev_clear_pending (EV_A_ (W)w);
1478 if (!ev_is_active (w)) 1540 if (expect_false (!ev_is_active (w)))
1479 return; 1541 return;
1480 1542
1481 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1543 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1482 ev_stop (EV_A_ (W)w); 1544 ev_stop (EV_A_ (W)w);
1483} 1545}
1484 1546
1485void 1547void
1486ev_check_start (EV_P_ struct ev_check *w) 1548ev_check_start (EV_P_ struct ev_check *w)
1487{ 1549{
1488 if (ev_is_active (w)) 1550 if (expect_false (ev_is_active (w)))
1489 return; 1551 return;
1490 1552
1491 ev_start (EV_A_ (W)w, ++checkcnt); 1553 ev_start (EV_A_ (W)w, ++checkcnt);
1492 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1554 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1493 checks [checkcnt - 1] = w; 1555 checks [checkcnt - 1] = w;
1494} 1556}
1495 1557
1496void 1558void
1497ev_check_stop (EV_P_ struct ev_check *w) 1559ev_check_stop (EV_P_ struct ev_check *w)
1498{ 1560{
1499 ev_clear_pending (EV_A_ (W)w); 1561 ev_clear_pending (EV_A_ (W)w);
1500 if (!ev_is_active (w)) 1562 if (expect_false (!ev_is_active (w)))
1501 return; 1563 return;
1502 1564
1503 checks [((W)w)->active - 1] = checks [--checkcnt]; 1565 checks [((W)w)->active - 1] = checks [--checkcnt];
1504 ev_stop (EV_A_ (W)w); 1566 ev_stop (EV_A_ (W)w);
1505} 1567}
… …
1510 1572
1511void 1573void
1512ev_signal_start (EV_P_ struct ev_signal *w) 1574ev_signal_start (EV_P_ struct ev_signal *w)
1513{ 1575{
1514#if EV_MULTIPLICITY 1576#if EV_MULTIPLICITY
1515 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1577 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1516#endif 1578#endif
1517 if (ev_is_active (w)) 1579 if (expect_false (ev_is_active (w)))
1518 return; 1580 return;
1519 1581
1520 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1582 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1521 1583
1522 ev_start (EV_A_ (W)w, 1); 1584 ev_start (EV_A_ (W)w, 1);
… …
1539 1601
1540void 1602void
1541ev_signal_stop (EV_P_ struct ev_signal *w) 1603ev_signal_stop (EV_P_ struct ev_signal *w)
1542{ 1604{
1543 ev_clear_pending (EV_A_ (W)w); 1605 ev_clear_pending (EV_A_ (W)w);
1544 if (!ev_is_active (w)) 1606 if (expect_false (!ev_is_active (w)))
1545 return; 1607 return;
1546 1608
1547 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1609 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1548 ev_stop (EV_A_ (W)w); 1610 ev_stop (EV_A_ (W)w);
1549 1611
… …
1553 1615
1554void 1616void
1555ev_child_start (EV_P_ struct ev_child *w) 1617ev_child_start (EV_P_ struct ev_child *w)
1556{ 1618{
1557#if EV_MULTIPLICITY 1619#if EV_MULTIPLICITY
1558 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1620 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1559#endif 1621#endif
1560 if (ev_is_active (w)) 1622 if (expect_false (ev_is_active (w)))
1561 return; 1623 return;
1562 1624
1563 ev_start (EV_A_ (W)w, 1); 1625 ev_start (EV_A_ (W)w, 1);
1564 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1626 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1565} 1627}
1566 1628
1567void 1629void
1568ev_child_stop (EV_P_ struct ev_child *w) 1630ev_child_stop (EV_P_ struct ev_child *w)
1569{ 1631{
1570 ev_clear_pending (EV_A_ (W)w); 1632 ev_clear_pending (EV_A_ (W)w);
1571 if (!ev_is_active (w)) 1633 if (expect_false (!ev_is_active (w)))
1572 return; 1634 return;
1573 1635
1574 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1636 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1575 ev_stop (EV_A_ (W)w); 1637 ev_stop (EV_A_ (W)w);
1576} 1638}
… …
1613void 1675void
1614ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1676ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1615{ 1677{
1616 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 1678 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1617 1679
1618 if (!once) 1680 if (expect_false (!once))
1681 {
1619 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1682 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1620 else 1683 return;
1621 { 1684 }
1685
1622 once->cb = cb; 1686 once->cb = cb;
1623 once->arg = arg; 1687 once->arg = arg;
1624 1688
1625 ev_init (&once->io, once_cb_io); 1689 ev_init (&once->io, once_cb_io);
1626 if (fd >= 0) 1690 if (fd >= 0)
1627 { 1691 {
1628 ev_io_set (&once->io, fd, events); 1692 ev_io_set (&once->io, fd, events);
1629 ev_io_start (EV_A_ &once->io); 1693 ev_io_start (EV_A_ &once->io);
1630 } 1694 }
1631 1695
1632 ev_init (&once->to, once_cb_to); 1696 ev_init (&once->to, once_cb_to);
1633 if (timeout >= 0.) 1697 if (timeout >= 0.)
1634 { 1698 {
1635 ev_timer_set (&once->to, timeout, 0.); 1699 ev_timer_set (&once->to, timeout, 0.);
1636 ev_timer_start (EV_A_ &once->to); 1700 ev_timer_start (EV_A_ &once->to);
1637 }
1638 } 1701 }
1639} 1702}
1640 1703
1641#ifdef __cplusplus 1704#ifdef __cplusplus
1642} 1705}

Diff Legend

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