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.127 by root, Sun Nov 18 02:17:57 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"
… …
778 815
779 if (!(flags & 0x0000ffff)) 816 if (!(flags & 0x0000ffff))
780 flags |= 0x0000ffff; 817 flags |= 0x0000ffff;
781 818
782 method = 0; 819 method = 0;
820#if EV_USE_PORT
821 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags);
822#endif
783#if EV_USE_KQUEUE 823#if EV_USE_KQUEUE
784 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags); 824 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
785#endif 825#endif
786#if EV_USE_EPOLL 826#if EV_USE_EPOLL
787 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags); 827 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
… …
796 ev_init (&sigev, sigcb); 836 ev_init (&sigev, sigcb);
797 ev_set_priority (&sigev, EV_MAXPRI); 837 ev_set_priority (&sigev, EV_MAXPRI);
798 } 838 }
799} 839}
800 840
801void 841static void
802loop_destroy (EV_P) 842loop_destroy (EV_P)
803{ 843{
804 int i; 844 int i;
805 845
846#if EV_USE_PORT
847 if (method == EVMETHOD_PORT ) port_destroy (EV_A);
848#endif
806#if EV_USE_KQUEUE 849#if EV_USE_KQUEUE
807 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 850 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
808#endif 851#endif
809#if EV_USE_EPOLL 852#if EV_USE_EPOLL
810 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 853 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
… …
833} 876}
834 877
835static void 878static void
836loop_fork (EV_P) 879loop_fork (EV_P)
837{ 880{
881#if EV_USE_PORT
882 if (method == EVMETHOD_PORT ) port_fork (EV_A);
883#endif
884#if EV_USE_KQUEUE
885 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
886#endif
838#if EV_USE_EPOLL 887#if EV_USE_EPOLL
839 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 888 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 889#endif
844 890
845 if (ev_is_active (&sigev)) 891 if (ev_is_active (&sigev))
846 { 892 {
847 /* default loop */ 893 /* default loop */
… …
891 937
892#endif 938#endif
893 939
894#if EV_MULTIPLICITY 940#if EV_MULTIPLICITY
895struct ev_loop * 941struct ev_loop *
942ev_default_loop_init (unsigned int flags)
896#else 943#else
897int 944int
898#endif
899ev_default_loop (unsigned int flags) 945ev_default_loop (unsigned int flags)
946#endif
900{ 947{
901 if (sigpipe [0] == sigpipe [1]) 948 if (sigpipe [0] == sigpipe [1])
902 if (pipe (sigpipe)) 949 if (pipe (sigpipe))
903 return 0; 950 return 0;
904 951
905 if (!default_loop) 952 if (!ev_default_loop_ptr)
906 { 953 {
907#if EV_MULTIPLICITY 954#if EV_MULTIPLICITY
908 struct ev_loop *loop = default_loop = &default_loop_struct; 955 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
909#else 956#else
910 default_loop = 1; 957 ev_default_loop_ptr = 1;
911#endif 958#endif
912 959
913 loop_init (EV_A_ flags); 960 loop_init (EV_A_ flags);
914 961
915 if (ev_method (EV_A)) 962 if (ev_method (EV_A))
… …
922 ev_signal_start (EV_A_ &childev); 969 ev_signal_start (EV_A_ &childev);
923 ev_unref (EV_A); /* child watcher should not keep loop alive */ 970 ev_unref (EV_A); /* child watcher should not keep loop alive */
924#endif 971#endif
925 } 972 }
926 else 973 else
927 default_loop = 0; 974 ev_default_loop_ptr = 0;
928 } 975 }
929 976
930 return default_loop; 977 return ev_default_loop_ptr;
931} 978}
932 979
933void 980void
934ev_default_destroy (void) 981ev_default_destroy (void)
935{ 982{
936#if EV_MULTIPLICITY 983#if EV_MULTIPLICITY
937 struct ev_loop *loop = default_loop; 984 struct ev_loop *loop = ev_default_loop_ptr;
938#endif 985#endif
939 986
940#ifndef _WIN32 987#ifndef _WIN32
941 ev_ref (EV_A); /* child watcher */ 988 ev_ref (EV_A); /* child watcher */
942 ev_signal_stop (EV_A_ &childev); 989 ev_signal_stop (EV_A_ &childev);
… …
953 1000
954void 1001void
955ev_default_fork (void) 1002ev_default_fork (void)
956{ 1003{
957#if EV_MULTIPLICITY 1004#if EV_MULTIPLICITY
958 struct ev_loop *loop = default_loop; 1005 struct ev_loop *loop = ev_default_loop_ptr;
959#endif 1006#endif
960 1007
961 if (method) 1008 if (method)
962 postfork = 1; 1009 postfork = 1;
963} 1010}
… …
974 return 1; 1021 return 1;
975 1022
976 return 0; 1023 return 0;
977} 1024}
978 1025
979static void 1026inline void
980call_pending (EV_P) 1027call_pending (EV_P)
981{ 1028{
982 int pri; 1029 int pri;
983 1030
984 for (pri = NUMPRI; pri--; ) 1031 for (pri = NUMPRI; pri--; )
985 while (pendingcnt [pri]) 1032 while (pendingcnt [pri])
986 { 1033 {
987 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1034 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
988 1035
989 if (p->w) 1036 if (expect_true (p->w))
990 { 1037 {
991 p->w->pending = 0; 1038 p->w->pending = 0;
992 EV_CB_INVOKE (p->w, p->events); 1039 EV_CB_INVOKE (p->w, p->events);
993 } 1040 }
994 } 1041 }
995} 1042}
996 1043
997static void 1044inline void
998timers_reify (EV_P) 1045timers_reify (EV_P)
999{ 1046{
1000 while (timercnt && ((WT)timers [0])->at <= mn_now) 1047 while (timercnt && ((WT)timers [0])->at <= mn_now)
1001 { 1048 {
1002 struct ev_timer *w = timers [0]; 1049 struct ev_timer *w = timers [0];
… …
1020 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1067 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1021 } 1068 }
1022} 1069}
1023 1070
1024#if EV_PERIODICS 1071#if EV_PERIODICS
1025static void 1072inline void
1026periodics_reify (EV_P) 1073periodics_reify (EV_P)
1027{ 1074{
1028 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1075 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1029 { 1076 {
1030 struct ev_periodic *w = periodics [0]; 1077 struct ev_periodic *w = periodics [0];
… …
1089 ev_rt_now = ev_time (); 1136 ev_rt_now = ev_time ();
1090 return 1; 1137 return 1;
1091 } 1138 }
1092} 1139}
1093 1140
1094static void 1141inline void
1095time_update (EV_P) 1142time_update (EV_P)
1096{ 1143{
1097 int i; 1144 int i;
1098 1145
1099#if EV_USE_MONOTONIC 1146#if EV_USE_MONOTONIC
… …
1160ev_loop (EV_P_ int flags) 1207ev_loop (EV_P_ int flags)
1161{ 1208{
1162 double block; 1209 double block;
1163 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1210 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1164 1211
1165 do 1212 while (activecnt)
1166 { 1213 {
1167 /* queue check watchers (and execute them) */ 1214 /* queue check watchers (and execute them) */
1168 if (expect_false (preparecnt)) 1215 if (expect_false (preparecnt))
1169 { 1216 {
1170 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1217 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
… …
1210 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1257 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1211 if (block > to) block = to; 1258 if (block > to) block = to;
1212 } 1259 }
1213#endif 1260#endif
1214 1261
1215 if (block < 0.) block = 0.; 1262 if (expect_false (block < 0.)) block = 0.;
1216 } 1263 }
1217 1264
1218 method_poll (EV_A_ block); 1265 method_poll (EV_A_ block);
1219 1266
1220 /* update ev_rt_now, do magic */ 1267 /* update ev_rt_now, do magic */
… …
1229 /* queue idle watchers unless io or timers are pending */ 1276 /* queue idle watchers unless io or timers are pending */
1230 if (idlecnt && !any_pending (EV_A)) 1277 if (idlecnt && !any_pending (EV_A))
1231 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1278 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1232 1279
1233 /* queue check watchers, to be executed first */ 1280 /* queue check watchers, to be executed first */
1234 if (checkcnt) 1281 if (expect_false (checkcnt))
1235 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1282 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1236 1283
1237 call_pending (EV_A); 1284 call_pending (EV_A);
1285
1286 if (expect_false (loop_done))
1287 break;
1238 } 1288 }
1239 while (activecnt && !loop_done);
1240 1289
1241 if (loop_done != 2) 1290 if (loop_done != 2)
1242 loop_done = 0; 1291 loop_done = 0;
1243} 1292}
1244 1293
… …
1304void 1353void
1305ev_io_start (EV_P_ struct ev_io *w) 1354ev_io_start (EV_P_ struct ev_io *w)
1306{ 1355{
1307 int fd = w->fd; 1356 int fd = w->fd;
1308 1357
1309 if (ev_is_active (w)) 1358 if (expect_false (ev_is_active (w)))
1310 return; 1359 return;
1311 1360
1312 assert (("ev_io_start called with negative fd", fd >= 0)); 1361 assert (("ev_io_start called with negative fd", fd >= 0));
1313 1362
1314 ev_start (EV_A_ (W)w, 1); 1363 ev_start (EV_A_ (W)w, 1);
… …
1320 1369
1321void 1370void
1322ev_io_stop (EV_P_ struct ev_io *w) 1371ev_io_stop (EV_P_ struct ev_io *w)
1323{ 1372{
1324 ev_clear_pending (EV_A_ (W)w); 1373 ev_clear_pending (EV_A_ (W)w);
1325 if (!ev_is_active (w)) 1374 if (expect_false (!ev_is_active (w)))
1326 return; 1375 return;
1327 1376
1328 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1377 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1329 1378
1330 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1379 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
… …
1334} 1383}
1335 1384
1336void 1385void
1337ev_timer_start (EV_P_ struct ev_timer *w) 1386ev_timer_start (EV_P_ struct ev_timer *w)
1338{ 1387{
1339 if (ev_is_active (w)) 1388 if (expect_false (ev_is_active (w)))
1340 return; 1389 return;
1341 1390
1342 ((WT)w)->at += mn_now; 1391 ((WT)w)->at += mn_now;
1343 1392
1344 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1393 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
… …
1353 1402
1354void 1403void
1355ev_timer_stop (EV_P_ struct ev_timer *w) 1404ev_timer_stop (EV_P_ struct ev_timer *w)
1356{ 1405{
1357 ev_clear_pending (EV_A_ (W)w); 1406 ev_clear_pending (EV_A_ (W)w);
1358 if (!ev_is_active (w)) 1407 if (expect_false (!ev_is_active (w)))
1359 return; 1408 return;
1360 1409
1361 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1410 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1362 1411
1363 if (((W)w)->active < timercnt--) 1412 if (expect_true (((W)w)->active < timercnt--))
1364 { 1413 {
1365 timers [((W)w)->active - 1] = timers [timercnt]; 1414 timers [((W)w)->active - 1] = timers [timercnt];
1366 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1415 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1367 } 1416 }
1368 1417
… …
1393 1442
1394#if EV_PERIODICS 1443#if EV_PERIODICS
1395void 1444void
1396ev_periodic_start (EV_P_ struct ev_periodic *w) 1445ev_periodic_start (EV_P_ struct ev_periodic *w)
1397{ 1446{
1398 if (ev_is_active (w)) 1447 if (expect_false (ev_is_active (w)))
1399 return; 1448 return;
1400 1449
1401 if (w->reschedule_cb) 1450 if (w->reschedule_cb)
1402 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1451 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1403 else if (w->interval) 1452 else if (w->interval)
… …
1417 1466
1418void 1467void
1419ev_periodic_stop (EV_P_ struct ev_periodic *w) 1468ev_periodic_stop (EV_P_ struct ev_periodic *w)
1420{ 1469{
1421 ev_clear_pending (EV_A_ (W)w); 1470 ev_clear_pending (EV_A_ (W)w);
1422 if (!ev_is_active (w)) 1471 if (expect_false (!ev_is_active (w)))
1423 return; 1472 return;
1424 1473
1425 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1474 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1426 1475
1427 if (((W)w)->active < periodiccnt--) 1476 if (expect_true (((W)w)->active < periodiccnt--))
1428 { 1477 {
1429 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1478 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1430 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1479 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1431 } 1480 }
1432 1481
… …
1443#endif 1492#endif
1444 1493
1445void 1494void
1446ev_idle_start (EV_P_ struct ev_idle *w) 1495ev_idle_start (EV_P_ struct ev_idle *w)
1447{ 1496{
1448 if (ev_is_active (w)) 1497 if (expect_false (ev_is_active (w)))
1449 return; 1498 return;
1450 1499
1451 ev_start (EV_A_ (W)w, ++idlecnt); 1500 ev_start (EV_A_ (W)w, ++idlecnt);
1452 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2); 1501 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1453 idles [idlecnt - 1] = w; 1502 idles [idlecnt - 1] = w;
… …
1455 1504
1456void 1505void
1457ev_idle_stop (EV_P_ struct ev_idle *w) 1506ev_idle_stop (EV_P_ struct ev_idle *w)
1458{ 1507{
1459 ev_clear_pending (EV_A_ (W)w); 1508 ev_clear_pending (EV_A_ (W)w);
1460 if (!ev_is_active (w)) 1509 if (expect_false (!ev_is_active (w)))
1461 return; 1510 return;
1462 1511
1463 idles [((W)w)->active - 1] = idles [--idlecnt]; 1512 idles [((W)w)->active - 1] = idles [--idlecnt];
1464 ev_stop (EV_A_ (W)w); 1513 ev_stop (EV_A_ (W)w);
1465} 1514}
1466 1515
1467void 1516void
1468ev_prepare_start (EV_P_ struct ev_prepare *w) 1517ev_prepare_start (EV_P_ struct ev_prepare *w)
1469{ 1518{
1470 if (ev_is_active (w)) 1519 if (expect_false (ev_is_active (w)))
1471 return; 1520 return;
1472 1521
1473 ev_start (EV_A_ (W)w, ++preparecnt); 1522 ev_start (EV_A_ (W)w, ++preparecnt);
1474 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 1523 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1475 prepares [preparecnt - 1] = w; 1524 prepares [preparecnt - 1] = w;
… …
1477 1526
1478void 1527void
1479ev_prepare_stop (EV_P_ struct ev_prepare *w) 1528ev_prepare_stop (EV_P_ struct ev_prepare *w)
1480{ 1529{
1481 ev_clear_pending (EV_A_ (W)w); 1530 ev_clear_pending (EV_A_ (W)w);
1482 if (!ev_is_active (w)) 1531 if (expect_false (!ev_is_active (w)))
1483 return; 1532 return;
1484 1533
1485 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1534 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1486 ev_stop (EV_A_ (W)w); 1535 ev_stop (EV_A_ (W)w);
1487} 1536}
1488 1537
1489void 1538void
1490ev_check_start (EV_P_ struct ev_check *w) 1539ev_check_start (EV_P_ struct ev_check *w)
1491{ 1540{
1492 if (ev_is_active (w)) 1541 if (expect_false (ev_is_active (w)))
1493 return; 1542 return;
1494 1543
1495 ev_start (EV_A_ (W)w, ++checkcnt); 1544 ev_start (EV_A_ (W)w, ++checkcnt);
1496 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2); 1545 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1497 checks [checkcnt - 1] = w; 1546 checks [checkcnt - 1] = w;
… …
1499 1548
1500void 1549void
1501ev_check_stop (EV_P_ struct ev_check *w) 1550ev_check_stop (EV_P_ struct ev_check *w)
1502{ 1551{
1503 ev_clear_pending (EV_A_ (W)w); 1552 ev_clear_pending (EV_A_ (W)w);
1504 if (!ev_is_active (w)) 1553 if (expect_false (!ev_is_active (w)))
1505 return; 1554 return;
1506 1555
1507 checks [((W)w)->active - 1] = checks [--checkcnt]; 1556 checks [((W)w)->active - 1] = checks [--checkcnt];
1508 ev_stop (EV_A_ (W)w); 1557 ev_stop (EV_A_ (W)w);
1509} 1558}
… …
1514 1563
1515void 1564void
1516ev_signal_start (EV_P_ struct ev_signal *w) 1565ev_signal_start (EV_P_ struct ev_signal *w)
1517{ 1566{
1518#if EV_MULTIPLICITY 1567#if EV_MULTIPLICITY
1519 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1568 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1520#endif 1569#endif
1521 if (ev_is_active (w)) 1570 if (expect_false (ev_is_active (w)))
1522 return; 1571 return;
1523 1572
1524 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1573 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1525 1574
1526 ev_start (EV_A_ (W)w, 1); 1575 ev_start (EV_A_ (W)w, 1);
… …
1543 1592
1544void 1593void
1545ev_signal_stop (EV_P_ struct ev_signal *w) 1594ev_signal_stop (EV_P_ struct ev_signal *w)
1546{ 1595{
1547 ev_clear_pending (EV_A_ (W)w); 1596 ev_clear_pending (EV_A_ (W)w);
1548 if (!ev_is_active (w)) 1597 if (expect_false (!ev_is_active (w)))
1549 return; 1598 return;
1550 1599
1551 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1600 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1552 ev_stop (EV_A_ (W)w); 1601 ev_stop (EV_A_ (W)w);
1553 1602
… …
1557 1606
1558void 1607void
1559ev_child_start (EV_P_ struct ev_child *w) 1608ev_child_start (EV_P_ struct ev_child *w)
1560{ 1609{
1561#if EV_MULTIPLICITY 1610#if EV_MULTIPLICITY
1562 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1611 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1563#endif 1612#endif
1564 if (ev_is_active (w)) 1613 if (expect_false (ev_is_active (w)))
1565 return; 1614 return;
1566 1615
1567 ev_start (EV_A_ (W)w, 1); 1616 ev_start (EV_A_ (W)w, 1);
1568 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1617 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1569} 1618}
1570 1619
1571void 1620void
1572ev_child_stop (EV_P_ struct ev_child *w) 1621ev_child_stop (EV_P_ struct ev_child *w)
1573{ 1622{
1574 ev_clear_pending (EV_A_ (W)w); 1623 ev_clear_pending (EV_A_ (W)w);
1575 if (!ev_is_active (w)) 1624 if (expect_false (!ev_is_active (w)))
1576 return; 1625 return;
1577 1626
1578 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1627 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1579 ev_stop (EV_A_ (W)w); 1628 ev_stop (EV_A_ (W)w);
1580} 1629}
… …
1617void 1666void
1618ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1667ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1619{ 1668{
1620 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 1669 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1621 1670
1622 if (!once) 1671 if (expect_false (!once))
1672 {
1623 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1673 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1624 else 1674 return;
1625 { 1675 }
1676
1626 once->cb = cb; 1677 once->cb = cb;
1627 once->arg = arg; 1678 once->arg = arg;
1628 1679
1629 ev_init (&once->io, once_cb_io); 1680 ev_init (&once->io, once_cb_io);
1630 if (fd >= 0) 1681 if (fd >= 0)
1631 { 1682 {
1632 ev_io_set (&once->io, fd, events); 1683 ev_io_set (&once->io, fd, events);
1633 ev_io_start (EV_A_ &once->io); 1684 ev_io_start (EV_A_ &once->io);
1634 } 1685 }
1635 1686
1636 ev_init (&once->to, once_cb_to); 1687 ev_init (&once->to, once_cb_to);
1637 if (timeout >= 0.) 1688 if (timeout >= 0.)
1638 { 1689 {
1639 ev_timer_set (&once->to, timeout, 0.); 1690 ev_timer_set (&once->to, timeout, 0.);
1640 ev_timer_start (EV_A_ &once->to); 1691 ev_timer_start (EV_A_ &once->to);
1641 }
1642 } 1692 }
1643} 1693}
1644 1694
1645#ifdef __cplusplus 1695#ifdef __cplusplus
1646} 1696}

Diff Legend

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