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

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

Diff Legend

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