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

Comparing libev/ev.c (file contents):
Revision 1.117 by ayin, Thu Nov 15 17:15:56 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
… …
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
… …
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 *
896ev_default_loop_ (unsigned int flags) 942ev_default_loop_init (unsigned int flags)
897#else 943#else
898int 944int
899ev_default_loop (unsigned int flags) 945ev_default_loop (unsigned int flags)
900#endif 946#endif
901{ 947{
… …
975 return 1; 1021 return 1;
976 1022
977 return 0; 1023 return 0;
978} 1024}
979 1025
980static void 1026inline void
981call_pending (EV_P) 1027call_pending (EV_P)
982{ 1028{
983 int pri; 1029 int pri;
984 1030
985 for (pri = NUMPRI; pri--; ) 1031 for (pri = NUMPRI; pri--; )
986 while (pendingcnt [pri]) 1032 while (pendingcnt [pri])
987 { 1033 {
988 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1034 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
989 1035
990 if (p->w) 1036 if (expect_true (p->w))
991 { 1037 {
992 p->w->pending = 0; 1038 p->w->pending = 0;
993 EV_CB_INVOKE (p->w, p->events); 1039 EV_CB_INVOKE (p->w, p->events);
994 } 1040 }
995 } 1041 }
996} 1042}
997 1043
998static void 1044inline void
999timers_reify (EV_P) 1045timers_reify (EV_P)
1000{ 1046{
1001 while (timercnt && ((WT)timers [0])->at <= mn_now) 1047 while (timercnt && ((WT)timers [0])->at <= mn_now)
1002 { 1048 {
1003 struct ev_timer *w = timers [0]; 1049 struct ev_timer *w = timers [0];
… …
1021 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1067 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1022 } 1068 }
1023} 1069}
1024 1070
1025#if EV_PERIODICS 1071#if EV_PERIODICS
1026static void 1072inline void
1027periodics_reify (EV_P) 1073periodics_reify (EV_P)
1028{ 1074{
1029 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1075 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1030 { 1076 {
1031 struct ev_periodic *w = periodics [0]; 1077 struct ev_periodic *w = periodics [0];
… …
1090 ev_rt_now = ev_time (); 1136 ev_rt_now = ev_time ();
1091 return 1; 1137 return 1;
1092 } 1138 }
1093} 1139}
1094 1140
1095static void 1141inline void
1096time_update (EV_P) 1142time_update (EV_P)
1097{ 1143{
1098 int i; 1144 int i;
1099 1145
1100#if EV_USE_MONOTONIC 1146#if EV_USE_MONOTONIC
… …
1211 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;
1212 if (block > to) block = to; 1258 if (block > to) block = to;
1213 } 1259 }
1214#endif 1260#endif
1215 1261
1216 if (block < 0.) block = 0.; 1262 if (expect_false (block < 0.)) block = 0.;
1217 } 1263 }
1218 1264
1219 method_poll (EV_A_ block); 1265 method_poll (EV_A_ block);
1220 1266
1221 /* update ev_rt_now, do magic */ 1267 /* update ev_rt_now, do magic */
… …
1230 /* queue idle watchers unless io or timers are pending */ 1276 /* queue idle watchers unless io or timers are pending */
1231 if (idlecnt && !any_pending (EV_A)) 1277 if (idlecnt && !any_pending (EV_A))
1232 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1278 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1233 1279
1234 /* queue check watchers, to be executed first */ 1280 /* queue check watchers, to be executed first */
1235 if (checkcnt) 1281 if (expect_false (checkcnt))
1236 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1282 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1237 1283
1238 call_pending (EV_A); 1284 call_pending (EV_A);
1239 1285
1240 if (loop_done) 1286 if (expect_false (loop_done))
1241 break; 1287 break;
1242 } 1288 }
1243 1289
1244 if (loop_done != 2) 1290 if (loop_done != 2)
1245 loop_done = 0; 1291 loop_done = 0;
… …
1307void 1353void
1308ev_io_start (EV_P_ struct ev_io *w) 1354ev_io_start (EV_P_ struct ev_io *w)
1309{ 1355{
1310 int fd = w->fd; 1356 int fd = w->fd;
1311 1357
1312 if (ev_is_active (w)) 1358 if (expect_false (ev_is_active (w)))
1313 return; 1359 return;
1314 1360
1315 assert (("ev_io_start called with negative fd", fd >= 0)); 1361 assert (("ev_io_start called with negative fd", fd >= 0));
1316 1362
1317 ev_start (EV_A_ (W)w, 1); 1363 ev_start (EV_A_ (W)w, 1);
… …
1323 1369
1324void 1370void
1325ev_io_stop (EV_P_ struct ev_io *w) 1371ev_io_stop (EV_P_ struct ev_io *w)
1326{ 1372{
1327 ev_clear_pending (EV_A_ (W)w); 1373 ev_clear_pending (EV_A_ (W)w);
1328 if (!ev_is_active (w)) 1374 if (expect_false (!ev_is_active (w)))
1329 return; 1375 return;
1330 1376
1331 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));
1332 1378
1333 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1379 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
… …
1337} 1383}
1338 1384
1339void 1385void
1340ev_timer_start (EV_P_ struct ev_timer *w) 1386ev_timer_start (EV_P_ struct ev_timer *w)
1341{ 1387{
1342 if (ev_is_active (w)) 1388 if (expect_false (ev_is_active (w)))
1343 return; 1389 return;
1344 1390
1345 ((WT)w)->at += mn_now; 1391 ((WT)w)->at += mn_now;
1346 1392
1347 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.));
… …
1356 1402
1357void 1403void
1358ev_timer_stop (EV_P_ struct ev_timer *w) 1404ev_timer_stop (EV_P_ struct ev_timer *w)
1359{ 1405{
1360 ev_clear_pending (EV_A_ (W)w); 1406 ev_clear_pending (EV_A_ (W)w);
1361 if (!ev_is_active (w)) 1407 if (expect_false (!ev_is_active (w)))
1362 return; 1408 return;
1363 1409
1364 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1410 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1365 1411
1366 if (((W)w)->active < timercnt--) 1412 if (expect_true (((W)w)->active < timercnt--))
1367 { 1413 {
1368 timers [((W)w)->active - 1] = timers [timercnt]; 1414 timers [((W)w)->active - 1] = timers [timercnt];
1369 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1415 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1370 } 1416 }
1371 1417
… …
1396 1442
1397#if EV_PERIODICS 1443#if EV_PERIODICS
1398void 1444void
1399ev_periodic_start (EV_P_ struct ev_periodic *w) 1445ev_periodic_start (EV_P_ struct ev_periodic *w)
1400{ 1446{
1401 if (ev_is_active (w)) 1447 if (expect_false (ev_is_active (w)))
1402 return; 1448 return;
1403 1449
1404 if (w->reschedule_cb) 1450 if (w->reschedule_cb)
1405 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1451 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1406 else if (w->interval) 1452 else if (w->interval)
… …
1420 1466
1421void 1467void
1422ev_periodic_stop (EV_P_ struct ev_periodic *w) 1468ev_periodic_stop (EV_P_ struct ev_periodic *w)
1423{ 1469{
1424 ev_clear_pending (EV_A_ (W)w); 1470 ev_clear_pending (EV_A_ (W)w);
1425 if (!ev_is_active (w)) 1471 if (expect_false (!ev_is_active (w)))
1426 return; 1472 return;
1427 1473
1428 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1474 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1429 1475
1430 if (((W)w)->active < periodiccnt--) 1476 if (expect_true (((W)w)->active < periodiccnt--))
1431 { 1477 {
1432 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1478 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1433 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1479 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1434 } 1480 }
1435 1481
… …
1446#endif 1492#endif
1447 1493
1448void 1494void
1449ev_idle_start (EV_P_ struct ev_idle *w) 1495ev_idle_start (EV_P_ struct ev_idle *w)
1450{ 1496{
1451 if (ev_is_active (w)) 1497 if (expect_false (ev_is_active (w)))
1452 return; 1498 return;
1453 1499
1454 ev_start (EV_A_ (W)w, ++idlecnt); 1500 ev_start (EV_A_ (W)w, ++idlecnt);
1455 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2); 1501 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1456 idles [idlecnt - 1] = w; 1502 idles [idlecnt - 1] = w;
… …
1458 1504
1459void 1505void
1460ev_idle_stop (EV_P_ struct ev_idle *w) 1506ev_idle_stop (EV_P_ struct ev_idle *w)
1461{ 1507{
1462 ev_clear_pending (EV_A_ (W)w); 1508 ev_clear_pending (EV_A_ (W)w);
1463 if (!ev_is_active (w)) 1509 if (expect_false (!ev_is_active (w)))
1464 return; 1510 return;
1465 1511
1466 idles [((W)w)->active - 1] = idles [--idlecnt]; 1512 idles [((W)w)->active - 1] = idles [--idlecnt];
1467 ev_stop (EV_A_ (W)w); 1513 ev_stop (EV_A_ (W)w);
1468} 1514}
1469 1515
1470void 1516void
1471ev_prepare_start (EV_P_ struct ev_prepare *w) 1517ev_prepare_start (EV_P_ struct ev_prepare *w)
1472{ 1518{
1473 if (ev_is_active (w)) 1519 if (expect_false (ev_is_active (w)))
1474 return; 1520 return;
1475 1521
1476 ev_start (EV_A_ (W)w, ++preparecnt); 1522 ev_start (EV_A_ (W)w, ++preparecnt);
1477 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 1523 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1478 prepares [preparecnt - 1] = w; 1524 prepares [preparecnt - 1] = w;
… …
1480 1526
1481void 1527void
1482ev_prepare_stop (EV_P_ struct ev_prepare *w) 1528ev_prepare_stop (EV_P_ struct ev_prepare *w)
1483{ 1529{
1484 ev_clear_pending (EV_A_ (W)w); 1530 ev_clear_pending (EV_A_ (W)w);
1485 if (!ev_is_active (w)) 1531 if (expect_false (!ev_is_active (w)))
1486 return; 1532 return;
1487 1533
1488 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1534 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1489 ev_stop (EV_A_ (W)w); 1535 ev_stop (EV_A_ (W)w);
1490} 1536}
1491 1537
1492void 1538void
1493ev_check_start (EV_P_ struct ev_check *w) 1539ev_check_start (EV_P_ struct ev_check *w)
1494{ 1540{
1495 if (ev_is_active (w)) 1541 if (expect_false (ev_is_active (w)))
1496 return; 1542 return;
1497 1543
1498 ev_start (EV_A_ (W)w, ++checkcnt); 1544 ev_start (EV_A_ (W)w, ++checkcnt);
1499 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2); 1545 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1500 checks [checkcnt - 1] = w; 1546 checks [checkcnt - 1] = w;
… …
1502 1548
1503void 1549void
1504ev_check_stop (EV_P_ struct ev_check *w) 1550ev_check_stop (EV_P_ struct ev_check *w)
1505{ 1551{
1506 ev_clear_pending (EV_A_ (W)w); 1552 ev_clear_pending (EV_A_ (W)w);
1507 if (!ev_is_active (w)) 1553 if (expect_false (!ev_is_active (w)))
1508 return; 1554 return;
1509 1555
1510 checks [((W)w)->active - 1] = checks [--checkcnt]; 1556 checks [((W)w)->active - 1] = checks [--checkcnt];
1511 ev_stop (EV_A_ (W)w); 1557 ev_stop (EV_A_ (W)w);
1512} 1558}
… …
1519ev_signal_start (EV_P_ struct ev_signal *w) 1565ev_signal_start (EV_P_ struct ev_signal *w)
1520{ 1566{
1521#if EV_MULTIPLICITY 1567#if EV_MULTIPLICITY
1522 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1568 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1523#endif 1569#endif
1524 if (ev_is_active (w)) 1570 if (expect_false (ev_is_active (w)))
1525 return; 1571 return;
1526 1572
1527 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));
1528 1574
1529 ev_start (EV_A_ (W)w, 1); 1575 ev_start (EV_A_ (W)w, 1);
… …
1546 1592
1547void 1593void
1548ev_signal_stop (EV_P_ struct ev_signal *w) 1594ev_signal_stop (EV_P_ struct ev_signal *w)
1549{ 1595{
1550 ev_clear_pending (EV_A_ (W)w); 1596 ev_clear_pending (EV_A_ (W)w);
1551 if (!ev_is_active (w)) 1597 if (expect_false (!ev_is_active (w)))
1552 return; 1598 return;
1553 1599
1554 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1600 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1555 ev_stop (EV_A_ (W)w); 1601 ev_stop (EV_A_ (W)w);
1556 1602
… …
1562ev_child_start (EV_P_ struct ev_child *w) 1608ev_child_start (EV_P_ struct ev_child *w)
1563{ 1609{
1564#if EV_MULTIPLICITY 1610#if EV_MULTIPLICITY
1565 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1611 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1566#endif 1612#endif
1567 if (ev_is_active (w)) 1613 if (expect_false (ev_is_active (w)))
1568 return; 1614 return;
1569 1615
1570 ev_start (EV_A_ (W)w, 1); 1616 ev_start (EV_A_ (W)w, 1);
1571 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1617 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1572} 1618}
1573 1619
1574void 1620void
1575ev_child_stop (EV_P_ struct ev_child *w) 1621ev_child_stop (EV_P_ struct ev_child *w)
1576{ 1622{
1577 ev_clear_pending (EV_A_ (W)w); 1623 ev_clear_pending (EV_A_ (W)w);
1578 if (!ev_is_active (w)) 1624 if (expect_false (!ev_is_active (w)))
1579 return; 1625 return;
1580 1626
1581 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1627 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1582 ev_stop (EV_A_ (W)w); 1628 ev_stop (EV_A_ (W)w);
1583} 1629}
… …
1620void 1666void
1621ev_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)
1622{ 1668{
1623 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));
1624 1670
1625 if (!once) 1671 if (expect_false (!once))
1672 {
1626 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1673 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1627 else 1674 return;
1628 { 1675 }
1676
1629 once->cb = cb; 1677 once->cb = cb;
1630 once->arg = arg; 1678 once->arg = arg;
1631 1679
1632 ev_init (&once->io, once_cb_io); 1680 ev_init (&once->io, once_cb_io);
1633 if (fd >= 0) 1681 if (fd >= 0)
1634 { 1682 {
1635 ev_io_set (&once->io, fd, events); 1683 ev_io_set (&once->io, fd, events);
1636 ev_io_start (EV_A_ &once->io); 1684 ev_io_start (EV_A_ &once->io);
1637 } 1685 }
1638 1686
1639 ev_init (&once->to, once_cb_to); 1687 ev_init (&once->to, once_cb_to);
1640 if (timeout >= 0.) 1688 if (timeout >= 0.)
1641 { 1689 {
1642 ev_timer_set (&once->to, timeout, 0.); 1690 ev_timer_set (&once->to, timeout, 0.);
1643 ev_timer_start (EV_A_ &once->to); 1691 ev_timer_start (EV_A_ &once->to);
1644 }
1645 } 1692 }
1646} 1693}
1647 1694
1648#ifdef __cplusplus 1695#ifdef __cplusplus
1649} 1696}

Diff Legend

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