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

Comparing libev/ev.c (file contents):
Revision 1.115 by root, Wed Nov 14 04:53:21 2007 UTC vs.
Revision 1.124 by root, Sat Nov 17 02:26:24 2007 UTC

… …
59 59
60# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE) 60# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE)
61# define EV_USE_KQUEUE 1 61# define EV_USE_KQUEUE 1
62# endif 62# endif
63 63
64# if HAVE_PORT_H && HAVE_PORT_CREATE && !defined (EV_USE_PORT)
65# define EV_USE_PORT 1
66# endif
67
64#endif 68#endif
65 69
66#include <math.h> 70#include <math.h>
67#include <stdlib.h> 71#include <stdlib.h>
68#include <fcntl.h> 72#include <fcntl.h>
… …
90#endif 94#endif
91 95
92/**/ 96/**/
93 97
94#ifndef EV_USE_MONOTONIC 98#ifndef EV_USE_MONOTONIC
95# define EV_USE_MONOTONIC 1 99# define EV_USE_MONOTONIC 0
100#endif
101
102#ifndef EV_USE_REALTIME
103# define EV_USE_REALTIME 0
96#endif 104#endif
97 105
98#ifndef EV_USE_SELECT 106#ifndef EV_USE_SELECT
99# define EV_USE_SELECT 1 107# define EV_USE_SELECT 1
100# define EV_SELECT_USE_FD_SET 1
101#endif 108#endif
102 109
103#ifndef EV_USE_POLL 110#ifndef EV_USE_POLL
104# ifdef _WIN32 111# ifdef _WIN32
105# define EV_USE_POLL 0 112# define EV_USE_POLL 0
… …
114 121
115#ifndef EV_USE_KQUEUE 122#ifndef EV_USE_KQUEUE
116# define EV_USE_KQUEUE 0 123# define EV_USE_KQUEUE 0
117#endif 124#endif
118 125
119#ifndef EV_USE_REALTIME 126#ifndef EV_USE_PORT
120# define EV_USE_REALTIME 1 127# define EV_USE_PORT 0
121#endif 128#endif
122 129
123/**/ 130/**/
124 131
125/* darwin simply cannot be helped */ 132/* darwin simply cannot be helped */
… …
143#endif 150#endif
144 151
145/**/ 152/**/
146 153
147#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 154#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) */ 155#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 */ 156#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 */ 157/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
151 158
152#ifdef EV_H 159#ifdef EV_H
153# include EV_H 160# include EV_H
154#else 161#else
155# include "ev.h" 162# include "ev.h"
156#endif 163#endif
157 164
158#if __GNUC__ >= 3 165#if __GNUC__ >= 3
159# define expect(expr,value) __builtin_expect ((expr),(value)) 166# define expect(expr,value) __builtin_expect ((expr),(value))
160# define inline inline 167# define inline static inline
161#else 168#else
162# define expect(expr,value) (expr) 169# define expect(expr,value) (expr)
163# define inline static 170# define inline static
164#endif 171#endif
165 172
… …
258 #include "ev_vars.h" 265 #include "ev_vars.h"
259 #undef VAR 266 #undef VAR
260 }; 267 };
261 #include "ev_wrap.h" 268 #include "ev_wrap.h"
262 269
263 struct ev_loop default_loop_struct; 270 static struct ev_loop default_loop_struct;
264 static struct ev_loop *default_loop; 271 struct ev_loop *ev_default_loop_ptr;
265 272
266#else 273#else
267 274
268 ev_tstamp ev_rt_now; 275 ev_tstamp ev_rt_now;
269 #define VAR(name,decl) static decl; 276 #define VAR(name,decl) static decl;
270 #include "ev_vars.h" 277 #include "ev_vars.h"
271 #undef VAR 278 #undef VAR
272 279
273 static int default_loop; 280 static int ev_default_loop_ptr;
274 281
275#endif 282#endif
276 283
277/*****************************************************************************/ 284/*****************************************************************************/
278 285
… …
359void 366void
360ev_feed_event (EV_P_ void *w, int revents) 367ev_feed_event (EV_P_ void *w, int revents)
361{ 368{
362 W w_ = (W)w; 369 W w_ = (W)w;
363 370
364 if (w_->pending) 371 if (expect_false (w_->pending))
365 { 372 {
366 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 373 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
367 return; 374 return;
368 } 375 }
369 376
… …
403 fd_event (EV_A_ fd, revents); 410 fd_event (EV_A_ fd, revents);
404} 411}
405 412
406/*****************************************************************************/ 413/*****************************************************************************/
407 414
408static void 415inline void
409fd_reify (EV_P) 416fd_reify (EV_P)
410{ 417{
411 int i; 418 int i;
412 419
413 for (i = 0; i < fdchangecnt; ++i) 420 for (i = 0; i < fdchangecnt; ++i)
… …
440} 447}
441 448
442static void 449static void
443fd_change (EV_P_ int fd) 450fd_change (EV_P_ int fd)
444{ 451{
445 if (anfds [fd].reify) 452 if (expect_false (anfds [fd].reify))
446 return; 453 return;
447 454
448 anfds [fd].reify = 1; 455 anfds [fd].reify = 1;
449 456
450 ++fdchangecnt; 457 ++fdchangecnt;
… …
462 ev_io_stop (EV_A_ w); 469 ev_io_stop (EV_A_ w);
463 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 470 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
464 } 471 }
465} 472}
466 473
467static int 474inline int
468fd_valid (int fd) 475fd_valid (int fd)
469{ 476{
470#ifdef _WIN32 477#ifdef _WIN32
471 return _get_osfhandle (fd) != -1; 478 return _get_osfhandle (fd) != -1;
472#else 479#else
… …
614ev_feed_signal_event (EV_P_ int signum) 621ev_feed_signal_event (EV_P_ int signum)
615{ 622{
616 WL w; 623 WL w;
617 624
618#if EV_MULTIPLICITY 625#if EV_MULTIPLICITY
619 assert (("feeding signal events is only supported in the default loop", loop == default_loop)); 626 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
620#endif 627#endif
621 628
622 --signum; 629 --signum;
623 630
624 if (signum < 0 || signum >= signalmax) 631 if (signum < 0 || signum >= signalmax)
… …
641 for (signum = signalmax; signum--; ) 648 for (signum = signalmax; signum--; )
642 if (signals [signum].gotsig) 649 if (signals [signum].gotsig)
643 ev_feed_signal_event (EV_A_ signum + 1); 650 ev_feed_signal_event (EV_A_ signum + 1);
644} 651}
645 652
646inline void 653static void
647fd_intern (int fd) 654fd_intern (int fd)
648{ 655{
649#ifdef _WIN32 656#ifdef _WIN32
650 int arg = 1; 657 int arg = 1;
651 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 658 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
710 717
711#endif 718#endif
712 719
713/*****************************************************************************/ 720/*****************************************************************************/
714 721
722#if EV_USE_PORT
723# include "ev_port.c"
724#endif
715#if EV_USE_KQUEUE 725#if EV_USE_KQUEUE
716# include "ev_kqueue.c" 726# include "ev_kqueue.c"
717#endif 727#endif
718#if EV_USE_EPOLL 728#if EV_USE_EPOLL
719# include "ev_epoll.c" 729# include "ev_epoll.c"
… …
778 788
779 if (!(flags & 0x0000ffff)) 789 if (!(flags & 0x0000ffff))
780 flags |= 0x0000ffff; 790 flags |= 0x0000ffff;
781 791
782 method = 0; 792 method = 0;
793#if EV_USE_PORT
794 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags);
795#endif
783#if EV_USE_KQUEUE 796#if EV_USE_KQUEUE
784 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags); 797 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
785#endif 798#endif
786#if EV_USE_EPOLL 799#if EV_USE_EPOLL
787 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags); 800 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
… …
796 ev_init (&sigev, sigcb); 809 ev_init (&sigev, sigcb);
797 ev_set_priority (&sigev, EV_MAXPRI); 810 ev_set_priority (&sigev, EV_MAXPRI);
798 } 811 }
799} 812}
800 813
801void 814static void
802loop_destroy (EV_P) 815loop_destroy (EV_P)
803{ 816{
804 int i; 817 int i;
805 818
819#if EV_USE_PORT
820 if (method == EVMETHOD_PORT ) port_destroy (EV_A);
821#endif
806#if EV_USE_KQUEUE 822#if EV_USE_KQUEUE
807 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 823 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
808#endif 824#endif
809#if EV_USE_EPOLL 825#if EV_USE_EPOLL
810 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 826 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
… …
833} 849}
834 850
835static void 851static void
836loop_fork (EV_P) 852loop_fork (EV_P)
837{ 853{
854#if EV_USE_PORT
855 if (method == EVMETHOD_PORT ) port_fork (EV_A);
856#endif
857#if EV_USE_KQUEUE
858 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
859#endif
838#if EV_USE_EPOLL 860#if EV_USE_EPOLL
839 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 861 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 862#endif
844 863
845 if (ev_is_active (&sigev)) 864 if (ev_is_active (&sigev))
846 { 865 {
847 /* default loop */ 866 /* default loop */
… …
891 910
892#endif 911#endif
893 912
894#if EV_MULTIPLICITY 913#if EV_MULTIPLICITY
895struct ev_loop * 914struct ev_loop *
915ev_default_loop_ (unsigned int flags)
896#else 916#else
897int 917int
898#endif
899ev_default_loop (unsigned int flags) 918ev_default_loop (unsigned int flags)
919#endif
900{ 920{
901 if (sigpipe [0] == sigpipe [1]) 921 if (sigpipe [0] == sigpipe [1])
902 if (pipe (sigpipe)) 922 if (pipe (sigpipe))
903 return 0; 923 return 0;
904 924
905 if (!default_loop) 925 if (!ev_default_loop_ptr)
906 { 926 {
907#if EV_MULTIPLICITY 927#if EV_MULTIPLICITY
908 struct ev_loop *loop = default_loop = &default_loop_struct; 928 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
909#else 929#else
910 default_loop = 1; 930 ev_default_loop_ptr = 1;
911#endif 931#endif
912 932
913 loop_init (EV_A_ flags); 933 loop_init (EV_A_ flags);
914 934
915 if (ev_method (EV_A)) 935 if (ev_method (EV_A))
… …
922 ev_signal_start (EV_A_ &childev); 942 ev_signal_start (EV_A_ &childev);
923 ev_unref (EV_A); /* child watcher should not keep loop alive */ 943 ev_unref (EV_A); /* child watcher should not keep loop alive */
924#endif 944#endif
925 } 945 }
926 else 946 else
927 default_loop = 0; 947 ev_default_loop_ptr = 0;
928 } 948 }
929 949
930 return default_loop; 950 return ev_default_loop_ptr;
931} 951}
932 952
933void 953void
934ev_default_destroy (void) 954ev_default_destroy (void)
935{ 955{
936#if EV_MULTIPLICITY 956#if EV_MULTIPLICITY
937 struct ev_loop *loop = default_loop; 957 struct ev_loop *loop = ev_default_loop_ptr;
938#endif 958#endif
939 959
940#ifndef _WIN32 960#ifndef _WIN32
941 ev_ref (EV_A); /* child watcher */ 961 ev_ref (EV_A); /* child watcher */
942 ev_signal_stop (EV_A_ &childev); 962 ev_signal_stop (EV_A_ &childev);
… …
953 973
954void 974void
955ev_default_fork (void) 975ev_default_fork (void)
956{ 976{
957#if EV_MULTIPLICITY 977#if EV_MULTIPLICITY
958 struct ev_loop *loop = default_loop; 978 struct ev_loop *loop = ev_default_loop_ptr;
959#endif 979#endif
960 980
961 if (method) 981 if (method)
962 postfork = 1; 982 postfork = 1;
963} 983}
… …
974 return 1; 994 return 1;
975 995
976 return 0; 996 return 0;
977} 997}
978 998
979static void 999inline void
980call_pending (EV_P) 1000call_pending (EV_P)
981{ 1001{
982 int pri; 1002 int pri;
983 1003
984 for (pri = NUMPRI; pri--; ) 1004 for (pri = NUMPRI; pri--; )
985 while (pendingcnt [pri]) 1005 while (pendingcnt [pri])
986 { 1006 {
987 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1007 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
988 1008
989 if (p->w) 1009 if (expect_true (p->w))
990 { 1010 {
991 p->w->pending = 0; 1011 p->w->pending = 0;
992 EV_CB_INVOKE (p->w, p->events); 1012 EV_CB_INVOKE (p->w, p->events);
993 } 1013 }
994 } 1014 }
995} 1015}
996 1016
997static void 1017inline void
998timers_reify (EV_P) 1018timers_reify (EV_P)
999{ 1019{
1000 while (timercnt && ((WT)timers [0])->at <= mn_now) 1020 while (timercnt && ((WT)timers [0])->at <= mn_now)
1001 { 1021 {
1002 struct ev_timer *w = timers [0]; 1022 struct ev_timer *w = timers [0];
… …
1020 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1040 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1021 } 1041 }
1022} 1042}
1023 1043
1024#if EV_PERIODICS 1044#if EV_PERIODICS
1025static void 1045inline void
1026periodics_reify (EV_P) 1046periodics_reify (EV_P)
1027{ 1047{
1028 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1048 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1029 { 1049 {
1030 struct ev_periodic *w = periodics [0]; 1050 struct ev_periodic *w = periodics [0];
… …
1089 ev_rt_now = ev_time (); 1109 ev_rt_now = ev_time ();
1090 return 1; 1110 return 1;
1091 } 1111 }
1092} 1112}
1093 1113
1094static void 1114inline void
1095time_update (EV_P) 1115time_update (EV_P)
1096{ 1116{
1097 int i; 1117 int i;
1098 1118
1099#if EV_USE_MONOTONIC 1119#if EV_USE_MONOTONIC
… …
1210 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1230 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1211 if (block > to) block = to; 1231 if (block > to) block = to;
1212 } 1232 }
1213#endif 1233#endif
1214 1234
1215 if (block < 0.) block = 0.; 1235 if (expect_false (block < 0.)) block = 0.;
1216 } 1236 }
1217 1237
1218 method_poll (EV_A_ block); 1238 method_poll (EV_A_ block);
1219 1239
1220 /* update ev_rt_now, do magic */ 1240 /* update ev_rt_now, do magic */
… …
1229 /* queue idle watchers unless io or timers are pending */ 1249 /* queue idle watchers unless io or timers are pending */
1230 if (idlecnt && !any_pending (EV_A)) 1250 if (idlecnt && !any_pending (EV_A))
1231 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1251 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1232 1252
1233 /* queue check watchers, to be executed first */ 1253 /* queue check watchers, to be executed first */
1234 if (checkcnt) 1254 if (expect_false (checkcnt))
1235 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1255 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1236 1256
1237 call_pending (EV_A); 1257 call_pending (EV_A);
1238 1258
1239 if (loop_done) 1259 if (expect_false (loop_done))
1240 break; 1260 break;
1241 } 1261 }
1242 1262
1243 if (loop_done != 2) 1263 if (loop_done != 2)
1244 loop_done = 0; 1264 loop_done = 0;
… …
1306void 1326void
1307ev_io_start (EV_P_ struct ev_io *w) 1327ev_io_start (EV_P_ struct ev_io *w)
1308{ 1328{
1309 int fd = w->fd; 1329 int fd = w->fd;
1310 1330
1311 if (ev_is_active (w)) 1331 if (expect_false (ev_is_active (w)))
1312 return; 1332 return;
1313 1333
1314 assert (("ev_io_start called with negative fd", fd >= 0)); 1334 assert (("ev_io_start called with negative fd", fd >= 0));
1315 1335
1316 ev_start (EV_A_ (W)w, 1); 1336 ev_start (EV_A_ (W)w, 1);
… …
1322 1342
1323void 1343void
1324ev_io_stop (EV_P_ struct ev_io *w) 1344ev_io_stop (EV_P_ struct ev_io *w)
1325{ 1345{
1326 ev_clear_pending (EV_A_ (W)w); 1346 ev_clear_pending (EV_A_ (W)w);
1327 if (!ev_is_active (w)) 1347 if (expect_false (!ev_is_active (w)))
1328 return; 1348 return;
1329 1349
1330 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1350 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1331 1351
1332 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1352 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
… …
1336} 1356}
1337 1357
1338void 1358void
1339ev_timer_start (EV_P_ struct ev_timer *w) 1359ev_timer_start (EV_P_ struct ev_timer *w)
1340{ 1360{
1341 if (ev_is_active (w)) 1361 if (expect_false (ev_is_active (w)))
1342 return; 1362 return;
1343 1363
1344 ((WT)w)->at += mn_now; 1364 ((WT)w)->at += mn_now;
1345 1365
1346 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1366 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
… …
1355 1375
1356void 1376void
1357ev_timer_stop (EV_P_ struct ev_timer *w) 1377ev_timer_stop (EV_P_ struct ev_timer *w)
1358{ 1378{
1359 ev_clear_pending (EV_A_ (W)w); 1379 ev_clear_pending (EV_A_ (W)w);
1360 if (!ev_is_active (w)) 1380 if (expect_false (!ev_is_active (w)))
1361 return; 1381 return;
1362 1382
1363 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1383 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1364 1384
1365 if (((W)w)->active < timercnt--) 1385 if (expect_true (((W)w)->active < timercnt--))
1366 { 1386 {
1367 timers [((W)w)->active - 1] = timers [timercnt]; 1387 timers [((W)w)->active - 1] = timers [timercnt];
1368 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1388 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1369 } 1389 }
1370 1390
… …
1395 1415
1396#if EV_PERIODICS 1416#if EV_PERIODICS
1397void 1417void
1398ev_periodic_start (EV_P_ struct ev_periodic *w) 1418ev_periodic_start (EV_P_ struct ev_periodic *w)
1399{ 1419{
1400 if (ev_is_active (w)) 1420 if (expect_false (ev_is_active (w)))
1401 return; 1421 return;
1402 1422
1403 if (w->reschedule_cb) 1423 if (w->reschedule_cb)
1404 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1424 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1405 else if (w->interval) 1425 else if (w->interval)
… …
1419 1439
1420void 1440void
1421ev_periodic_stop (EV_P_ struct ev_periodic *w) 1441ev_periodic_stop (EV_P_ struct ev_periodic *w)
1422{ 1442{
1423 ev_clear_pending (EV_A_ (W)w); 1443 ev_clear_pending (EV_A_ (W)w);
1424 if (!ev_is_active (w)) 1444 if (expect_false (!ev_is_active (w)))
1425 return; 1445 return;
1426 1446
1427 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1447 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1428 1448
1429 if (((W)w)->active < periodiccnt--) 1449 if (expect_true (((W)w)->active < periodiccnt--))
1430 { 1450 {
1431 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1451 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1432 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1452 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1433 } 1453 }
1434 1454
… …
1445#endif 1465#endif
1446 1466
1447void 1467void
1448ev_idle_start (EV_P_ struct ev_idle *w) 1468ev_idle_start (EV_P_ struct ev_idle *w)
1449{ 1469{
1450 if (ev_is_active (w)) 1470 if (expect_false (ev_is_active (w)))
1451 return; 1471 return;
1452 1472
1453 ev_start (EV_A_ (W)w, ++idlecnt); 1473 ev_start (EV_A_ (W)w, ++idlecnt);
1454 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2); 1474 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1455 idles [idlecnt - 1] = w; 1475 idles [idlecnt - 1] = w;
… …
1457 1477
1458void 1478void
1459ev_idle_stop (EV_P_ struct ev_idle *w) 1479ev_idle_stop (EV_P_ struct ev_idle *w)
1460{ 1480{
1461 ev_clear_pending (EV_A_ (W)w); 1481 ev_clear_pending (EV_A_ (W)w);
1462 if (!ev_is_active (w)) 1482 if (expect_false (!ev_is_active (w)))
1463 return; 1483 return;
1464 1484
1465 idles [((W)w)->active - 1] = idles [--idlecnt]; 1485 idles [((W)w)->active - 1] = idles [--idlecnt];
1466 ev_stop (EV_A_ (W)w); 1486 ev_stop (EV_A_ (W)w);
1467} 1487}
1468 1488
1469void 1489void
1470ev_prepare_start (EV_P_ struct ev_prepare *w) 1490ev_prepare_start (EV_P_ struct ev_prepare *w)
1471{ 1491{
1472 if (ev_is_active (w)) 1492 if (expect_false (ev_is_active (w)))
1473 return; 1493 return;
1474 1494
1475 ev_start (EV_A_ (W)w, ++preparecnt); 1495 ev_start (EV_A_ (W)w, ++preparecnt);
1476 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 1496 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1477 prepares [preparecnt - 1] = w; 1497 prepares [preparecnt - 1] = w;
… …
1479 1499
1480void 1500void
1481ev_prepare_stop (EV_P_ struct ev_prepare *w) 1501ev_prepare_stop (EV_P_ struct ev_prepare *w)
1482{ 1502{
1483 ev_clear_pending (EV_A_ (W)w); 1503 ev_clear_pending (EV_A_ (W)w);
1484 if (!ev_is_active (w)) 1504 if (expect_false (!ev_is_active (w)))
1485 return; 1505 return;
1486 1506
1487 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1507 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1488 ev_stop (EV_A_ (W)w); 1508 ev_stop (EV_A_ (W)w);
1489} 1509}
1490 1510
1491void 1511void
1492ev_check_start (EV_P_ struct ev_check *w) 1512ev_check_start (EV_P_ struct ev_check *w)
1493{ 1513{
1494 if (ev_is_active (w)) 1514 if (expect_false (ev_is_active (w)))
1495 return; 1515 return;
1496 1516
1497 ev_start (EV_A_ (W)w, ++checkcnt); 1517 ev_start (EV_A_ (W)w, ++checkcnt);
1498 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2); 1518 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1499 checks [checkcnt - 1] = w; 1519 checks [checkcnt - 1] = w;
… …
1501 1521
1502void 1522void
1503ev_check_stop (EV_P_ struct ev_check *w) 1523ev_check_stop (EV_P_ struct ev_check *w)
1504{ 1524{
1505 ev_clear_pending (EV_A_ (W)w); 1525 ev_clear_pending (EV_A_ (W)w);
1506 if (!ev_is_active (w)) 1526 if (expect_false (!ev_is_active (w)))
1507 return; 1527 return;
1508 1528
1509 checks [((W)w)->active - 1] = checks [--checkcnt]; 1529 checks [((W)w)->active - 1] = checks [--checkcnt];
1510 ev_stop (EV_A_ (W)w); 1530 ev_stop (EV_A_ (W)w);
1511} 1531}
… …
1516 1536
1517void 1537void
1518ev_signal_start (EV_P_ struct ev_signal *w) 1538ev_signal_start (EV_P_ struct ev_signal *w)
1519{ 1539{
1520#if EV_MULTIPLICITY 1540#if EV_MULTIPLICITY
1521 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1541 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1522#endif 1542#endif
1523 if (ev_is_active (w)) 1543 if (expect_false (ev_is_active (w)))
1524 return; 1544 return;
1525 1545
1526 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1546 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1527 1547
1528 ev_start (EV_A_ (W)w, 1); 1548 ev_start (EV_A_ (W)w, 1);
… …
1545 1565
1546void 1566void
1547ev_signal_stop (EV_P_ struct ev_signal *w) 1567ev_signal_stop (EV_P_ struct ev_signal *w)
1548{ 1568{
1549 ev_clear_pending (EV_A_ (W)w); 1569 ev_clear_pending (EV_A_ (W)w);
1550 if (!ev_is_active (w)) 1570 if (expect_false (!ev_is_active (w)))
1551 return; 1571 return;
1552 1572
1553 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1573 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1554 ev_stop (EV_A_ (W)w); 1574 ev_stop (EV_A_ (W)w);
1555 1575
… …
1559 1579
1560void 1580void
1561ev_child_start (EV_P_ struct ev_child *w) 1581ev_child_start (EV_P_ struct ev_child *w)
1562{ 1582{
1563#if EV_MULTIPLICITY 1583#if EV_MULTIPLICITY
1564 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1584 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1565#endif 1585#endif
1566 if (ev_is_active (w)) 1586 if (expect_false (ev_is_active (w)))
1567 return; 1587 return;
1568 1588
1569 ev_start (EV_A_ (W)w, 1); 1589 ev_start (EV_A_ (W)w, 1);
1570 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1590 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1571} 1591}
1572 1592
1573void 1593void
1574ev_child_stop (EV_P_ struct ev_child *w) 1594ev_child_stop (EV_P_ struct ev_child *w)
1575{ 1595{
1576 ev_clear_pending (EV_A_ (W)w); 1596 ev_clear_pending (EV_A_ (W)w);
1577 if (!ev_is_active (w)) 1597 if (expect_false (!ev_is_active (w)))
1578 return; 1598 return;
1579 1599
1580 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1600 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1581 ev_stop (EV_A_ (W)w); 1601 ev_stop (EV_A_ (W)w);
1582} 1602}
… …
1619void 1639void
1620ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1640ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1621{ 1641{
1622 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 1642 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1623 1643
1624 if (!once) 1644 if (expect_false (!once))
1645 {
1625 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1646 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1626 else 1647 return;
1627 { 1648 }
1649
1628 once->cb = cb; 1650 once->cb = cb;
1629 once->arg = arg; 1651 once->arg = arg;
1630 1652
1631 ev_init (&once->io, once_cb_io); 1653 ev_init (&once->io, once_cb_io);
1632 if (fd >= 0) 1654 if (fd >= 0)
1633 { 1655 {
1634 ev_io_set (&once->io, fd, events); 1656 ev_io_set (&once->io, fd, events);
1635 ev_io_start (EV_A_ &once->io); 1657 ev_io_start (EV_A_ &once->io);
1636 } 1658 }
1637 1659
1638 ev_init (&once->to, once_cb_to); 1660 ev_init (&once->to, once_cb_to);
1639 if (timeout >= 0.) 1661 if (timeout >= 0.)
1640 { 1662 {
1641 ev_timer_set (&once->to, timeout, 0.); 1663 ev_timer_set (&once->to, timeout, 0.);
1642 ev_timer_start (EV_A_ &once->to); 1664 ev_timer_start (EV_A_ &once->to);
1643 }
1644 } 1665 }
1645} 1666}
1646 1667
1647#ifdef __cplusplus 1668#ifdef __cplusplus
1648} 1669}

Diff Legend

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