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

Comparing libev/ev.c (file contents):
Revision 1.121 by root, Fri Nov 16 10:37:28 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
62# endif 85# endif
63 86
64# if HAVE_PORT_H && HAVE_PORT_CREATE && !defined (EV_USE_PORT) 87# ifndef EV_USE_PORT
88# if HAVE_PORT_H && HAVE_PORT_CREATE
65# define EV_USE_PORT 1 89# define EV_USE_PORT 1
90# else
91# define EV_USE_PORT 0
92# endif
66# endif 93# endif
67 94
68#endif 95#endif
69 96
70#include <math.h> 97#include <math.h>
… …
127# define EV_USE_PORT 0 154# define EV_USE_PORT 0
128#endif 155#endif
129 156
130/**/ 157/**/
131 158
132/* darwin simply cannot be helped */
133#ifdef __APPLE__
134# undef EV_USE_POLL
135# undef EV_USE_KQUEUE
136#endif
137
138#ifndef CLOCK_MONOTONIC 159#ifndef CLOCK_MONOTONIC
139# undef EV_USE_MONOTONIC 160# undef EV_USE_MONOTONIC
140# define EV_USE_MONOTONIC 0 161# define EV_USE_MONOTONIC 0
141#endif 162#endif
142 163
… …
162# include "ev.h" 183# include "ev.h"
163#endif 184#endif
164 185
165#if __GNUC__ >= 3 186#if __GNUC__ >= 3
166# define expect(expr,value) __builtin_expect ((expr),(value)) 187# define expect(expr,value) __builtin_expect ((expr),(value))
167# define inline inline 188# define inline static inline
168#else 189#else
169# define expect(expr,value) (expr) 190# define expect(expr,value) (expr)
170# define inline static 191# define inline static
171#endif 192#endif
172 193
… …
366void 387void
367ev_feed_event (EV_P_ void *w, int revents) 388ev_feed_event (EV_P_ void *w, int revents)
368{ 389{
369 W w_ = (W)w; 390 W w_ = (W)w;
370 391
371 if (w_->pending) 392 if (expect_false (w_->pending))
372 { 393 {
373 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 394 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
374 return; 395 return;
375 } 396 }
376 397
… …
410 fd_event (EV_A_ fd, revents); 431 fd_event (EV_A_ fd, revents);
411} 432}
412 433
413/*****************************************************************************/ 434/*****************************************************************************/
414 435
415static void 436inline void
416fd_reify (EV_P) 437fd_reify (EV_P)
417{ 438{
418 int i; 439 int i;
419 440
420 for (i = 0; i < fdchangecnt; ++i) 441 for (i = 0; i < fdchangecnt; ++i)
… …
447} 468}
448 469
449static void 470static void
450fd_change (EV_P_ int fd) 471fd_change (EV_P_ int fd)
451{ 472{
452 if (anfds [fd].reify) 473 if (expect_false (anfds [fd].reify))
453 return; 474 return;
454 475
455 anfds [fd].reify = 1; 476 anfds [fd].reify = 1;
456 477
457 ++fdchangecnt; 478 ++fdchangecnt;
… …
469 ev_io_stop (EV_A_ w); 490 ev_io_stop (EV_A_ w);
470 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);
471 } 492 }
472} 493}
473 494
474static int 495inline int
475fd_valid (int fd) 496fd_valid (int fd)
476{ 497{
477#ifdef _WIN32 498#ifdef _WIN32
478 return _get_osfhandle (fd) != -1; 499 return _get_osfhandle (fd) != -1;
479#else 500#else
… …
648 for (signum = signalmax; signum--; ) 669 for (signum = signalmax; signum--; )
649 if (signals [signum].gotsig) 670 if (signals [signum].gotsig)
650 ev_feed_signal_event (EV_A_ signum + 1); 671 ev_feed_signal_event (EV_A_ signum + 1);
651} 672}
652 673
653inline void 674static void
654fd_intern (int fd) 675fd_intern (int fd)
655{ 676{
656#ifdef _WIN32 677#ifdef _WIN32
657 int arg = 1; 678 int arg = 1;
658 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 679 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
758 || getgid () != getegid (); 779 || getgid () != getegid ();
759#endif 780#endif
760} 781}
761 782
762unsigned int 783unsigned int
763ev_method (EV_P) 784ev_supported_backends (void)
764{ 785{
765 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;
766} 818}
767 819
768static void 820static void
769loop_init (EV_P_ unsigned int flags) 821loop_init (EV_P_ unsigned int flags)
770{ 822{
… …
781 ev_rt_now = ev_time (); 833 ev_rt_now = ev_time ();
782 mn_now = get_clock (); 834 mn_now = get_clock ();
783 now_floor = mn_now; 835 now_floor = mn_now;
784 rtmn_diff = ev_rt_now - mn_now; 836 rtmn_diff = ev_rt_now - mn_now;
785 837
786 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS")) 838 if (!(flags & EVFLAG_NOENV)
839 && !enable_secure ()
840 && getenv ("LIBEV_FLAGS"))
787 flags = atoi (getenv ("LIBEV_FLAGS")); 841 flags = atoi (getenv ("LIBEV_FLAGS"));
788 842
789 if (!(flags & 0x0000ffff)) 843 if (!(flags & 0x0000ffffUL))
790 flags |= 0x0000ffff; 844 flags |= ev_recommended_backends ();
791 845
792 method = 0; 846 method = 0;
793#if EV_USE_PORT 847#if EV_USE_PORT
794 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags); 848 if (!method && (flags & EVBACKEND_PORT )) method = port_init (EV_A_ flags);
795#endif 849#endif
796#if EV_USE_KQUEUE 850#if EV_USE_KQUEUE
797 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags); 851 if (!method && (flags & EVBACKEND_KQUEUE)) method = kqueue_init (EV_A_ flags);
798#endif 852#endif
799#if EV_USE_EPOLL 853#if EV_USE_EPOLL
800 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags); 854 if (!method && (flags & EVBACKEND_EPOLL )) method = epoll_init (EV_A_ flags);
801#endif 855#endif
802#if EV_USE_POLL 856#if EV_USE_POLL
803 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags); 857 if (!method && (flags & EVBACKEND_POLL )) method = poll_init (EV_A_ flags);
804#endif 858#endif
805#if EV_USE_SELECT 859#if EV_USE_SELECT
806 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags); 860 if (!method && (flags & EVBACKEND_SELECT)) method = select_init (EV_A_ flags);
807#endif 861#endif
808 862
809 ev_init (&sigev, sigcb); 863 ev_init (&sigev, sigcb);
810 ev_set_priority (&sigev, EV_MAXPRI); 864 ev_set_priority (&sigev, EV_MAXPRI);
811 } 865 }
812} 866}
813 867
814void 868static void
815loop_destroy (EV_P) 869loop_destroy (EV_P)
816{ 870{
817 int i; 871 int i;
818 872
819#if EV_USE_PORT 873#if EV_USE_PORT
820 if (method == EVMETHOD_PORT ) port_destroy (EV_A); 874 if (method == EVBACKEND_PORT ) port_destroy (EV_A);
821#endif 875#endif
822#if EV_USE_KQUEUE 876#if EV_USE_KQUEUE
823 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 877 if (method == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
824#endif 878#endif
825#if EV_USE_EPOLL 879#if EV_USE_EPOLL
826 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 880 if (method == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
827#endif 881#endif
828#if EV_USE_POLL 882#if EV_USE_POLL
829 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 883 if (method == EVBACKEND_POLL ) poll_destroy (EV_A);
830#endif 884#endif
831#if EV_USE_SELECT 885#if EV_USE_SELECT
832 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 886 if (method == EVBACKEND_SELECT) select_destroy (EV_A);
833#endif 887#endif
834 888
835 for (i = NUMPRI; i--; ) 889 for (i = NUMPRI; i--; )
836 array_free (pending, [i]); 890 array_free (pending, [i]);
837 891
… …
850 904
851static void 905static void
852loop_fork (EV_P) 906loop_fork (EV_P)
853{ 907{
854#if EV_USE_PORT 908#if EV_USE_PORT
855 if (method == EVMETHOD_PORT ) port_fork (EV_A); 909 if (method == EVBACKEND_PORT ) port_fork (EV_A);
856#endif 910#endif
857#if EV_USE_KQUEUE 911#if EV_USE_KQUEUE
858 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 912 if (method == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
859#endif 913#endif
860#if EV_USE_EPOLL 914#if EV_USE_EPOLL
861 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 915 if (method == EVBACKEND_EPOLL ) epoll_fork (EV_A);
862#endif 916#endif
863 917
864 if (ev_is_active (&sigev)) 918 if (ev_is_active (&sigev))
865 { 919 {
866 /* default loop */ 920 /* default loop */
… …
910 964
911#endif 965#endif
912 966
913#if EV_MULTIPLICITY 967#if EV_MULTIPLICITY
914struct ev_loop * 968struct ev_loop *
915ev_default_loop_ (unsigned int flags) 969ev_default_loop_init (unsigned int flags)
916#else 970#else
917int 971int
918ev_default_loop (unsigned int flags) 972ev_default_loop (unsigned int flags)
919#endif 973#endif
920{ 974{
… …
994 return 1; 1048 return 1;
995 1049
996 return 0; 1050 return 0;
997} 1051}
998 1052
999static void 1053inline void
1000call_pending (EV_P) 1054call_pending (EV_P)
1001{ 1055{
1002 int pri; 1056 int pri;
1003 1057
1004 for (pri = NUMPRI; pri--; ) 1058 for (pri = NUMPRI; pri--; )
1005 while (pendingcnt [pri]) 1059 while (pendingcnt [pri])
1006 { 1060 {
1007 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1061 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1008 1062
1009 if (p->w) 1063 if (expect_true (p->w))
1010 { 1064 {
1011 p->w->pending = 0; 1065 p->w->pending = 0;
1012 EV_CB_INVOKE (p->w, p->events); 1066 EV_CB_INVOKE (p->w, p->events);
1013 } 1067 }
1014 } 1068 }
1015} 1069}
1016 1070
1017static void 1071inline void
1018timers_reify (EV_P) 1072timers_reify (EV_P)
1019{ 1073{
1020 while (timercnt && ((WT)timers [0])->at <= mn_now) 1074 while (timercnt && ((WT)timers [0])->at <= mn_now)
1021 { 1075 {
1022 struct ev_timer *w = timers [0]; 1076 struct ev_timer *w = timers [0];
… …
1040 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1094 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1041 } 1095 }
1042} 1096}
1043 1097
1044#if EV_PERIODICS 1098#if EV_PERIODICS
1045static void 1099inline void
1046periodics_reify (EV_P) 1100periodics_reify (EV_P)
1047{ 1101{
1048 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1102 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1049 { 1103 {
1050 struct ev_periodic *w = periodics [0]; 1104 struct ev_periodic *w = periodics [0];
… …
1109 ev_rt_now = ev_time (); 1163 ev_rt_now = ev_time ();
1110 return 1; 1164 return 1;
1111 } 1165 }
1112} 1166}
1113 1167
1114static void 1168inline void
1115time_update (EV_P) 1169time_update (EV_P)
1116{ 1170{
1117 int i; 1171 int i;
1118 1172
1119#if EV_USE_MONOTONIC 1173#if EV_USE_MONOTONIC
… …
1230 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;
1231 if (block > to) block = to; 1285 if (block > to) block = to;
1232 } 1286 }
1233#endif 1287#endif
1234 1288
1235 if (block < 0.) block = 0.; 1289 if (expect_false (block < 0.)) block = 0.;
1236 } 1290 }
1237 1291
1238 method_poll (EV_A_ block); 1292 method_poll (EV_A_ block);
1239 1293
1240 /* update ev_rt_now, do magic */ 1294 /* update ev_rt_now, do magic */
… …
1249 /* queue idle watchers unless io or timers are pending */ 1303 /* queue idle watchers unless io or timers are pending */
1250 if (idlecnt && !any_pending (EV_A)) 1304 if (idlecnt && !any_pending (EV_A))
1251 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1305 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1252 1306
1253 /* queue check watchers, to be executed first */ 1307 /* queue check watchers, to be executed first */
1254 if (checkcnt) 1308 if (expect_false (checkcnt))
1255 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1309 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1256 1310
1257 call_pending (EV_A); 1311 call_pending (EV_A);
1258 1312
1259 if (loop_done) 1313 if (expect_false (loop_done))
1260 break; 1314 break;
1261 } 1315 }
1262 1316
1263 if (loop_done != 2) 1317 if (loop_done != 2)
1264 loop_done = 0; 1318 loop_done = 0;
… …
1326void 1380void
1327ev_io_start (EV_P_ struct ev_io *w) 1381ev_io_start (EV_P_ struct ev_io *w)
1328{ 1382{
1329 int fd = w->fd; 1383 int fd = w->fd;
1330 1384
1331 if (ev_is_active (w)) 1385 if (expect_false (ev_is_active (w)))
1332 return; 1386 return;
1333 1387
1334 assert (("ev_io_start called with negative fd", fd >= 0)); 1388 assert (("ev_io_start called with negative fd", fd >= 0));
1335 1389
1336 ev_start (EV_A_ (W)w, 1); 1390 ev_start (EV_A_ (W)w, 1);
… …
1342 1396
1343void 1397void
1344ev_io_stop (EV_P_ struct ev_io *w) 1398ev_io_stop (EV_P_ struct ev_io *w)
1345{ 1399{
1346 ev_clear_pending (EV_A_ (W)w); 1400 ev_clear_pending (EV_A_ (W)w);
1347 if (!ev_is_active (w)) 1401 if (expect_false (!ev_is_active (w)))
1348 return; 1402 return;
1349 1403
1350 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));
1351 1405
1352 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1406 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
… …
1356} 1410}
1357 1411
1358void 1412void
1359ev_timer_start (EV_P_ struct ev_timer *w) 1413ev_timer_start (EV_P_ struct ev_timer *w)
1360{ 1414{
1361 if (ev_is_active (w)) 1415 if (expect_false (ev_is_active (w)))
1362 return; 1416 return;
1363 1417
1364 ((WT)w)->at += mn_now; 1418 ((WT)w)->at += mn_now;
1365 1419
1366 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.));
… …
1375 1429
1376void 1430void
1377ev_timer_stop (EV_P_ struct ev_timer *w) 1431ev_timer_stop (EV_P_ struct ev_timer *w)
1378{ 1432{
1379 ev_clear_pending (EV_A_ (W)w); 1433 ev_clear_pending (EV_A_ (W)w);
1380 if (!ev_is_active (w)) 1434 if (expect_false (!ev_is_active (w)))
1381 return; 1435 return;
1382 1436
1383 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1437 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1384 1438
1385 if (((W)w)->active < timercnt--) 1439 if (expect_true (((W)w)->active < timercnt--))
1386 { 1440 {
1387 timers [((W)w)->active - 1] = timers [timercnt]; 1441 timers [((W)w)->active - 1] = timers [timercnt];
1388 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1442 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1389 } 1443 }
1390 1444
… …
1415 1469
1416#if EV_PERIODICS 1470#if EV_PERIODICS
1417void 1471void
1418ev_periodic_start (EV_P_ struct ev_periodic *w) 1472ev_periodic_start (EV_P_ struct ev_periodic *w)
1419{ 1473{
1420 if (ev_is_active (w)) 1474 if (expect_false (ev_is_active (w)))
1421 return; 1475 return;
1422 1476
1423 if (w->reschedule_cb) 1477 if (w->reschedule_cb)
1424 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1478 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1425 else if (w->interval) 1479 else if (w->interval)
… …
1439 1493
1440void 1494void
1441ev_periodic_stop (EV_P_ struct ev_periodic *w) 1495ev_periodic_stop (EV_P_ struct ev_periodic *w)
1442{ 1496{
1443 ev_clear_pending (EV_A_ (W)w); 1497 ev_clear_pending (EV_A_ (W)w);
1444 if (!ev_is_active (w)) 1498 if (expect_false (!ev_is_active (w)))
1445 return; 1499 return;
1446 1500
1447 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1501 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1448 1502
1449 if (((W)w)->active < periodiccnt--) 1503 if (expect_true (((W)w)->active < periodiccnt--))
1450 { 1504 {
1451 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1505 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1452 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1506 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1453 } 1507 }
1454 1508
… …
1465#endif 1519#endif
1466 1520
1467void 1521void
1468ev_idle_start (EV_P_ struct ev_idle *w) 1522ev_idle_start (EV_P_ struct ev_idle *w)
1469{ 1523{
1470 if (ev_is_active (w)) 1524 if (expect_false (ev_is_active (w)))
1471 return; 1525 return;
1472 1526
1473 ev_start (EV_A_ (W)w, ++idlecnt); 1527 ev_start (EV_A_ (W)w, ++idlecnt);
1474 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2); 1528 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1475 idles [idlecnt - 1] = w; 1529 idles [idlecnt - 1] = w;
… …
1477 1531
1478void 1532void
1479ev_idle_stop (EV_P_ struct ev_idle *w) 1533ev_idle_stop (EV_P_ struct ev_idle *w)
1480{ 1534{
1481 ev_clear_pending (EV_A_ (W)w); 1535 ev_clear_pending (EV_A_ (W)w);
1482 if (!ev_is_active (w)) 1536 if (expect_false (!ev_is_active (w)))
1483 return; 1537 return;
1484 1538
1485 idles [((W)w)->active - 1] = idles [--idlecnt]; 1539 idles [((W)w)->active - 1] = idles [--idlecnt];
1486 ev_stop (EV_A_ (W)w); 1540 ev_stop (EV_A_ (W)w);
1487} 1541}
1488 1542
1489void 1543void
1490ev_prepare_start (EV_P_ struct ev_prepare *w) 1544ev_prepare_start (EV_P_ struct ev_prepare *w)
1491{ 1545{
1492 if (ev_is_active (w)) 1546 if (expect_false (ev_is_active (w)))
1493 return; 1547 return;
1494 1548
1495 ev_start (EV_A_ (W)w, ++preparecnt); 1549 ev_start (EV_A_ (W)w, ++preparecnt);
1496 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 1550 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1497 prepares [preparecnt - 1] = w; 1551 prepares [preparecnt - 1] = w;
… …
1499 1553
1500void 1554void
1501ev_prepare_stop (EV_P_ struct ev_prepare *w) 1555ev_prepare_stop (EV_P_ struct ev_prepare *w)
1502{ 1556{
1503 ev_clear_pending (EV_A_ (W)w); 1557 ev_clear_pending (EV_A_ (W)w);
1504 if (!ev_is_active (w)) 1558 if (expect_false (!ev_is_active (w)))
1505 return; 1559 return;
1506 1560
1507 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1561 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1508 ev_stop (EV_A_ (W)w); 1562 ev_stop (EV_A_ (W)w);
1509} 1563}
1510 1564
1511void 1565void
1512ev_check_start (EV_P_ struct ev_check *w) 1566ev_check_start (EV_P_ struct ev_check *w)
1513{ 1567{
1514 if (ev_is_active (w)) 1568 if (expect_false (ev_is_active (w)))
1515 return; 1569 return;
1516 1570
1517 ev_start (EV_A_ (W)w, ++checkcnt); 1571 ev_start (EV_A_ (W)w, ++checkcnt);
1518 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2); 1572 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1519 checks [checkcnt - 1] = w; 1573 checks [checkcnt - 1] = w;
… …
1521 1575
1522void 1576void
1523ev_check_stop (EV_P_ struct ev_check *w) 1577ev_check_stop (EV_P_ struct ev_check *w)
1524{ 1578{
1525 ev_clear_pending (EV_A_ (W)w); 1579 ev_clear_pending (EV_A_ (W)w);
1526 if (!ev_is_active (w)) 1580 if (expect_false (!ev_is_active (w)))
1527 return; 1581 return;
1528 1582
1529 checks [((W)w)->active - 1] = checks [--checkcnt]; 1583 checks [((W)w)->active - 1] = checks [--checkcnt];
1530 ev_stop (EV_A_ (W)w); 1584 ev_stop (EV_A_ (W)w);
1531} 1585}
… …
1538ev_signal_start (EV_P_ struct ev_signal *w) 1592ev_signal_start (EV_P_ struct ev_signal *w)
1539{ 1593{
1540#if EV_MULTIPLICITY 1594#if EV_MULTIPLICITY
1541 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1595 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1542#endif 1596#endif
1543 if (ev_is_active (w)) 1597 if (expect_false (ev_is_active (w)))
1544 return; 1598 return;
1545 1599
1546 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));
1547 1601
1548 ev_start (EV_A_ (W)w, 1); 1602 ev_start (EV_A_ (W)w, 1);
… …
1565 1619
1566void 1620void
1567ev_signal_stop (EV_P_ struct ev_signal *w) 1621ev_signal_stop (EV_P_ struct ev_signal *w)
1568{ 1622{
1569 ev_clear_pending (EV_A_ (W)w); 1623 ev_clear_pending (EV_A_ (W)w);
1570 if (!ev_is_active (w)) 1624 if (expect_false (!ev_is_active (w)))
1571 return; 1625 return;
1572 1626
1573 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1627 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1574 ev_stop (EV_A_ (W)w); 1628 ev_stop (EV_A_ (W)w);
1575 1629
… …
1581ev_child_start (EV_P_ struct ev_child *w) 1635ev_child_start (EV_P_ struct ev_child *w)
1582{ 1636{
1583#if EV_MULTIPLICITY 1637#if EV_MULTIPLICITY
1584 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1638 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1585#endif 1639#endif
1586 if (ev_is_active (w)) 1640 if (expect_false (ev_is_active (w)))
1587 return; 1641 return;
1588 1642
1589 ev_start (EV_A_ (W)w, 1); 1643 ev_start (EV_A_ (W)w, 1);
1590 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1644 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1591} 1645}
1592 1646
1593void 1647void
1594ev_child_stop (EV_P_ struct ev_child *w) 1648ev_child_stop (EV_P_ struct ev_child *w)
1595{ 1649{
1596 ev_clear_pending (EV_A_ (W)w); 1650 ev_clear_pending (EV_A_ (W)w);
1597 if (!ev_is_active (w)) 1651 if (expect_false (!ev_is_active (w)))
1598 return; 1652 return;
1599 1653
1600 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1654 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1601 ev_stop (EV_A_ (W)w); 1655 ev_stop (EV_A_ (W)w);
1602} 1656}
… …
1639void 1693void
1640ev_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)
1641{ 1695{
1642 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));
1643 1697
1644 if (!once) 1698 if (expect_false (!once))
1699 {
1645 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1700 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1646 else 1701 return;
1647 { 1702 }
1703
1648 once->cb = cb; 1704 once->cb = cb;
1649 once->arg = arg; 1705 once->arg = arg;
1650 1706
1651 ev_init (&once->io, once_cb_io); 1707 ev_init (&once->io, once_cb_io);
1652 if (fd >= 0) 1708 if (fd >= 0)
1653 { 1709 {
1654 ev_io_set (&once->io, fd, events); 1710 ev_io_set (&once->io, fd, events);
1655 ev_io_start (EV_A_ &once->io); 1711 ev_io_start (EV_A_ &once->io);
1656 } 1712 }
1657 1713
1658 ev_init (&once->to, once_cb_to); 1714 ev_init (&once->to, once_cb_to);
1659 if (timeout >= 0.) 1715 if (timeout >= 0.)
1660 { 1716 {
1661 ev_timer_set (&once->to, timeout, 0.); 1717 ev_timer_set (&once->to, timeout, 0.);
1662 ev_timer_start (EV_A_ &once->to); 1718 ev_timer_start (EV_A_ &once->to);
1663 }
1664 } 1719 }
1665} 1720}
1666 1721
1667#ifdef __cplusplus 1722#ifdef __cplusplus
1668} 1723}

Diff Legend

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