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

Comparing libev/ev.c (file contents):
Revision 1.115 by root, Wed Nov 14 04:53:21 2007 UTC vs.
Revision 1.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
… …
258 #include "ev_vars.h" 292 #include "ev_vars.h"
259 #undef VAR 293 #undef VAR
260 }; 294 };
261 #include "ev_wrap.h" 295 #include "ev_wrap.h"
262 296
263 struct ev_loop default_loop_struct; 297 static struct ev_loop default_loop_struct;
264 static struct ev_loop *default_loop; 298 struct ev_loop *ev_default_loop_ptr;
265 299
266#else 300#else
267 301
268 ev_tstamp ev_rt_now; 302 ev_tstamp ev_rt_now;
269 #define VAR(name,decl) static decl; 303 #define VAR(name,decl) static decl;
270 #include "ev_vars.h" 304 #include "ev_vars.h"
271 #undef VAR 305 #undef VAR
272 306
273 static int default_loop; 307 static int ev_default_loop_ptr;
274 308
275#endif 309#endif
276 310
277/*****************************************************************************/ 311/*****************************************************************************/
278 312
… …
359void 393void
360ev_feed_event (EV_P_ void *w, int revents) 394ev_feed_event (EV_P_ void *w, int revents)
361{ 395{
362 W w_ = (W)w; 396 W w_ = (W)w;
363 397
364 if (w_->pending) 398 if (expect_false (w_->pending))
365 { 399 {
366 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 400 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
367 return; 401 return;
368 } 402 }
369 403
… …
403 fd_event (EV_A_ fd, revents); 437 fd_event (EV_A_ fd, revents);
404} 438}
405 439
406/*****************************************************************************/ 440/*****************************************************************************/
407 441
408static void 442inline void
409fd_reify (EV_P) 443fd_reify (EV_P)
410{ 444{
411 int i; 445 int i;
412 446
413 for (i = 0; i < fdchangecnt; ++i) 447 for (i = 0; i < fdchangecnt; ++i)
… …
440} 474}
441 475
442static void 476static void
443fd_change (EV_P_ int fd) 477fd_change (EV_P_ int fd)
444{ 478{
445 if (anfds [fd].reify) 479 if (expect_false (anfds [fd].reify))
446 return; 480 return;
447 481
448 anfds [fd].reify = 1; 482 anfds [fd].reify = 1;
449 483
450 ++fdchangecnt; 484 ++fdchangecnt;
… …
462 ev_io_stop (EV_A_ w); 496 ev_io_stop (EV_A_ w);
463 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);
464 } 498 }
465} 499}
466 500
467static int 501inline int
468fd_valid (int fd) 502fd_valid (int fd)
469{ 503{
470#ifdef _WIN32 504#ifdef _WIN32
471 return _get_osfhandle (fd) != -1; 505 return _get_osfhandle (fd) != -1;
472#else 506#else
… …
614ev_feed_signal_event (EV_P_ int signum) 648ev_feed_signal_event (EV_P_ int signum)
615{ 649{
616 WL w; 650 WL w;
617 651
618#if EV_MULTIPLICITY 652#if EV_MULTIPLICITY
619 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));
620#endif 654#endif
621 655
622 --signum; 656 --signum;
623 657
624 if (signum < 0 || signum >= signalmax) 658 if (signum < 0 || signum >= signalmax)
… …
641 for (signum = signalmax; signum--; ) 675 for (signum = signalmax; signum--; )
642 if (signals [signum].gotsig) 676 if (signals [signum].gotsig)
643 ev_feed_signal_event (EV_A_ signum + 1); 677 ev_feed_signal_event (EV_A_ signum + 1);
644} 678}
645 679
646inline void 680static void
647fd_intern (int fd) 681fd_intern (int fd)
648{ 682{
649#ifdef _WIN32 683#ifdef _WIN32
650 int arg = 1; 684 int arg = 1;
651 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 685 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
710 744
711#endif 745#endif
712 746
713/*****************************************************************************/ 747/*****************************************************************************/
714 748
749#if EV_USE_PORT
750# include "ev_port.c"
751#endif
715#if EV_USE_KQUEUE 752#if EV_USE_KQUEUE
716# include "ev_kqueue.c" 753# include "ev_kqueue.c"
717#endif 754#endif
718#if EV_USE_EPOLL 755#if EV_USE_EPOLL
719# include "ev_epoll.c" 756# include "ev_epoll.c"
… …
771 ev_rt_now = ev_time (); 808 ev_rt_now = ev_time ();
772 mn_now = get_clock (); 809 mn_now = get_clock ();
773 now_floor = mn_now; 810 now_floor = mn_now;
774 rtmn_diff = ev_rt_now - mn_now; 811 rtmn_diff = ev_rt_now - mn_now;
775 812
776 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS")) 813 if (!(flags & EVFLAG_NOENV)
814 && !enable_secure ()
815 && getenv ("LIBEV_FLAGS"))
777 flags = atoi (getenv ("LIBEV_FLAGS")); 816 flags = atoi (getenv ("LIBEV_FLAGS"));
778 817
779 if (!(flags & 0x0000ffff)) 818 if (!(flags & EVMETHOD_ALL))
780 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 }
781 827
782 method = 0; 828 method = 0;
829#if EV_USE_PORT
830 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags);
831#endif
783#if EV_USE_KQUEUE 832#if EV_USE_KQUEUE
784 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags); 833 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
785#endif 834#endif
786#if EV_USE_EPOLL 835#if EV_USE_EPOLL
787 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags); 836 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
… …
796 ev_init (&sigev, sigcb); 845 ev_init (&sigev, sigcb);
797 ev_set_priority (&sigev, EV_MAXPRI); 846 ev_set_priority (&sigev, EV_MAXPRI);
798 } 847 }
799} 848}
800 849
801void 850static void
802loop_destroy (EV_P) 851loop_destroy (EV_P)
803{ 852{
804 int i; 853 int i;
805 854
855#if EV_USE_PORT
856 if (method == EVMETHOD_PORT ) port_destroy (EV_A);
857#endif
806#if EV_USE_KQUEUE 858#if EV_USE_KQUEUE
807 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 859 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
808#endif 860#endif
809#if EV_USE_EPOLL 861#if EV_USE_EPOLL
810 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 862 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
… …
833} 885}
834 886
835static void 887static void
836loop_fork (EV_P) 888loop_fork (EV_P)
837{ 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
838#if EV_USE_EPOLL 896#if EV_USE_EPOLL
839 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 897 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
840#endif
841#if EV_USE_KQUEUE
842 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
843#endif 898#endif
844 899
845 if (ev_is_active (&sigev)) 900 if (ev_is_active (&sigev))
846 { 901 {
847 /* default loop */ 902 /* default loop */
… …
891 946
892#endif 947#endif
893 948
894#if EV_MULTIPLICITY 949#if EV_MULTIPLICITY
895struct ev_loop * 950struct ev_loop *
951ev_default_loop_init (unsigned int flags)
896#else 952#else
897int 953int
898#endif
899ev_default_loop (unsigned int flags) 954ev_default_loop (unsigned int flags)
955#endif
900{ 956{
901 if (sigpipe [0] == sigpipe [1]) 957 if (sigpipe [0] == sigpipe [1])
902 if (pipe (sigpipe)) 958 if (pipe (sigpipe))
903 return 0; 959 return 0;
904 960
905 if (!default_loop) 961 if (!ev_default_loop_ptr)
906 { 962 {
907#if EV_MULTIPLICITY 963#if EV_MULTIPLICITY
908 struct ev_loop *loop = default_loop = &default_loop_struct; 964 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
909#else 965#else
910 default_loop = 1; 966 ev_default_loop_ptr = 1;
911#endif 967#endif
912 968
913 loop_init (EV_A_ flags); 969 loop_init (EV_A_ flags);
914 970
915 if (ev_method (EV_A)) 971 if (ev_method (EV_A))
… …
922 ev_signal_start (EV_A_ &childev); 978 ev_signal_start (EV_A_ &childev);
923 ev_unref (EV_A); /* child watcher should not keep loop alive */ 979 ev_unref (EV_A); /* child watcher should not keep loop alive */
924#endif 980#endif
925 } 981 }
926 else 982 else
927 default_loop = 0; 983 ev_default_loop_ptr = 0;
928 } 984 }
929 985
930 return default_loop; 986 return ev_default_loop_ptr;
931} 987}
932 988
933void 989void
934ev_default_destroy (void) 990ev_default_destroy (void)
935{ 991{
936#if EV_MULTIPLICITY 992#if EV_MULTIPLICITY
937 struct ev_loop *loop = default_loop; 993 struct ev_loop *loop = ev_default_loop_ptr;
938#endif 994#endif
939 995
940#ifndef _WIN32 996#ifndef _WIN32
941 ev_ref (EV_A); /* child watcher */ 997 ev_ref (EV_A); /* child watcher */
942 ev_signal_stop (EV_A_ &childev); 998 ev_signal_stop (EV_A_ &childev);
… …
953 1009
954void 1010void
955ev_default_fork (void) 1011ev_default_fork (void)
956{ 1012{
957#if EV_MULTIPLICITY 1013#if EV_MULTIPLICITY
958 struct ev_loop *loop = default_loop; 1014 struct ev_loop *loop = ev_default_loop_ptr;
959#endif 1015#endif
960 1016
961 if (method) 1017 if (method)
962 postfork = 1; 1018 postfork = 1;
963} 1019}
… …
974 return 1; 1030 return 1;
975 1031
976 return 0; 1032 return 0;
977} 1033}
978 1034
979static void 1035inline void
980call_pending (EV_P) 1036call_pending (EV_P)
981{ 1037{
982 int pri; 1038 int pri;
983 1039
984 for (pri = NUMPRI; pri--; ) 1040 for (pri = NUMPRI; pri--; )
985 while (pendingcnt [pri]) 1041 while (pendingcnt [pri])
986 { 1042 {
987 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1043 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
988 1044
989 if (p->w) 1045 if (expect_true (p->w))
990 { 1046 {
991 p->w->pending = 0; 1047 p->w->pending = 0;
992 EV_CB_INVOKE (p->w, p->events); 1048 EV_CB_INVOKE (p->w, p->events);
993 } 1049 }
994 } 1050 }
995} 1051}
996 1052
997static void 1053inline void
998timers_reify (EV_P) 1054timers_reify (EV_P)
999{ 1055{
1000 while (timercnt && ((WT)timers [0])->at <= mn_now) 1056 while (timercnt && ((WT)timers [0])->at <= mn_now)
1001 { 1057 {
1002 struct ev_timer *w = timers [0]; 1058 struct ev_timer *w = timers [0];
… …
1020 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1076 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1021 } 1077 }
1022} 1078}
1023 1079
1024#if EV_PERIODICS 1080#if EV_PERIODICS
1025static void 1081inline void
1026periodics_reify (EV_P) 1082periodics_reify (EV_P)
1027{ 1083{
1028 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1084 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1029 { 1085 {
1030 struct ev_periodic *w = periodics [0]; 1086 struct ev_periodic *w = periodics [0];
… …
1089 ev_rt_now = ev_time (); 1145 ev_rt_now = ev_time ();
1090 return 1; 1146 return 1;
1091 } 1147 }
1092} 1148}
1093 1149
1094static void 1150inline void
1095time_update (EV_P) 1151time_update (EV_P)
1096{ 1152{
1097 int i; 1153 int i;
1098 1154
1099#if EV_USE_MONOTONIC 1155#if EV_USE_MONOTONIC
… …
1210 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;
1211 if (block > to) block = to; 1267 if (block > to) block = to;
1212 } 1268 }
1213#endif 1269#endif
1214 1270
1215 if (block < 0.) block = 0.; 1271 if (expect_false (block < 0.)) block = 0.;
1216 } 1272 }
1217 1273
1218 method_poll (EV_A_ block); 1274 method_poll (EV_A_ block);
1219 1275
1220 /* update ev_rt_now, do magic */ 1276 /* update ev_rt_now, do magic */
… …
1229 /* queue idle watchers unless io or timers are pending */ 1285 /* queue idle watchers unless io or timers are pending */
1230 if (idlecnt && !any_pending (EV_A)) 1286 if (idlecnt && !any_pending (EV_A))
1231 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1287 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1232 1288
1233 /* queue check watchers, to be executed first */ 1289 /* queue check watchers, to be executed first */
1234 if (checkcnt) 1290 if (expect_false (checkcnt))
1235 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1291 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1236 1292
1237 call_pending (EV_A); 1293 call_pending (EV_A);
1238 1294
1239 if (loop_done) 1295 if (expect_false (loop_done))
1240 break; 1296 break;
1241 } 1297 }
1242 1298
1243 if (loop_done != 2) 1299 if (loop_done != 2)
1244 loop_done = 0; 1300 loop_done = 0;
… …
1306void 1362void
1307ev_io_start (EV_P_ struct ev_io *w) 1363ev_io_start (EV_P_ struct ev_io *w)
1308{ 1364{
1309 int fd = w->fd; 1365 int fd = w->fd;
1310 1366
1311 if (ev_is_active (w)) 1367 if (expect_false (ev_is_active (w)))
1312 return; 1368 return;
1313 1369
1314 assert (("ev_io_start called with negative fd", fd >= 0)); 1370 assert (("ev_io_start called with negative fd", fd >= 0));
1315 1371
1316 ev_start (EV_A_ (W)w, 1); 1372 ev_start (EV_A_ (W)w, 1);
… …
1322 1378
1323void 1379void
1324ev_io_stop (EV_P_ struct ev_io *w) 1380ev_io_stop (EV_P_ struct ev_io *w)
1325{ 1381{
1326 ev_clear_pending (EV_A_ (W)w); 1382 ev_clear_pending (EV_A_ (W)w);
1327 if (!ev_is_active (w)) 1383 if (expect_false (!ev_is_active (w)))
1328 return; 1384 return;
1329 1385
1330 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));
1331 1387
1332 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1388 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
… …
1336} 1392}
1337 1393
1338void 1394void
1339ev_timer_start (EV_P_ struct ev_timer *w) 1395ev_timer_start (EV_P_ struct ev_timer *w)
1340{ 1396{
1341 if (ev_is_active (w)) 1397 if (expect_false (ev_is_active (w)))
1342 return; 1398 return;
1343 1399
1344 ((WT)w)->at += mn_now; 1400 ((WT)w)->at += mn_now;
1345 1401
1346 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.));
… …
1355 1411
1356void 1412void
1357ev_timer_stop (EV_P_ struct ev_timer *w) 1413ev_timer_stop (EV_P_ struct ev_timer *w)
1358{ 1414{
1359 ev_clear_pending (EV_A_ (W)w); 1415 ev_clear_pending (EV_A_ (W)w);
1360 if (!ev_is_active (w)) 1416 if (expect_false (!ev_is_active (w)))
1361 return; 1417 return;
1362 1418
1363 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1419 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1364 1420
1365 if (((W)w)->active < timercnt--) 1421 if (expect_true (((W)w)->active < timercnt--))
1366 { 1422 {
1367 timers [((W)w)->active - 1] = timers [timercnt]; 1423 timers [((W)w)->active - 1] = timers [timercnt];
1368 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1424 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1369 } 1425 }
1370 1426
… …
1395 1451
1396#if EV_PERIODICS 1452#if EV_PERIODICS
1397void 1453void
1398ev_periodic_start (EV_P_ struct ev_periodic *w) 1454ev_periodic_start (EV_P_ struct ev_periodic *w)
1399{ 1455{
1400 if (ev_is_active (w)) 1456 if (expect_false (ev_is_active (w)))
1401 return; 1457 return;
1402 1458
1403 if (w->reschedule_cb) 1459 if (w->reschedule_cb)
1404 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1460 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1405 else if (w->interval) 1461 else if (w->interval)
… …
1419 1475
1420void 1476void
1421ev_periodic_stop (EV_P_ struct ev_periodic *w) 1477ev_periodic_stop (EV_P_ struct ev_periodic *w)
1422{ 1478{
1423 ev_clear_pending (EV_A_ (W)w); 1479 ev_clear_pending (EV_A_ (W)w);
1424 if (!ev_is_active (w)) 1480 if (expect_false (!ev_is_active (w)))
1425 return; 1481 return;
1426 1482
1427 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1483 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1428 1484
1429 if (((W)w)->active < periodiccnt--) 1485 if (expect_true (((W)w)->active < periodiccnt--))
1430 { 1486 {
1431 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1487 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1432 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1488 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1433 } 1489 }
1434 1490
… …
1445#endif 1501#endif
1446 1502
1447void 1503void
1448ev_idle_start (EV_P_ struct ev_idle *w) 1504ev_idle_start (EV_P_ struct ev_idle *w)
1449{ 1505{
1450 if (ev_is_active (w)) 1506 if (expect_false (ev_is_active (w)))
1451 return; 1507 return;
1452 1508
1453 ev_start (EV_A_ (W)w, ++idlecnt); 1509 ev_start (EV_A_ (W)w, ++idlecnt);
1454 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2); 1510 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1455 idles [idlecnt - 1] = w; 1511 idles [idlecnt - 1] = w;
… …
1457 1513
1458void 1514void
1459ev_idle_stop (EV_P_ struct ev_idle *w) 1515ev_idle_stop (EV_P_ struct ev_idle *w)
1460{ 1516{
1461 ev_clear_pending (EV_A_ (W)w); 1517 ev_clear_pending (EV_A_ (W)w);
1462 if (!ev_is_active (w)) 1518 if (expect_false (!ev_is_active (w)))
1463 return; 1519 return;
1464 1520
1465 idles [((W)w)->active - 1] = idles [--idlecnt]; 1521 idles [((W)w)->active - 1] = idles [--idlecnt];
1466 ev_stop (EV_A_ (W)w); 1522 ev_stop (EV_A_ (W)w);
1467} 1523}
1468 1524
1469void 1525void
1470ev_prepare_start (EV_P_ struct ev_prepare *w) 1526ev_prepare_start (EV_P_ struct ev_prepare *w)
1471{ 1527{
1472 if (ev_is_active (w)) 1528 if (expect_false (ev_is_active (w)))
1473 return; 1529 return;
1474 1530
1475 ev_start (EV_A_ (W)w, ++preparecnt); 1531 ev_start (EV_A_ (W)w, ++preparecnt);
1476 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 1532 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1477 prepares [preparecnt - 1] = w; 1533 prepares [preparecnt - 1] = w;
… …
1479 1535
1480void 1536void
1481ev_prepare_stop (EV_P_ struct ev_prepare *w) 1537ev_prepare_stop (EV_P_ struct ev_prepare *w)
1482{ 1538{
1483 ev_clear_pending (EV_A_ (W)w); 1539 ev_clear_pending (EV_A_ (W)w);
1484 if (!ev_is_active (w)) 1540 if (expect_false (!ev_is_active (w)))
1485 return; 1541 return;
1486 1542
1487 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1543 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1488 ev_stop (EV_A_ (W)w); 1544 ev_stop (EV_A_ (W)w);
1489} 1545}
1490 1546
1491void 1547void
1492ev_check_start (EV_P_ struct ev_check *w) 1548ev_check_start (EV_P_ struct ev_check *w)
1493{ 1549{
1494 if (ev_is_active (w)) 1550 if (expect_false (ev_is_active (w)))
1495 return; 1551 return;
1496 1552
1497 ev_start (EV_A_ (W)w, ++checkcnt); 1553 ev_start (EV_A_ (W)w, ++checkcnt);
1498 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2); 1554 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1499 checks [checkcnt - 1] = w; 1555 checks [checkcnt - 1] = w;
… …
1501 1557
1502void 1558void
1503ev_check_stop (EV_P_ struct ev_check *w) 1559ev_check_stop (EV_P_ struct ev_check *w)
1504{ 1560{
1505 ev_clear_pending (EV_A_ (W)w); 1561 ev_clear_pending (EV_A_ (W)w);
1506 if (!ev_is_active (w)) 1562 if (expect_false (!ev_is_active (w)))
1507 return; 1563 return;
1508 1564
1509 checks [((W)w)->active - 1] = checks [--checkcnt]; 1565 checks [((W)w)->active - 1] = checks [--checkcnt];
1510 ev_stop (EV_A_ (W)w); 1566 ev_stop (EV_A_ (W)w);
1511} 1567}
… …
1516 1572
1517void 1573void
1518ev_signal_start (EV_P_ struct ev_signal *w) 1574ev_signal_start (EV_P_ struct ev_signal *w)
1519{ 1575{
1520#if EV_MULTIPLICITY 1576#if EV_MULTIPLICITY
1521 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));
1522#endif 1578#endif
1523 if (ev_is_active (w)) 1579 if (expect_false (ev_is_active (w)))
1524 return; 1580 return;
1525 1581
1526 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));
1527 1583
1528 ev_start (EV_A_ (W)w, 1); 1584 ev_start (EV_A_ (W)w, 1);
… …
1545 1601
1546void 1602void
1547ev_signal_stop (EV_P_ struct ev_signal *w) 1603ev_signal_stop (EV_P_ struct ev_signal *w)
1548{ 1604{
1549 ev_clear_pending (EV_A_ (W)w); 1605 ev_clear_pending (EV_A_ (W)w);
1550 if (!ev_is_active (w)) 1606 if (expect_false (!ev_is_active (w)))
1551 return; 1607 return;
1552 1608
1553 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1609 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1554 ev_stop (EV_A_ (W)w); 1610 ev_stop (EV_A_ (W)w);
1555 1611
… …
1559 1615
1560void 1616void
1561ev_child_start (EV_P_ struct ev_child *w) 1617ev_child_start (EV_P_ struct ev_child *w)
1562{ 1618{
1563#if EV_MULTIPLICITY 1619#if EV_MULTIPLICITY
1564 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));
1565#endif 1621#endif
1566 if (ev_is_active (w)) 1622 if (expect_false (ev_is_active (w)))
1567 return; 1623 return;
1568 1624
1569 ev_start (EV_A_ (W)w, 1); 1625 ev_start (EV_A_ (W)w, 1);
1570 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1626 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1571} 1627}
1572 1628
1573void 1629void
1574ev_child_stop (EV_P_ struct ev_child *w) 1630ev_child_stop (EV_P_ struct ev_child *w)
1575{ 1631{
1576 ev_clear_pending (EV_A_ (W)w); 1632 ev_clear_pending (EV_A_ (W)w);
1577 if (!ev_is_active (w)) 1633 if (expect_false (!ev_is_active (w)))
1578 return; 1634 return;
1579 1635
1580 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1636 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1581 ev_stop (EV_A_ (W)w); 1637 ev_stop (EV_A_ (W)w);
1582} 1638}
… …
1619void 1675void
1620ev_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)
1621{ 1677{
1622 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));
1623 1679
1624 if (!once) 1680 if (expect_false (!once))
1681 {
1625 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1682 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1626 else 1683 return;
1627 { 1684 }
1685
1628 once->cb = cb; 1686 once->cb = cb;
1629 once->arg = arg; 1687 once->arg = arg;
1630 1688
1631 ev_init (&once->io, once_cb_io); 1689 ev_init (&once->io, once_cb_io);
1632 if (fd >= 0) 1690 if (fd >= 0)
1633 { 1691 {
1634 ev_io_set (&once->io, fd, events); 1692 ev_io_set (&once->io, fd, events);
1635 ev_io_start (EV_A_ &once->io); 1693 ev_io_start (EV_A_ &once->io);
1636 } 1694 }
1637 1695
1638 ev_init (&once->to, once_cb_to); 1696 ev_init (&once->to, once_cb_to);
1639 if (timeout >= 0.) 1697 if (timeout >= 0.)
1640 { 1698 {
1641 ev_timer_set (&once->to, timeout, 0.); 1699 ev_timer_set (&once->to, timeout, 0.);
1642 ev_timer_start (EV_A_ &once->to); 1700 ev_timer_start (EV_A_ &once->to);
1643 }
1644 } 1701 }
1645} 1702}
1646 1703
1647#ifdef __cplusplus 1704#ifdef __cplusplus
1648} 1705}

Diff Legend

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