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

Comparing libev/ev.c (file contents):
Revision 1.113 by root, Mon Nov 12 08:00:05 2007 UTC vs.
Revision 1.123 by root, Sat Nov 17 02:23:54 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
… …
167#define expect_true(expr) expect ((expr) != 0, 1) 174#define expect_true(expr) expect ((expr) != 0, 1)
168 175
169#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 176#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
170#define ABSPRI(w) ((w)->priority - EV_MINPRI) 177#define ABSPRI(w) ((w)->priority - EV_MINPRI)
171 178
172#define EMPTY /* required for microsofts broken pseudo-c compiler */ 179#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
180#define EMPTY2(a,b) /* used to suppress some warnings */
173 181
174typedef struct ev_watcher *W; 182typedef struct ev_watcher *W;
175typedef struct ev_watcher_list *WL; 183typedef struct ev_watcher_list *WL;
176typedef struct ev_watcher_time *WT; 184typedef struct ev_watcher_time *WT;
177 185
… …
257 #include "ev_vars.h" 265 #include "ev_vars.h"
258 #undef VAR 266 #undef VAR
259 }; 267 };
260 #include "ev_wrap.h" 268 #include "ev_wrap.h"
261 269
262 struct ev_loop default_loop_struct; 270 static struct ev_loop default_loop_struct;
263 static struct ev_loop *default_loop; 271 struct ev_loop *ev_default_loop_ptr;
264 272
265#else 273#else
266 274
267 ev_tstamp ev_rt_now; 275 ev_tstamp ev_rt_now;
268 #define VAR(name,decl) static decl; 276 #define VAR(name,decl) static decl;
269 #include "ev_vars.h" 277 #include "ev_vars.h"
270 #undef VAR 278 #undef VAR
271 279
272 static int default_loop; 280 static int ev_default_loop_ptr;
273 281
274#endif 282#endif
275 283
276/*****************************************************************************/ 284/*****************************************************************************/
277 285
… …
358void 366void
359ev_feed_event (EV_P_ void *w, int revents) 367ev_feed_event (EV_P_ void *w, int revents)
360{ 368{
361 W w_ = (W)w; 369 W w_ = (W)w;
362 370
363 if (w_->pending) 371 if (expect_false (w_->pending))
364 { 372 {
365 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 373 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
366 return; 374 return;
367 } 375 }
368 376
369 w_->pending = ++pendingcnt [ABSPRI (w_)]; 377 w_->pending = ++pendingcnt [ABSPRI (w_)];
370 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void)); 378 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
371 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 379 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
372 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 380 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
373} 381}
374 382
375static void 383static void
… …
402 fd_event (EV_A_ fd, revents); 410 fd_event (EV_A_ fd, revents);
403} 411}
404 412
405/*****************************************************************************/ 413/*****************************************************************************/
406 414
407static void 415inline void
408fd_reify (EV_P) 416fd_reify (EV_P)
409{ 417{
410 int i; 418 int i;
411 419
412 for (i = 0; i < fdchangecnt; ++i) 420 for (i = 0; i < fdchangecnt; ++i)
… …
439} 447}
440 448
441static void 449static void
442fd_change (EV_P_ int fd) 450fd_change (EV_P_ int fd)
443{ 451{
444 if (anfds [fd].reify) 452 if (expect_false (anfds [fd].reify))
445 return; 453 return;
446 454
447 anfds [fd].reify = 1; 455 anfds [fd].reify = 1;
448 456
449 ++fdchangecnt; 457 ++fdchangecnt;
450 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 458 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
451 fdchanges [fdchangecnt - 1] = fd; 459 fdchanges [fdchangecnt - 1] = fd;
452} 460}
453 461
454static void 462static void
455fd_kill (EV_P_ int fd) 463fd_kill (EV_P_ int fd)
… …
461 ev_io_stop (EV_A_ w); 469 ev_io_stop (EV_A_ w);
462 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);
463 } 471 }
464} 472}
465 473
466static int 474inline int
467fd_valid (int fd) 475fd_valid (int fd)
468{ 476{
469#ifdef _WIN32 477#ifdef _WIN32
470 return _get_osfhandle (fd) != -1; 478 return _get_osfhandle (fd) != -1;
471#else 479#else
… …
613ev_feed_signal_event (EV_P_ int signum) 621ev_feed_signal_event (EV_P_ int signum)
614{ 622{
615 WL w; 623 WL w;
616 624
617#if EV_MULTIPLICITY 625#if EV_MULTIPLICITY
618 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));
619#endif 627#endif
620 628
621 --signum; 629 --signum;
622 630
623 if (signum < 0 || signum >= signalmax) 631 if (signum < 0 || signum >= signalmax)
… …
640 for (signum = signalmax; signum--; ) 648 for (signum = signalmax; signum--; )
641 if (signals [signum].gotsig) 649 if (signals [signum].gotsig)
642 ev_feed_signal_event (EV_A_ signum + 1); 650 ev_feed_signal_event (EV_A_ signum + 1);
643} 651}
644 652
645inline void 653static void
646fd_intern (int fd) 654fd_intern (int fd)
647{ 655{
648#ifdef _WIN32 656#ifdef _WIN32
649 int arg = 1; 657 int arg = 1;
650 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 658 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
709 717
710#endif 718#endif
711 719
712/*****************************************************************************/ 720/*****************************************************************************/
713 721
722#if EV_USE_PORT
723# include "ev_port.c"
724#endif
714#if EV_USE_KQUEUE 725#if EV_USE_KQUEUE
715# include "ev_kqueue.c" 726# include "ev_kqueue.c"
716#endif 727#endif
717#if EV_USE_EPOLL 728#if EV_USE_EPOLL
718# include "ev_epoll.c" 729# include "ev_epoll.c"
… …
777 788
778 if (!(flags & 0x0000ffff)) 789 if (!(flags & 0x0000ffff))
779 flags |= 0x0000ffff; 790 flags |= 0x0000ffff;
780 791
781 method = 0; 792 method = 0;
793#if EV_USE_PORT
794 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags);
795#endif
782#if EV_USE_KQUEUE 796#if EV_USE_KQUEUE
783 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags); 797 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
784#endif 798#endif
785#if EV_USE_EPOLL 799#if EV_USE_EPOLL
786 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags); 800 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
… …
800void 814void
801loop_destroy (EV_P) 815loop_destroy (EV_P)
802{ 816{
803 int i; 817 int i;
804 818
819#if EV_USE_PORT
820 if (method == EVMETHOD_PORT ) port_destroy (EV_A);
821#endif
805#if EV_USE_KQUEUE 822#if EV_USE_KQUEUE
806 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 823 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
807#endif 824#endif
808#if EV_USE_EPOLL 825#if EV_USE_EPOLL
809 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 826 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
… …
817 834
818 for (i = NUMPRI; i--; ) 835 for (i = NUMPRI; i--; )
819 array_free (pending, [i]); 836 array_free (pending, [i]);
820 837
821 /* have to use the microsoft-never-gets-it-right macro */ 838 /* have to use the microsoft-never-gets-it-right macro */
822 array_free (fdchange, EMPTY); 839 array_free (fdchange, EMPTY0);
823 array_free (timer, EMPTY); 840 array_free (timer, EMPTY0);
824#if EV_PERIODICS 841#if EV_PERIODICS
825 array_free (periodic, EMPTY); 842 array_free (periodic, EMPTY0);
826#endif 843#endif
827 array_free (idle, EMPTY); 844 array_free (idle, EMPTY0);
828 array_free (prepare, EMPTY); 845 array_free (prepare, EMPTY0);
829 array_free (check, EMPTY); 846 array_free (check, EMPTY0);
830 847
831 method = 0; 848 method = 0;
832} 849}
833 850
834static void 851static void
835loop_fork (EV_P) 852loop_fork (EV_P)
836{ 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
837#if EV_USE_EPOLL 860#if EV_USE_EPOLL
838 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 861 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
839#endif
840#if EV_USE_KQUEUE
841 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
842#endif 862#endif
843 863
844 if (ev_is_active (&sigev)) 864 if (ev_is_active (&sigev))
845 { 865 {
846 /* default loop */ 866 /* default loop */
… …
890 910
891#endif 911#endif
892 912
893#if EV_MULTIPLICITY 913#if EV_MULTIPLICITY
894struct ev_loop * 914struct ev_loop *
915ev_default_loop_ (unsigned int flags)
895#else 916#else
896int 917int
897#endif
898ev_default_loop (unsigned int flags) 918ev_default_loop (unsigned int flags)
919#endif
899{ 920{
900 if (sigpipe [0] == sigpipe [1]) 921 if (sigpipe [0] == sigpipe [1])
901 if (pipe (sigpipe)) 922 if (pipe (sigpipe))
902 return 0; 923 return 0;
903 924
904 if (!default_loop) 925 if (!ev_default_loop_ptr)
905 { 926 {
906#if EV_MULTIPLICITY 927#if EV_MULTIPLICITY
907 struct ev_loop *loop = default_loop = &default_loop_struct; 928 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
908#else 929#else
909 default_loop = 1; 930 ev_default_loop_ptr = 1;
910#endif 931#endif
911 932
912 loop_init (EV_A_ flags); 933 loop_init (EV_A_ flags);
913 934
914 if (ev_method (EV_A)) 935 if (ev_method (EV_A))
… …
921 ev_signal_start (EV_A_ &childev); 942 ev_signal_start (EV_A_ &childev);
922 ev_unref (EV_A); /* child watcher should not keep loop alive */ 943 ev_unref (EV_A); /* child watcher should not keep loop alive */
923#endif 944#endif
924 } 945 }
925 else 946 else
926 default_loop = 0; 947 ev_default_loop_ptr = 0;
927 } 948 }
928 949
929 return default_loop; 950 return ev_default_loop_ptr;
930} 951}
931 952
932void 953void
933ev_default_destroy (void) 954ev_default_destroy (void)
934{ 955{
935#if EV_MULTIPLICITY 956#if EV_MULTIPLICITY
936 struct ev_loop *loop = default_loop; 957 struct ev_loop *loop = ev_default_loop_ptr;
937#endif 958#endif
938 959
939#ifndef _WIN32 960#ifndef _WIN32
940 ev_ref (EV_A); /* child watcher */ 961 ev_ref (EV_A); /* child watcher */
941 ev_signal_stop (EV_A_ &childev); 962 ev_signal_stop (EV_A_ &childev);
… …
952 973
953void 974void
954ev_default_fork (void) 975ev_default_fork (void)
955{ 976{
956#if EV_MULTIPLICITY 977#if EV_MULTIPLICITY
957 struct ev_loop *loop = default_loop; 978 struct ev_loop *loop = ev_default_loop_ptr;
958#endif 979#endif
959 980
960 if (method) 981 if (method)
961 postfork = 1; 982 postfork = 1;
962} 983}
… …
973 return 1; 994 return 1;
974 995
975 return 0; 996 return 0;
976} 997}
977 998
978static void 999inline void
979call_pending (EV_P) 1000call_pending (EV_P)
980{ 1001{
981 int pri; 1002 int pri;
982 1003
983 for (pri = NUMPRI; pri--; ) 1004 for (pri = NUMPRI; pri--; )
984 while (pendingcnt [pri]) 1005 while (pendingcnt [pri])
985 { 1006 {
986 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1007 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
987 1008
988 if (p->w) 1009 if (expect_true (p->w))
989 { 1010 {
990 p->w->pending = 0; 1011 p->w->pending = 0;
991 EV_CB_INVOKE (p->w, p->events); 1012 EV_CB_INVOKE (p->w, p->events);
992 } 1013 }
993 } 1014 }
994} 1015}
995 1016
996static void 1017inline void
997timers_reify (EV_P) 1018timers_reify (EV_P)
998{ 1019{
999 while (timercnt && ((WT)timers [0])->at <= mn_now) 1020 while (timercnt && ((WT)timers [0])->at <= mn_now)
1000 { 1021 {
1001 struct ev_timer *w = timers [0]; 1022 struct ev_timer *w = timers [0];
… …
1019 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1040 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1020 } 1041 }
1021} 1042}
1022 1043
1023#if EV_PERIODICS 1044#if EV_PERIODICS
1024static void 1045inline void
1025periodics_reify (EV_P) 1046periodics_reify (EV_P)
1026{ 1047{
1027 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1048 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1028 { 1049 {
1029 struct ev_periodic *w = periodics [0]; 1050 struct ev_periodic *w = periodics [0];
… …
1088 ev_rt_now = ev_time (); 1109 ev_rt_now = ev_time ();
1089 return 1; 1110 return 1;
1090 } 1111 }
1091} 1112}
1092 1113
1093static void 1114inline void
1094time_update (EV_P) 1115time_update (EV_P)
1095{ 1116{
1096 int i; 1117 int i;
1097 1118
1098#if EV_USE_MONOTONIC 1119#if EV_USE_MONOTONIC
… …
1159ev_loop (EV_P_ int flags) 1180ev_loop (EV_P_ int flags)
1160{ 1181{
1161 double block; 1182 double block;
1162 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1183 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1163 1184
1164 do 1185 while (activecnt)
1165 { 1186 {
1166 /* queue check watchers (and execute them) */ 1187 /* queue check watchers (and execute them) */
1167 if (expect_false (preparecnt)) 1188 if (expect_false (preparecnt))
1168 { 1189 {
1169 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1190 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
… …
1209 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;
1210 if (block > to) block = to; 1231 if (block > to) block = to;
1211 } 1232 }
1212#endif 1233#endif
1213 1234
1214 if (block < 0.) block = 0.; 1235 if (expect_false (block < 0.)) block = 0.;
1215 } 1236 }
1216 1237
1217 method_poll (EV_A_ block); 1238 method_poll (EV_A_ block);
1218 1239
1219 /* update ev_rt_now, do magic */ 1240 /* update ev_rt_now, do magic */
… …
1228 /* queue idle watchers unless io or timers are pending */ 1249 /* queue idle watchers unless io or timers are pending */
1229 if (idlecnt && !any_pending (EV_A)) 1250 if (idlecnt && !any_pending (EV_A))
1230 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1251 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1231 1252
1232 /* queue check watchers, to be executed first */ 1253 /* queue check watchers, to be executed first */
1233 if (checkcnt) 1254 if (expect_false (checkcnt))
1234 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1255 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1235 1256
1236 call_pending (EV_A); 1257 call_pending (EV_A);
1258
1259 if (expect_false (loop_done))
1260 break;
1237 } 1261 }
1238 while (activecnt && !loop_done);
1239 1262
1240 if (loop_done != 2) 1263 if (loop_done != 2)
1241 loop_done = 0; 1264 loop_done = 0;
1242} 1265}
1243 1266
… …
1303void 1326void
1304ev_io_start (EV_P_ struct ev_io *w) 1327ev_io_start (EV_P_ struct ev_io *w)
1305{ 1328{
1306 int fd = w->fd; 1329 int fd = w->fd;
1307 1330
1308 if (ev_is_active (w)) 1331 if (expect_false (ev_is_active (w)))
1309 return; 1332 return;
1310 1333
1311 assert (("ev_io_start called with negative fd", fd >= 0)); 1334 assert (("ev_io_start called with negative fd", fd >= 0));
1312 1335
1313 ev_start (EV_A_ (W)w, 1); 1336 ev_start (EV_A_ (W)w, 1);
… …
1319 1342
1320void 1343void
1321ev_io_stop (EV_P_ struct ev_io *w) 1344ev_io_stop (EV_P_ struct ev_io *w)
1322{ 1345{
1323 ev_clear_pending (EV_A_ (W)w); 1346 ev_clear_pending (EV_A_ (W)w);
1324 if (!ev_is_active (w)) 1347 if (expect_false (!ev_is_active (w)))
1325 return; 1348 return;
1326 1349
1327 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));
1328 1351
1329 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1352 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
… …
1333} 1356}
1334 1357
1335void 1358void
1336ev_timer_start (EV_P_ struct ev_timer *w) 1359ev_timer_start (EV_P_ struct ev_timer *w)
1337{ 1360{
1338 if (ev_is_active (w)) 1361 if (expect_false (ev_is_active (w)))
1339 return; 1362 return;
1340 1363
1341 ((WT)w)->at += mn_now; 1364 ((WT)w)->at += mn_now;
1342 1365
1343 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.));
1344 1367
1345 ev_start (EV_A_ (W)w, ++timercnt); 1368 ev_start (EV_A_ (W)w, ++timercnt);
1346 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1369 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1347 timers [timercnt - 1] = w; 1370 timers [timercnt - 1] = w;
1348 upheap ((WT *)timers, timercnt - 1); 1371 upheap ((WT *)timers, timercnt - 1);
1349 1372
1350 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1373 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1351} 1374}
1352 1375
1353void 1376void
1354ev_timer_stop (EV_P_ struct ev_timer *w) 1377ev_timer_stop (EV_P_ struct ev_timer *w)
1355{ 1378{
1356 ev_clear_pending (EV_A_ (W)w); 1379 ev_clear_pending (EV_A_ (W)w);
1357 if (!ev_is_active (w)) 1380 if (expect_false (!ev_is_active (w)))
1358 return; 1381 return;
1359 1382
1360 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1383 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1361 1384
1362 if (((W)w)->active < timercnt--) 1385 if (expect_true (((W)w)->active < timercnt--))
1363 { 1386 {
1364 timers [((W)w)->active - 1] = timers [timercnt]; 1387 timers [((W)w)->active - 1] = timers [timercnt];
1365 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1388 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1366 } 1389 }
1367 1390
… …
1392 1415
1393#if EV_PERIODICS 1416#if EV_PERIODICS
1394void 1417void
1395ev_periodic_start (EV_P_ struct ev_periodic *w) 1418ev_periodic_start (EV_P_ struct ev_periodic *w)
1396{ 1419{
1397 if (ev_is_active (w)) 1420 if (expect_false (ev_is_active (w)))
1398 return; 1421 return;
1399 1422
1400 if (w->reschedule_cb) 1423 if (w->reschedule_cb)
1401 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1424 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1402 else if (w->interval) 1425 else if (w->interval)
… …
1405 /* this formula differs from the one in periodic_reify because we do not always round up */ 1428 /* this formula differs from the one in periodic_reify because we do not always round up */
1406 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1429 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1407 } 1430 }
1408 1431
1409 ev_start (EV_A_ (W)w, ++periodiccnt); 1432 ev_start (EV_A_ (W)w, ++periodiccnt);
1410 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1433 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1411 periodics [periodiccnt - 1] = w; 1434 periodics [periodiccnt - 1] = w;
1412 upheap ((WT *)periodics, periodiccnt - 1); 1435 upheap ((WT *)periodics, periodiccnt - 1);
1413 1436
1414 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1437 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1415} 1438}
1416 1439
1417void 1440void
1418ev_periodic_stop (EV_P_ struct ev_periodic *w) 1441ev_periodic_stop (EV_P_ struct ev_periodic *w)
1419{ 1442{
1420 ev_clear_pending (EV_A_ (W)w); 1443 ev_clear_pending (EV_A_ (W)w);
1421 if (!ev_is_active (w)) 1444 if (expect_false (!ev_is_active (w)))
1422 return; 1445 return;
1423 1446
1424 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1447 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1425 1448
1426 if (((W)w)->active < periodiccnt--) 1449 if (expect_true (((W)w)->active < periodiccnt--))
1427 { 1450 {
1428 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1451 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1429 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1452 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1430 } 1453 }
1431 1454
… …
1442#endif 1465#endif
1443 1466
1444void 1467void
1445ev_idle_start (EV_P_ struct ev_idle *w) 1468ev_idle_start (EV_P_ struct ev_idle *w)
1446{ 1469{
1447 if (ev_is_active (w)) 1470 if (expect_false (ev_is_active (w)))
1448 return; 1471 return;
1449 1472
1450 ev_start (EV_A_ (W)w, ++idlecnt); 1473 ev_start (EV_A_ (W)w, ++idlecnt);
1451 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1474 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1452 idles [idlecnt - 1] = w; 1475 idles [idlecnt - 1] = w;
1453} 1476}
1454 1477
1455void 1478void
1456ev_idle_stop (EV_P_ struct ev_idle *w) 1479ev_idle_stop (EV_P_ struct ev_idle *w)
1457{ 1480{
1458 ev_clear_pending (EV_A_ (W)w); 1481 ev_clear_pending (EV_A_ (W)w);
1459 if (!ev_is_active (w)) 1482 if (expect_false (!ev_is_active (w)))
1460 return; 1483 return;
1461 1484
1462 idles [((W)w)->active - 1] = idles [--idlecnt]; 1485 idles [((W)w)->active - 1] = idles [--idlecnt];
1463 ev_stop (EV_A_ (W)w); 1486 ev_stop (EV_A_ (W)w);
1464} 1487}
1465 1488
1466void 1489void
1467ev_prepare_start (EV_P_ struct ev_prepare *w) 1490ev_prepare_start (EV_P_ struct ev_prepare *w)
1468{ 1491{
1469 if (ev_is_active (w)) 1492 if (expect_false (ev_is_active (w)))
1470 return; 1493 return;
1471 1494
1472 ev_start (EV_A_ (W)w, ++preparecnt); 1495 ev_start (EV_A_ (W)w, ++preparecnt);
1473 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1496 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1474 prepares [preparecnt - 1] = w; 1497 prepares [preparecnt - 1] = w;
1475} 1498}
1476 1499
1477void 1500void
1478ev_prepare_stop (EV_P_ struct ev_prepare *w) 1501ev_prepare_stop (EV_P_ struct ev_prepare *w)
1479{ 1502{
1480 ev_clear_pending (EV_A_ (W)w); 1503 ev_clear_pending (EV_A_ (W)w);
1481 if (!ev_is_active (w)) 1504 if (expect_false (!ev_is_active (w)))
1482 return; 1505 return;
1483 1506
1484 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1507 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1485 ev_stop (EV_A_ (W)w); 1508 ev_stop (EV_A_ (W)w);
1486} 1509}
1487 1510
1488void 1511void
1489ev_check_start (EV_P_ struct ev_check *w) 1512ev_check_start (EV_P_ struct ev_check *w)
1490{ 1513{
1491 if (ev_is_active (w)) 1514 if (expect_false (ev_is_active (w)))
1492 return; 1515 return;
1493 1516
1494 ev_start (EV_A_ (W)w, ++checkcnt); 1517 ev_start (EV_A_ (W)w, ++checkcnt);
1495 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1518 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1496 checks [checkcnt - 1] = w; 1519 checks [checkcnt - 1] = w;
1497} 1520}
1498 1521
1499void 1522void
1500ev_check_stop (EV_P_ struct ev_check *w) 1523ev_check_stop (EV_P_ struct ev_check *w)
1501{ 1524{
1502 ev_clear_pending (EV_A_ (W)w); 1525 ev_clear_pending (EV_A_ (W)w);
1503 if (!ev_is_active (w)) 1526 if (expect_false (!ev_is_active (w)))
1504 return; 1527 return;
1505 1528
1506 checks [((W)w)->active - 1] = checks [--checkcnt]; 1529 checks [((W)w)->active - 1] = checks [--checkcnt];
1507 ev_stop (EV_A_ (W)w); 1530 ev_stop (EV_A_ (W)w);
1508} 1531}
… …
1513 1536
1514void 1537void
1515ev_signal_start (EV_P_ struct ev_signal *w) 1538ev_signal_start (EV_P_ struct ev_signal *w)
1516{ 1539{
1517#if EV_MULTIPLICITY 1540#if EV_MULTIPLICITY
1518 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));
1519#endif 1542#endif
1520 if (ev_is_active (w)) 1543 if (expect_false (ev_is_active (w)))
1521 return; 1544 return;
1522 1545
1523 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));
1524 1547
1525 ev_start (EV_A_ (W)w, 1); 1548 ev_start (EV_A_ (W)w, 1);
… …
1542 1565
1543void 1566void
1544ev_signal_stop (EV_P_ struct ev_signal *w) 1567ev_signal_stop (EV_P_ struct ev_signal *w)
1545{ 1568{
1546 ev_clear_pending (EV_A_ (W)w); 1569 ev_clear_pending (EV_A_ (W)w);
1547 if (!ev_is_active (w)) 1570 if (expect_false (!ev_is_active (w)))
1548 return; 1571 return;
1549 1572
1550 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1573 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1551 ev_stop (EV_A_ (W)w); 1574 ev_stop (EV_A_ (W)w);
1552 1575
… …
1556 1579
1557void 1580void
1558ev_child_start (EV_P_ struct ev_child *w) 1581ev_child_start (EV_P_ struct ev_child *w)
1559{ 1582{
1560#if EV_MULTIPLICITY 1583#if EV_MULTIPLICITY
1561 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));
1562#endif 1585#endif
1563 if (ev_is_active (w)) 1586 if (expect_false (ev_is_active (w)))
1564 return; 1587 return;
1565 1588
1566 ev_start (EV_A_ (W)w, 1); 1589 ev_start (EV_A_ (W)w, 1);
1567 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1590 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1568} 1591}
1569 1592
1570void 1593void
1571ev_child_stop (EV_P_ struct ev_child *w) 1594ev_child_stop (EV_P_ struct ev_child *w)
1572{ 1595{
1573 ev_clear_pending (EV_A_ (W)w); 1596 ev_clear_pending (EV_A_ (W)w);
1574 if (!ev_is_active (w)) 1597 if (expect_false (!ev_is_active (w)))
1575 return; 1598 return;
1576 1599
1577 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1600 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1578 ev_stop (EV_A_ (W)w); 1601 ev_stop (EV_A_ (W)w);
1579} 1602}
… …
1616void 1639void
1617ev_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)
1618{ 1641{
1619 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));
1620 1643
1621 if (!once) 1644 if (expect_false (!once))
1645 {
1622 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1646 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1623 else 1647 return;
1624 { 1648 }
1649
1625 once->cb = cb; 1650 once->cb = cb;
1626 once->arg = arg; 1651 once->arg = arg;
1627 1652
1628 ev_init (&once->io, once_cb_io); 1653 ev_init (&once->io, once_cb_io);
1629 if (fd >= 0) 1654 if (fd >= 0)
1630 { 1655 {
1631 ev_io_set (&once->io, fd, events); 1656 ev_io_set (&once->io, fd, events);
1632 ev_io_start (EV_A_ &once->io); 1657 ev_io_start (EV_A_ &once->io);
1633 } 1658 }
1634 1659
1635 ev_init (&once->to, once_cb_to); 1660 ev_init (&once->to, once_cb_to);
1636 if (timeout >= 0.) 1661 if (timeout >= 0.)
1637 { 1662 {
1638 ev_timer_set (&once->to, timeout, 0.); 1663 ev_timer_set (&once->to, timeout, 0.);
1639 ev_timer_start (EV_A_ &once->to); 1664 ev_timer_start (EV_A_ &once->to);
1640 }
1641 } 1665 }
1642} 1666}
1643 1667
1644#ifdef __cplusplus 1668#ifdef __cplusplus
1645} 1669}

Diff Legend

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