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

Comparing libev/ev.c (file contents):
Revision 1.114 by root, Mon Nov 12 20:03:39 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
… …
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)
… …
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
… …
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);
… …
710 738
711#endif 739#endif
712 740
713/*****************************************************************************/ 741/*****************************************************************************/
714 742
743#if EV_USE_PORT
744# include "ev_port.c"
745#endif
715#if EV_USE_KQUEUE 746#if EV_USE_KQUEUE
716# include "ev_kqueue.c" 747# include "ev_kqueue.c"
717#endif 748#endif
718#if EV_USE_EPOLL 749#if EV_USE_EPOLL
719# include "ev_epoll.c" 750# include "ev_epoll.c"
… …
748 || getgid () != getegid (); 779 || getgid () != getegid ();
749#endif 780#endif
750} 781}
751 782
752unsigned int 783unsigned int
753ev_method (EV_P) 784ev_supported_backends (void)
754{ 785{
755 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;
756} 818}
757 819
758static void 820static void
759loop_init (EV_P_ unsigned int flags) 821loop_init (EV_P_ unsigned int flags)
760{ 822{
… …
771 ev_rt_now = ev_time (); 833 ev_rt_now = ev_time ();
772 mn_now = get_clock (); 834 mn_now = get_clock ();
773 now_floor = mn_now; 835 now_floor = mn_now;
774 rtmn_diff = ev_rt_now - mn_now; 836 rtmn_diff = ev_rt_now - mn_now;
775 837
776 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS")) 838 if (!(flags & EVFLAG_NOENV)
839 && !enable_secure ()
840 && getenv ("LIBEV_FLAGS"))
777 flags = atoi (getenv ("LIBEV_FLAGS")); 841 flags = atoi (getenv ("LIBEV_FLAGS"));
778 842
779 if (!(flags & 0x0000ffff)) 843 if (!(flags & 0x0000ffffUL))
780 flags |= 0x0000ffff; 844 flags |= ev_recommended_backends ();
781 845
782 method = 0; 846 method = 0;
847#if EV_USE_PORT
848 if (!method && (flags & EVBACKEND_PORT )) method = port_init (EV_A_ flags);
849#endif
783#if EV_USE_KQUEUE 850#if EV_USE_KQUEUE
784 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags); 851 if (!method && (flags & EVBACKEND_KQUEUE)) method = kqueue_init (EV_A_ flags);
785#endif 852#endif
786#if EV_USE_EPOLL 853#if EV_USE_EPOLL
787 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags); 854 if (!method && (flags & EVBACKEND_EPOLL )) method = epoll_init (EV_A_ flags);
788#endif 855#endif
789#if EV_USE_POLL 856#if EV_USE_POLL
790 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags); 857 if (!method && (flags & EVBACKEND_POLL )) method = poll_init (EV_A_ flags);
791#endif 858#endif
792#if EV_USE_SELECT 859#if EV_USE_SELECT
793 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags); 860 if (!method && (flags & EVBACKEND_SELECT)) method = select_init (EV_A_ flags);
794#endif 861#endif
795 862
796 ev_init (&sigev, sigcb); 863 ev_init (&sigev, sigcb);
797 ev_set_priority (&sigev, EV_MAXPRI); 864 ev_set_priority (&sigev, EV_MAXPRI);
798 } 865 }
799} 866}
800 867
801void 868static void
802loop_destroy (EV_P) 869loop_destroy (EV_P)
803{ 870{
804 int i; 871 int i;
805 872
873#if EV_USE_PORT
874 if (method == EVBACKEND_PORT ) port_destroy (EV_A);
875#endif
806#if EV_USE_KQUEUE 876#if EV_USE_KQUEUE
807 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 877 if (method == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
808#endif 878#endif
809#if EV_USE_EPOLL 879#if EV_USE_EPOLL
810 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 880 if (method == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
811#endif 881#endif
812#if EV_USE_POLL 882#if EV_USE_POLL
813 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 883 if (method == EVBACKEND_POLL ) poll_destroy (EV_A);
814#endif 884#endif
815#if EV_USE_SELECT 885#if EV_USE_SELECT
816 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 886 if (method == EVBACKEND_SELECT) select_destroy (EV_A);
817#endif 887#endif
818 888
819 for (i = NUMPRI; i--; ) 889 for (i = NUMPRI; i--; )
820 array_free (pending, [i]); 890 array_free (pending, [i]);
821 891
… …
833} 903}
834 904
835static void 905static void
836loop_fork (EV_P) 906loop_fork (EV_P)
837{ 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
838#if EV_USE_EPOLL 914#if EV_USE_EPOLL
839 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 915 if (method == EVBACKEND_EPOLL ) epoll_fork (EV_A);
840#endif
841#if EV_USE_KQUEUE
842 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
843#endif 916#endif
844 917
845 if (ev_is_active (&sigev)) 918 if (ev_is_active (&sigev))
846 { 919 {
847 /* default loop */ 920 /* default loop */
… …
891 964
892#endif 965#endif
893 966
894#if EV_MULTIPLICITY 967#if EV_MULTIPLICITY
895struct ev_loop * 968struct ev_loop *
969ev_default_loop_init (unsigned int flags)
896#else 970#else
897int 971int
898#endif
899ev_default_loop (unsigned int flags) 972ev_default_loop (unsigned int flags)
973#endif
900{ 974{
901 if (sigpipe [0] == sigpipe [1]) 975 if (sigpipe [0] == sigpipe [1])
902 if (pipe (sigpipe)) 976 if (pipe (sigpipe))
903 return 0; 977 return 0;
904 978
905 if (!default_loop) 979 if (!ev_default_loop_ptr)
906 { 980 {
907#if EV_MULTIPLICITY 981#if EV_MULTIPLICITY
908 struct ev_loop *loop = default_loop = &default_loop_struct; 982 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
909#else 983#else
910 default_loop = 1; 984 ev_default_loop_ptr = 1;
911#endif 985#endif
912 986
913 loop_init (EV_A_ flags); 987 loop_init (EV_A_ flags);
914 988
915 if (ev_method (EV_A)) 989 if (ev_method (EV_A))
… …
922 ev_signal_start (EV_A_ &childev); 996 ev_signal_start (EV_A_ &childev);
923 ev_unref (EV_A); /* child watcher should not keep loop alive */ 997 ev_unref (EV_A); /* child watcher should not keep loop alive */
924#endif 998#endif
925 } 999 }
926 else 1000 else
927 default_loop = 0; 1001 ev_default_loop_ptr = 0;
928 } 1002 }
929 1003
930 return default_loop; 1004 return ev_default_loop_ptr;
931} 1005}
932 1006
933void 1007void
934ev_default_destroy (void) 1008ev_default_destroy (void)
935{ 1009{
936#if EV_MULTIPLICITY 1010#if EV_MULTIPLICITY
937 struct ev_loop *loop = default_loop; 1011 struct ev_loop *loop = ev_default_loop_ptr;
938#endif 1012#endif
939 1013
940#ifndef _WIN32 1014#ifndef _WIN32
941 ev_ref (EV_A); /* child watcher */ 1015 ev_ref (EV_A); /* child watcher */
942 ev_signal_stop (EV_A_ &childev); 1016 ev_signal_stop (EV_A_ &childev);
… …
953 1027
954void 1028void
955ev_default_fork (void) 1029ev_default_fork (void)
956{ 1030{
957#if EV_MULTIPLICITY 1031#if EV_MULTIPLICITY
958 struct ev_loop *loop = default_loop; 1032 struct ev_loop *loop = ev_default_loop_ptr;
959#endif 1033#endif
960 1034
961 if (method) 1035 if (method)
962 postfork = 1; 1036 postfork = 1;
963} 1037}
… …
974 return 1; 1048 return 1;
975 1049
976 return 0; 1050 return 0;
977} 1051}
978 1052
979static void 1053inline void
980call_pending (EV_P) 1054call_pending (EV_P)
981{ 1055{
982 int pri; 1056 int pri;
983 1057
984 for (pri = NUMPRI; pri--; ) 1058 for (pri = NUMPRI; pri--; )
985 while (pendingcnt [pri]) 1059 while (pendingcnt [pri])
986 { 1060 {
987 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1061 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
988 1062
989 if (p->w) 1063 if (expect_true (p->w))
990 { 1064 {
991 p->w->pending = 0; 1065 p->w->pending = 0;
992 EV_CB_INVOKE (p->w, p->events); 1066 EV_CB_INVOKE (p->w, p->events);
993 } 1067 }
994 } 1068 }
995} 1069}
996 1070
997static void 1071inline void
998timers_reify (EV_P) 1072timers_reify (EV_P)
999{ 1073{
1000 while (timercnt && ((WT)timers [0])->at <= mn_now) 1074 while (timercnt && ((WT)timers [0])->at <= mn_now)
1001 { 1075 {
1002 struct ev_timer *w = timers [0]; 1076 struct ev_timer *w = timers [0];
… …
1020 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1094 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1021 } 1095 }
1022} 1096}
1023 1097
1024#if EV_PERIODICS 1098#if EV_PERIODICS
1025static void 1099inline void
1026periodics_reify (EV_P) 1100periodics_reify (EV_P)
1027{ 1101{
1028 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1102 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1029 { 1103 {
1030 struct ev_periodic *w = periodics [0]; 1104 struct ev_periodic *w = periodics [0];
… …
1089 ev_rt_now = ev_time (); 1163 ev_rt_now = ev_time ();
1090 return 1; 1164 return 1;
1091 } 1165 }
1092} 1166}
1093 1167
1094static void 1168inline void
1095time_update (EV_P) 1169time_update (EV_P)
1096{ 1170{
1097 int i; 1171 int i;
1098 1172
1099#if EV_USE_MONOTONIC 1173#if EV_USE_MONOTONIC
… …
1160ev_loop (EV_P_ int flags) 1234ev_loop (EV_P_ int flags)
1161{ 1235{
1162 double block; 1236 double block;
1163 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1237 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1164 1238
1165 do 1239 while (activecnt)
1166 { 1240 {
1167 /* queue check watchers (and execute them) */ 1241 /* queue check watchers (and execute them) */
1168 if (expect_false (preparecnt)) 1242 if (expect_false (preparecnt))
1169 { 1243 {
1170 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1244 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
… …
1210 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;
1211 if (block > to) block = to; 1285 if (block > to) block = to;
1212 } 1286 }
1213#endif 1287#endif
1214 1288
1215 if (block < 0.) block = 0.; 1289 if (expect_false (block < 0.)) block = 0.;
1216 } 1290 }
1217 1291
1218 method_poll (EV_A_ block); 1292 method_poll (EV_A_ block);
1219 1293
1220 /* update ev_rt_now, do magic */ 1294 /* update ev_rt_now, do magic */
… …
1229 /* queue idle watchers unless io or timers are pending */ 1303 /* queue idle watchers unless io or timers are pending */
1230 if (idlecnt && !any_pending (EV_A)) 1304 if (idlecnt && !any_pending (EV_A))
1231 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1305 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1232 1306
1233 /* queue check watchers, to be executed first */ 1307 /* queue check watchers, to be executed first */
1234 if (checkcnt) 1308 if (expect_false (checkcnt))
1235 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1309 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1236 1310
1237 call_pending (EV_A); 1311 call_pending (EV_A);
1312
1313 if (expect_false (loop_done))
1314 break;
1238 } 1315 }
1239 while (activecnt && !loop_done);
1240 1316
1241 if (loop_done != 2) 1317 if (loop_done != 2)
1242 loop_done = 0; 1318 loop_done = 0;
1243} 1319}
1244 1320
… …
1304void 1380void
1305ev_io_start (EV_P_ struct ev_io *w) 1381ev_io_start (EV_P_ struct ev_io *w)
1306{ 1382{
1307 int fd = w->fd; 1383 int fd = w->fd;
1308 1384
1309 if (ev_is_active (w)) 1385 if (expect_false (ev_is_active (w)))
1310 return; 1386 return;
1311 1387
1312 assert (("ev_io_start called with negative fd", fd >= 0)); 1388 assert (("ev_io_start called with negative fd", fd >= 0));
1313 1389
1314 ev_start (EV_A_ (W)w, 1); 1390 ev_start (EV_A_ (W)w, 1);
… …
1320 1396
1321void 1397void
1322ev_io_stop (EV_P_ struct ev_io *w) 1398ev_io_stop (EV_P_ struct ev_io *w)
1323{ 1399{
1324 ev_clear_pending (EV_A_ (W)w); 1400 ev_clear_pending (EV_A_ (W)w);
1325 if (!ev_is_active (w)) 1401 if (expect_false (!ev_is_active (w)))
1326 return; 1402 return;
1327 1403
1328 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));
1329 1405
1330 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1406 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
… …
1334} 1410}
1335 1411
1336void 1412void
1337ev_timer_start (EV_P_ struct ev_timer *w) 1413ev_timer_start (EV_P_ struct ev_timer *w)
1338{ 1414{
1339 if (ev_is_active (w)) 1415 if (expect_false (ev_is_active (w)))
1340 return; 1416 return;
1341 1417
1342 ((WT)w)->at += mn_now; 1418 ((WT)w)->at += mn_now;
1343 1419
1344 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.));
… …
1353 1429
1354void 1430void
1355ev_timer_stop (EV_P_ struct ev_timer *w) 1431ev_timer_stop (EV_P_ struct ev_timer *w)
1356{ 1432{
1357 ev_clear_pending (EV_A_ (W)w); 1433 ev_clear_pending (EV_A_ (W)w);
1358 if (!ev_is_active (w)) 1434 if (expect_false (!ev_is_active (w)))
1359 return; 1435 return;
1360 1436
1361 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1437 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1362 1438
1363 if (((W)w)->active < timercnt--) 1439 if (expect_true (((W)w)->active < timercnt--))
1364 { 1440 {
1365 timers [((W)w)->active - 1] = timers [timercnt]; 1441 timers [((W)w)->active - 1] = timers [timercnt];
1366 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1442 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1367 } 1443 }
1368 1444
… …
1393 1469
1394#if EV_PERIODICS 1470#if EV_PERIODICS
1395void 1471void
1396ev_periodic_start (EV_P_ struct ev_periodic *w) 1472ev_periodic_start (EV_P_ struct ev_periodic *w)
1397{ 1473{
1398 if (ev_is_active (w)) 1474 if (expect_false (ev_is_active (w)))
1399 return; 1475 return;
1400 1476
1401 if (w->reschedule_cb) 1477 if (w->reschedule_cb)
1402 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1478 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1403 else if (w->interval) 1479 else if (w->interval)
… …
1417 1493
1418void 1494void
1419ev_periodic_stop (EV_P_ struct ev_periodic *w) 1495ev_periodic_stop (EV_P_ struct ev_periodic *w)
1420{ 1496{
1421 ev_clear_pending (EV_A_ (W)w); 1497 ev_clear_pending (EV_A_ (W)w);
1422 if (!ev_is_active (w)) 1498 if (expect_false (!ev_is_active (w)))
1423 return; 1499 return;
1424 1500
1425 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1501 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1426 1502
1427 if (((W)w)->active < periodiccnt--) 1503 if (expect_true (((W)w)->active < periodiccnt--))
1428 { 1504 {
1429 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1505 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1430 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1506 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1431 } 1507 }
1432 1508
… …
1443#endif 1519#endif
1444 1520
1445void 1521void
1446ev_idle_start (EV_P_ struct ev_idle *w) 1522ev_idle_start (EV_P_ struct ev_idle *w)
1447{ 1523{
1448 if (ev_is_active (w)) 1524 if (expect_false (ev_is_active (w)))
1449 return; 1525 return;
1450 1526
1451 ev_start (EV_A_ (W)w, ++idlecnt); 1527 ev_start (EV_A_ (W)w, ++idlecnt);
1452 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2); 1528 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1453 idles [idlecnt - 1] = w; 1529 idles [idlecnt - 1] = w;
… …
1455 1531
1456void 1532void
1457ev_idle_stop (EV_P_ struct ev_idle *w) 1533ev_idle_stop (EV_P_ struct ev_idle *w)
1458{ 1534{
1459 ev_clear_pending (EV_A_ (W)w); 1535 ev_clear_pending (EV_A_ (W)w);
1460 if (!ev_is_active (w)) 1536 if (expect_false (!ev_is_active (w)))
1461 return; 1537 return;
1462 1538
1463 idles [((W)w)->active - 1] = idles [--idlecnt]; 1539 idles [((W)w)->active - 1] = idles [--idlecnt];
1464 ev_stop (EV_A_ (W)w); 1540 ev_stop (EV_A_ (W)w);
1465} 1541}
1466 1542
1467void 1543void
1468ev_prepare_start (EV_P_ struct ev_prepare *w) 1544ev_prepare_start (EV_P_ struct ev_prepare *w)
1469{ 1545{
1470 if (ev_is_active (w)) 1546 if (expect_false (ev_is_active (w)))
1471 return; 1547 return;
1472 1548
1473 ev_start (EV_A_ (W)w, ++preparecnt); 1549 ev_start (EV_A_ (W)w, ++preparecnt);
1474 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 1550 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1475 prepares [preparecnt - 1] = w; 1551 prepares [preparecnt - 1] = w;
… …
1477 1553
1478void 1554void
1479ev_prepare_stop (EV_P_ struct ev_prepare *w) 1555ev_prepare_stop (EV_P_ struct ev_prepare *w)
1480{ 1556{
1481 ev_clear_pending (EV_A_ (W)w); 1557 ev_clear_pending (EV_A_ (W)w);
1482 if (!ev_is_active (w)) 1558 if (expect_false (!ev_is_active (w)))
1483 return; 1559 return;
1484 1560
1485 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1561 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1486 ev_stop (EV_A_ (W)w); 1562 ev_stop (EV_A_ (W)w);
1487} 1563}
1488 1564
1489void 1565void
1490ev_check_start (EV_P_ struct ev_check *w) 1566ev_check_start (EV_P_ struct ev_check *w)
1491{ 1567{
1492 if (ev_is_active (w)) 1568 if (expect_false (ev_is_active (w)))
1493 return; 1569 return;
1494 1570
1495 ev_start (EV_A_ (W)w, ++checkcnt); 1571 ev_start (EV_A_ (W)w, ++checkcnt);
1496 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2); 1572 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1497 checks [checkcnt - 1] = w; 1573 checks [checkcnt - 1] = w;
… …
1499 1575
1500void 1576void
1501ev_check_stop (EV_P_ struct ev_check *w) 1577ev_check_stop (EV_P_ struct ev_check *w)
1502{ 1578{
1503 ev_clear_pending (EV_A_ (W)w); 1579 ev_clear_pending (EV_A_ (W)w);
1504 if (!ev_is_active (w)) 1580 if (expect_false (!ev_is_active (w)))
1505 return; 1581 return;
1506 1582
1507 checks [((W)w)->active - 1] = checks [--checkcnt]; 1583 checks [((W)w)->active - 1] = checks [--checkcnt];
1508 ev_stop (EV_A_ (W)w); 1584 ev_stop (EV_A_ (W)w);
1509} 1585}
… …
1514 1590
1515void 1591void
1516ev_signal_start (EV_P_ struct ev_signal *w) 1592ev_signal_start (EV_P_ struct ev_signal *w)
1517{ 1593{
1518#if EV_MULTIPLICITY 1594#if EV_MULTIPLICITY
1519 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));
1520#endif 1596#endif
1521 if (ev_is_active (w)) 1597 if (expect_false (ev_is_active (w)))
1522 return; 1598 return;
1523 1599
1524 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));
1525 1601
1526 ev_start (EV_A_ (W)w, 1); 1602 ev_start (EV_A_ (W)w, 1);
… …
1543 1619
1544void 1620void
1545ev_signal_stop (EV_P_ struct ev_signal *w) 1621ev_signal_stop (EV_P_ struct ev_signal *w)
1546{ 1622{
1547 ev_clear_pending (EV_A_ (W)w); 1623 ev_clear_pending (EV_A_ (W)w);
1548 if (!ev_is_active (w)) 1624 if (expect_false (!ev_is_active (w)))
1549 return; 1625 return;
1550 1626
1551 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1627 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1552 ev_stop (EV_A_ (W)w); 1628 ev_stop (EV_A_ (W)w);
1553 1629
… …
1557 1633
1558void 1634void
1559ev_child_start (EV_P_ struct ev_child *w) 1635ev_child_start (EV_P_ struct ev_child *w)
1560{ 1636{
1561#if EV_MULTIPLICITY 1637#if EV_MULTIPLICITY
1562 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));
1563#endif 1639#endif
1564 if (ev_is_active (w)) 1640 if (expect_false (ev_is_active (w)))
1565 return; 1641 return;
1566 1642
1567 ev_start (EV_A_ (W)w, 1); 1643 ev_start (EV_A_ (W)w, 1);
1568 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1644 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1569} 1645}
1570 1646
1571void 1647void
1572ev_child_stop (EV_P_ struct ev_child *w) 1648ev_child_stop (EV_P_ struct ev_child *w)
1573{ 1649{
1574 ev_clear_pending (EV_A_ (W)w); 1650 ev_clear_pending (EV_A_ (W)w);
1575 if (!ev_is_active (w)) 1651 if (expect_false (!ev_is_active (w)))
1576 return; 1652 return;
1577 1653
1578 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1654 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1579 ev_stop (EV_A_ (W)w); 1655 ev_stop (EV_A_ (W)w);
1580} 1656}
… …
1617void 1693void
1618ev_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)
1619{ 1695{
1620 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));
1621 1697
1622 if (!once) 1698 if (expect_false (!once))
1699 {
1623 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1700 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1624 else 1701 return;
1625 { 1702 }
1703
1626 once->cb = cb; 1704 once->cb = cb;
1627 once->arg = arg; 1705 once->arg = arg;
1628 1706
1629 ev_init (&once->io, once_cb_io); 1707 ev_init (&once->io, once_cb_io);
1630 if (fd >= 0) 1708 if (fd >= 0)
1631 { 1709 {
1632 ev_io_set (&once->io, fd, events); 1710 ev_io_set (&once->io, fd, events);
1633 ev_io_start (EV_A_ &once->io); 1711 ev_io_start (EV_A_ &once->io);
1634 } 1712 }
1635 1713
1636 ev_init (&once->to, once_cb_to); 1714 ev_init (&once->to, once_cb_to);
1637 if (timeout >= 0.) 1715 if (timeout >= 0.)
1638 { 1716 {
1639 ev_timer_set (&once->to, timeout, 0.); 1717 ev_timer_set (&once->to, timeout, 0.);
1640 ev_timer_start (EV_A_ &once->to); 1718 ev_timer_start (EV_A_ &once->to);
1641 }
1642 } 1719 }
1643} 1720}
1644 1721
1645#ifdef __cplusplus 1722#ifdef __cplusplus
1646} 1723}

Diff Legend

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