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.133 by root, Fri Nov 23 11:32:22 2007 UTC

… …
32#ifdef __cplusplus 32#ifdef __cplusplus
33extern "C" { 33extern "C" {
34#endif 34#endif
35 35
36#ifndef EV_STANDALONE 36#ifndef EV_STANDALONE
37# ifdef EV_CONFIG_H
38# include EV_CONFIG_H
39# else
37# include "config.h" 40# include "config.h"
41# endif
38 42
39# if HAVE_CLOCK_GETTIME 43# if HAVE_CLOCK_GETTIME
40# ifndef EV_USE_MONOTONIC 44# ifndef EV_USE_MONOTONIC
41# define EV_USE_MONOTONIC 1 45# define EV_USE_MONOTONIC 1
42# endif 46# endif
43# ifndef EV_USE_REALTIME 47# ifndef EV_USE_REALTIME
44# define EV_USE_REALTIME 1 48# define EV_USE_REALTIME 1
45# endif 49# endif
50# else
51# ifndef EV_USE_MONOTONIC
52# define EV_USE_MONOTONIC 0
53# endif
54# ifndef EV_USE_REALTIME
55# define EV_USE_REALTIME 0
56# endif
46# endif 57# endif
47 58
48# if HAVE_SELECT && HAVE_SYS_SELECT_H && !defined (EV_USE_SELECT) 59# ifndef EV_USE_SELECT
60# if HAVE_SELECT && HAVE_SYS_SELECT_H
49# define EV_USE_SELECT 1 61# define EV_USE_SELECT 1
62# else
63# define EV_USE_SELECT 0
64# endif
50# endif 65# endif
51 66
52# if HAVE_POLL && HAVE_POLL_H && !defined (EV_USE_POLL) 67# ifndef EV_USE_POLL
68# if HAVE_POLL && HAVE_POLL_H
53# define EV_USE_POLL 1 69# define EV_USE_POLL 1
70# else
71# define EV_USE_POLL 0
72# endif
54# endif 73# endif
55 74
56# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H && !defined (EV_USE_EPOLL) 75# ifndef EV_USE_EPOLL
76# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
57# define EV_USE_EPOLL 1 77# define EV_USE_EPOLL 1
78# else
79# define EV_USE_EPOLL 0
80# endif
58# endif 81# endif
59 82
83# ifndef EV_USE_KQUEUE
60# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE) 84# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
61# define EV_USE_KQUEUE 1 85# define EV_USE_KQUEUE 1
86# else
87# define EV_USE_KQUEUE 0
88# endif
62# endif 89# endif
63 90
64# if HAVE_PORT_H && HAVE_PORT_CREATE && !defined (EV_USE_PORT) 91# ifndef EV_USE_PORT
92# if HAVE_PORT_H && HAVE_PORT_CREATE
65# define EV_USE_PORT 1 93# define EV_USE_PORT 1
94# else
95# define EV_USE_PORT 0
96# endif
66# endif 97# endif
67 98
68#endif 99#endif
69 100
70#include <math.h> 101#include <math.h>
… …
127# define EV_USE_PORT 0 158# define EV_USE_PORT 0
128#endif 159#endif
129 160
130/**/ 161/**/
131 162
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 163#ifndef CLOCK_MONOTONIC
139# undef EV_USE_MONOTONIC 164# undef EV_USE_MONOTONIC
140# define EV_USE_MONOTONIC 0 165# define EV_USE_MONOTONIC 0
141#endif 166#endif
142 167
… …
162# include "ev.h" 187# include "ev.h"
163#endif 188#endif
164 189
165#if __GNUC__ >= 3 190#if __GNUC__ >= 3
166# define expect(expr,value) __builtin_expect ((expr),(value)) 191# define expect(expr,value) __builtin_expect ((expr),(value))
167# define inline inline 192# define inline static inline
168#else 193#else
169# define expect(expr,value) (expr) 194# define expect(expr,value) (expr)
170# define inline static 195# define inline static
171#endif 196#endif
172 197
… …
366void 391void
367ev_feed_event (EV_P_ void *w, int revents) 392ev_feed_event (EV_P_ void *w, int revents)
368{ 393{
369 W w_ = (W)w; 394 W w_ = (W)w;
370 395
371 if (w_->pending) 396 if (expect_false (w_->pending))
372 { 397 {
373 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 398 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
374 return; 399 return;
375 } 400 }
376 401
… …
410 fd_event (EV_A_ fd, revents); 435 fd_event (EV_A_ fd, revents);
411} 436}
412 437
413/*****************************************************************************/ 438/*****************************************************************************/
414 439
415static void 440inline void
416fd_reify (EV_P) 441fd_reify (EV_P)
417{ 442{
418 int i; 443 int i;
419 444
420 for (i = 0; i < fdchangecnt; ++i) 445 for (i = 0; i < fdchangecnt; ++i)
… …
437 } 462 }
438#endif 463#endif
439 464
440 anfd->reify = 0; 465 anfd->reify = 0;
441 466
442 method_modify (EV_A_ fd, anfd->events, events); 467 backend_modify (EV_A_ fd, anfd->events, events);
443 anfd->events = events; 468 anfd->events = events;
444 } 469 }
445 470
446 fdchangecnt = 0; 471 fdchangecnt = 0;
447} 472}
448 473
449static void 474static void
450fd_change (EV_P_ int fd) 475fd_change (EV_P_ int fd)
451{ 476{
452 if (anfds [fd].reify) 477 if (expect_false (anfds [fd].reify))
453 return; 478 return;
454 479
455 anfds [fd].reify = 1; 480 anfds [fd].reify = 1;
456 481
457 ++fdchangecnt; 482 ++fdchangecnt;
… …
469 ev_io_stop (EV_A_ w); 494 ev_io_stop (EV_A_ w);
470 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 495 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
471 } 496 }
472} 497}
473 498
474static int 499inline int
475fd_valid (int fd) 500fd_valid (int fd)
476{ 501{
477#ifdef _WIN32 502#ifdef _WIN32
478 return _get_osfhandle (fd) != -1; 503 return _get_osfhandle (fd) != -1;
479#else 504#else
… …
505 fd_kill (EV_A_ fd); 530 fd_kill (EV_A_ fd);
506 return; 531 return;
507 } 532 }
508} 533}
509 534
510/* usually called after fork if method needs to re-arm all fds from scratch */ 535/* usually called after fork if backend needs to re-arm all fds from scratch */
511static void 536static void
512fd_rearm_all (EV_P) 537fd_rearm_all (EV_P)
513{ 538{
514 int fd; 539 int fd;
515 540
… …
648 for (signum = signalmax; signum--; ) 673 for (signum = signalmax; signum--; )
649 if (signals [signum].gotsig) 674 if (signals [signum].gotsig)
650 ev_feed_signal_event (EV_A_ signum + 1); 675 ev_feed_signal_event (EV_A_ signum + 1);
651} 676}
652 677
653inline void 678static void
654fd_intern (int fd) 679fd_intern (int fd)
655{ 680{
656#ifdef _WIN32 681#ifdef _WIN32
657 int arg = 1; 682 int arg = 1;
658 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 683 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
706 int pid, status; 731 int pid, status;
707 732
708 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 733 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
709 { 734 {
710 /* make sure we are called again until all childs have been reaped */ 735 /* make sure we are called again until all childs have been reaped */
736 /* we need to do it this way so that the callback gets called before we continue */
711 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 737 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
712 738
713 child_reap (EV_A_ sw, pid, pid, status); 739 child_reap (EV_A_ sw, pid, pid, status);
714 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */ 740 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
715 } 741 }
716} 742}
717 743
718#endif 744#endif
719 745
… …
758 || getgid () != getegid (); 784 || getgid () != getegid ();
759#endif 785#endif
760} 786}
761 787
762unsigned int 788unsigned int
763ev_method (EV_P) 789ev_supported_backends (void)
764{ 790{
765 return method; 791 unsigned int flags = 0;
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_recommended_backends (void)
804{
805 unsigned int flags = ev_supported_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;
818}
819
820unsigned int
821ev_backend (EV_P)
822{
823 return backend;
766} 824}
767 825
768static void 826static void
769loop_init (EV_P_ unsigned int flags) 827loop_init (EV_P_ unsigned int flags)
770{ 828{
771 if (!method) 829 if (!backend)
772 { 830 {
773#if EV_USE_MONOTONIC 831#if EV_USE_MONOTONIC
774 { 832 {
775 struct timespec ts; 833 struct timespec ts;
776 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 834 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
… …
781 ev_rt_now = ev_time (); 839 ev_rt_now = ev_time ();
782 mn_now = get_clock (); 840 mn_now = get_clock ();
783 now_floor = mn_now; 841 now_floor = mn_now;
784 rtmn_diff = ev_rt_now - mn_now; 842 rtmn_diff = ev_rt_now - mn_now;
785 843
786 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS")) 844 if (!(flags & EVFLAG_NOENV)
845 && !enable_secure ()
846 && getenv ("LIBEV_FLAGS"))
787 flags = atoi (getenv ("LIBEV_FLAGS")); 847 flags = atoi (getenv ("LIBEV_FLAGS"));
788 848
789 if (!(flags & 0x0000ffff)) 849 if (!(flags & 0x0000ffffUL))
790 flags |= 0x0000ffff; 850 flags |= ev_recommended_backends ();
791 851
792 method = 0; 852 backend = 0;
793#if EV_USE_PORT 853#if EV_USE_PORT
794 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags); 854 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
795#endif 855#endif
796#if EV_USE_KQUEUE 856#if EV_USE_KQUEUE
797 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags); 857 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
798#endif 858#endif
799#if EV_USE_EPOLL 859#if EV_USE_EPOLL
800 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags); 860 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
801#endif 861#endif
802#if EV_USE_POLL 862#if EV_USE_POLL
803 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags); 863 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
804#endif 864#endif
805#if EV_USE_SELECT 865#if EV_USE_SELECT
806 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags); 866 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
807#endif 867#endif
808 868
809 ev_init (&sigev, sigcb); 869 ev_init (&sigev, sigcb);
810 ev_set_priority (&sigev, EV_MAXPRI); 870 ev_set_priority (&sigev, EV_MAXPRI);
811 } 871 }
812} 872}
813 873
814void 874static void
815loop_destroy (EV_P) 875loop_destroy (EV_P)
816{ 876{
817 int i; 877 int i;
818 878
819#if EV_USE_PORT 879#if EV_USE_PORT
820 if (method == EVMETHOD_PORT ) port_destroy (EV_A); 880 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
821#endif 881#endif
822#if EV_USE_KQUEUE 882#if EV_USE_KQUEUE
823 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 883 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
824#endif 884#endif
825#if EV_USE_EPOLL 885#if EV_USE_EPOLL
826 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 886 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
827#endif 887#endif
828#if EV_USE_POLL 888#if EV_USE_POLL
829 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 889 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
830#endif 890#endif
831#if EV_USE_SELECT 891#if EV_USE_SELECT
832 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 892 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
833#endif 893#endif
834 894
835 for (i = NUMPRI; i--; ) 895 for (i = NUMPRI; i--; )
836 array_free (pending, [i]); 896 array_free (pending, [i]);
837 897
… …
843#endif 903#endif
844 array_free (idle, EMPTY0); 904 array_free (idle, EMPTY0);
845 array_free (prepare, EMPTY0); 905 array_free (prepare, EMPTY0);
846 array_free (check, EMPTY0); 906 array_free (check, EMPTY0);
847 907
848 method = 0; 908 backend = 0;
849} 909}
850 910
851static void 911static void
852loop_fork (EV_P) 912loop_fork (EV_P)
853{ 913{
854#if EV_USE_PORT 914#if EV_USE_PORT
855 if (method == EVMETHOD_PORT ) port_fork (EV_A); 915 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
856#endif 916#endif
857#if EV_USE_KQUEUE 917#if EV_USE_KQUEUE
858 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 918 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
859#endif 919#endif
860#if EV_USE_EPOLL 920#if EV_USE_EPOLL
861 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 921 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
862#endif 922#endif
863 923
864 if (ev_is_active (&sigev)) 924 if (ev_is_active (&sigev))
865 { 925 {
866 /* default loop */ 926 /* default loop */
… …
887 947
888 memset (loop, 0, sizeof (struct ev_loop)); 948 memset (loop, 0, sizeof (struct ev_loop));
889 949
890 loop_init (EV_A_ flags); 950 loop_init (EV_A_ flags);
891 951
892 if (ev_method (EV_A)) 952 if (ev_backend (EV_A))
893 return loop; 953 return loop;
894 954
895 return 0; 955 return 0;
896} 956}
897 957
… …
910 970
911#endif 971#endif
912 972
913#if EV_MULTIPLICITY 973#if EV_MULTIPLICITY
914struct ev_loop * 974struct ev_loop *
915ev_default_loop_ (unsigned int flags) 975ev_default_loop_init (unsigned int flags)
916#else 976#else
917int 977int
918ev_default_loop (unsigned int flags) 978ev_default_loop (unsigned int flags)
919#endif 979#endif
920{ 980{
… …
930 ev_default_loop_ptr = 1; 990 ev_default_loop_ptr = 1;
931#endif 991#endif
932 992
933 loop_init (EV_A_ flags); 993 loop_init (EV_A_ flags);
934 994
935 if (ev_method (EV_A)) 995 if (ev_backend (EV_A))
936 { 996 {
937 siginit (EV_A); 997 siginit (EV_A);
938 998
939#ifndef _WIN32 999#ifndef _WIN32
940 ev_signal_init (&childev, childcb, SIGCHLD); 1000 ev_signal_init (&childev, childcb, SIGCHLD);
… …
976{ 1036{
977#if EV_MULTIPLICITY 1037#if EV_MULTIPLICITY
978 struct ev_loop *loop = ev_default_loop_ptr; 1038 struct ev_loop *loop = ev_default_loop_ptr;
979#endif 1039#endif
980 1040
981 if (method) 1041 if (backend)
982 postfork = 1; 1042 postfork = 1;
983} 1043}
984 1044
985/*****************************************************************************/ 1045/*****************************************************************************/
986 1046
… …
994 return 1; 1054 return 1;
995 1055
996 return 0; 1056 return 0;
997} 1057}
998 1058
999static void 1059inline void
1000call_pending (EV_P) 1060call_pending (EV_P)
1001{ 1061{
1002 int pri; 1062 int pri;
1003 1063
1004 for (pri = NUMPRI; pri--; ) 1064 for (pri = NUMPRI; pri--; )
1005 while (pendingcnt [pri]) 1065 while (pendingcnt [pri])
1006 { 1066 {
1007 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1067 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1008 1068
1009 if (p->w) 1069 if (expect_true (p->w))
1010 { 1070 {
1011 p->w->pending = 0; 1071 p->w->pending = 0;
1012 EV_CB_INVOKE (p->w, p->events); 1072 EV_CB_INVOKE (p->w, p->events);
1013 } 1073 }
1014 } 1074 }
1015} 1075}
1016 1076
1017static void 1077inline void
1018timers_reify (EV_P) 1078timers_reify (EV_P)
1019{ 1079{
1020 while (timercnt && ((WT)timers [0])->at <= mn_now) 1080 while (timercnt && ((WT)timers [0])->at <= mn_now)
1021 { 1081 {
1022 struct ev_timer *w = timers [0]; 1082 struct ev_timer *w = timers [0];
… …
1040 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1100 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1041 } 1101 }
1042} 1102}
1043 1103
1044#if EV_PERIODICS 1104#if EV_PERIODICS
1045static void 1105inline void
1046periodics_reify (EV_P) 1106periodics_reify (EV_P)
1047{ 1107{
1048 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1108 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1049 { 1109 {
1050 struct ev_periodic *w = periodics [0]; 1110 struct ev_periodic *w = periodics [0];
… …
1109 ev_rt_now = ev_time (); 1169 ev_rt_now = ev_time ();
1110 return 1; 1170 return 1;
1111 } 1171 }
1112} 1172}
1113 1173
1114static void 1174inline void
1115time_update (EV_P) 1175time_update (EV_P)
1116{ 1176{
1117 int i; 1177 int i;
1118 1178
1119#if EV_USE_MONOTONIC 1179#if EV_USE_MONOTONIC
… …
1218 { 1278 {
1219 block = MAX_BLOCKTIME; 1279 block = MAX_BLOCKTIME;
1220 1280
1221 if (timercnt) 1281 if (timercnt)
1222 { 1282 {
1223 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1283 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1224 if (block > to) block = to; 1284 if (block > to) block = to;
1225 } 1285 }
1226 1286
1227#if EV_PERIODICS 1287#if EV_PERIODICS
1228 if (periodiccnt) 1288 if (periodiccnt)
1229 { 1289 {
1230 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1290 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1231 if (block > to) block = to; 1291 if (block > to) block = to;
1232 } 1292 }
1233#endif 1293#endif
1234 1294
1235 if (block < 0.) block = 0.; 1295 if (expect_false (block < 0.)) block = 0.;
1236 } 1296 }
1237 1297
1238 method_poll (EV_A_ block); 1298 backend_poll (EV_A_ block);
1239 1299
1240 /* update ev_rt_now, do magic */ 1300 /* update ev_rt_now, do magic */
1241 time_update (EV_A); 1301 time_update (EV_A);
1242 1302
1243 /* queue pending timers and reschedule them */ 1303 /* queue pending timers and reschedule them */
… …
1249 /* queue idle watchers unless io or timers are pending */ 1309 /* queue idle watchers unless io or timers are pending */
1250 if (idlecnt && !any_pending (EV_A)) 1310 if (idlecnt && !any_pending (EV_A))
1251 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1311 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1252 1312
1253 /* queue check watchers, to be executed first */ 1313 /* queue check watchers, to be executed first */
1254 if (checkcnt) 1314 if (expect_false (checkcnt))
1255 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1315 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1256 1316
1257 call_pending (EV_A); 1317 call_pending (EV_A);
1258 1318
1259 if (loop_done) 1319 if (expect_false (loop_done))
1260 break; 1320 break;
1261 } 1321 }
1262 1322
1263 if (loop_done != 2) 1323 if (loop_done != 2)
1264 loop_done = 0; 1324 loop_done = 0;
… …
1326void 1386void
1327ev_io_start (EV_P_ struct ev_io *w) 1387ev_io_start (EV_P_ struct ev_io *w)
1328{ 1388{
1329 int fd = w->fd; 1389 int fd = w->fd;
1330 1390
1331 if (ev_is_active (w)) 1391 if (expect_false (ev_is_active (w)))
1332 return; 1392 return;
1333 1393
1334 assert (("ev_io_start called with negative fd", fd >= 0)); 1394 assert (("ev_io_start called with negative fd", fd >= 0));
1335 1395
1336 ev_start (EV_A_ (W)w, 1); 1396 ev_start (EV_A_ (W)w, 1);
… …
1342 1402
1343void 1403void
1344ev_io_stop (EV_P_ struct ev_io *w) 1404ev_io_stop (EV_P_ struct ev_io *w)
1345{ 1405{
1346 ev_clear_pending (EV_A_ (W)w); 1406 ev_clear_pending (EV_A_ (W)w);
1347 if (!ev_is_active (w)) 1407 if (expect_false (!ev_is_active (w)))
1348 return; 1408 return;
1349 1409
1350 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1410 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1351 1411
1352 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1412 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
… …
1356} 1416}
1357 1417
1358void 1418void
1359ev_timer_start (EV_P_ struct ev_timer *w) 1419ev_timer_start (EV_P_ struct ev_timer *w)
1360{ 1420{
1361 if (ev_is_active (w)) 1421 if (expect_false (ev_is_active (w)))
1362 return; 1422 return;
1363 1423
1364 ((WT)w)->at += mn_now; 1424 ((WT)w)->at += mn_now;
1365 1425
1366 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1426 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
… …
1375 1435
1376void 1436void
1377ev_timer_stop (EV_P_ struct ev_timer *w) 1437ev_timer_stop (EV_P_ struct ev_timer *w)
1378{ 1438{
1379 ev_clear_pending (EV_A_ (W)w); 1439 ev_clear_pending (EV_A_ (W)w);
1380 if (!ev_is_active (w)) 1440 if (expect_false (!ev_is_active (w)))
1381 return; 1441 return;
1382 1442
1383 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1443 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1384 1444
1385 if (((W)w)->active < timercnt--) 1445 if (expect_true (((W)w)->active < timercnt--))
1386 { 1446 {
1387 timers [((W)w)->active - 1] = timers [timercnt]; 1447 timers [((W)w)->active - 1] = timers [timercnt];
1388 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1448 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1389 } 1449 }
1390 1450
… …
1415 1475
1416#if EV_PERIODICS 1476#if EV_PERIODICS
1417void 1477void
1418ev_periodic_start (EV_P_ struct ev_periodic *w) 1478ev_periodic_start (EV_P_ struct ev_periodic *w)
1419{ 1479{
1420 if (ev_is_active (w)) 1480 if (expect_false (ev_is_active (w)))
1421 return; 1481 return;
1422 1482
1423 if (w->reschedule_cb) 1483 if (w->reschedule_cb)
1424 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1484 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1425 else if (w->interval) 1485 else if (w->interval)
… …
1439 1499
1440void 1500void
1441ev_periodic_stop (EV_P_ struct ev_periodic *w) 1501ev_periodic_stop (EV_P_ struct ev_periodic *w)
1442{ 1502{
1443 ev_clear_pending (EV_A_ (W)w); 1503 ev_clear_pending (EV_A_ (W)w);
1444 if (!ev_is_active (w)) 1504 if (expect_false (!ev_is_active (w)))
1445 return; 1505 return;
1446 1506
1447 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1507 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1448 1508
1449 if (((W)w)->active < periodiccnt--) 1509 if (expect_true (((W)w)->active < periodiccnt--))
1450 { 1510 {
1451 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1511 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1452 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1512 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1453 } 1513 }
1454 1514
… …
1465#endif 1525#endif
1466 1526
1467void 1527void
1468ev_idle_start (EV_P_ struct ev_idle *w) 1528ev_idle_start (EV_P_ struct ev_idle *w)
1469{ 1529{
1470 if (ev_is_active (w)) 1530 if (expect_false (ev_is_active (w)))
1471 return; 1531 return;
1472 1532
1473 ev_start (EV_A_ (W)w, ++idlecnt); 1533 ev_start (EV_A_ (W)w, ++idlecnt);
1474 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2); 1534 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1475 idles [idlecnt - 1] = w; 1535 idles [idlecnt - 1] = w;
… …
1477 1537
1478void 1538void
1479ev_idle_stop (EV_P_ struct ev_idle *w) 1539ev_idle_stop (EV_P_ struct ev_idle *w)
1480{ 1540{
1481 ev_clear_pending (EV_A_ (W)w); 1541 ev_clear_pending (EV_A_ (W)w);
1482 if (!ev_is_active (w)) 1542 if (expect_false (!ev_is_active (w)))
1483 return; 1543 return;
1484 1544
1485 idles [((W)w)->active - 1] = idles [--idlecnt]; 1545 idles [((W)w)->active - 1] = idles [--idlecnt];
1486 ev_stop (EV_A_ (W)w); 1546 ev_stop (EV_A_ (W)w);
1487} 1547}
1488 1548
1489void 1549void
1490ev_prepare_start (EV_P_ struct ev_prepare *w) 1550ev_prepare_start (EV_P_ struct ev_prepare *w)
1491{ 1551{
1492 if (ev_is_active (w)) 1552 if (expect_false (ev_is_active (w)))
1493 return; 1553 return;
1494 1554
1495 ev_start (EV_A_ (W)w, ++preparecnt); 1555 ev_start (EV_A_ (W)w, ++preparecnt);
1496 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 1556 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1497 prepares [preparecnt - 1] = w; 1557 prepares [preparecnt - 1] = w;
… …
1499 1559
1500void 1560void
1501ev_prepare_stop (EV_P_ struct ev_prepare *w) 1561ev_prepare_stop (EV_P_ struct ev_prepare *w)
1502{ 1562{
1503 ev_clear_pending (EV_A_ (W)w); 1563 ev_clear_pending (EV_A_ (W)w);
1504 if (!ev_is_active (w)) 1564 if (expect_false (!ev_is_active (w)))
1505 return; 1565 return;
1506 1566
1507 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1567 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1508 ev_stop (EV_A_ (W)w); 1568 ev_stop (EV_A_ (W)w);
1509} 1569}
1510 1570
1511void 1571void
1512ev_check_start (EV_P_ struct ev_check *w) 1572ev_check_start (EV_P_ struct ev_check *w)
1513{ 1573{
1514 if (ev_is_active (w)) 1574 if (expect_false (ev_is_active (w)))
1515 return; 1575 return;
1516 1576
1517 ev_start (EV_A_ (W)w, ++checkcnt); 1577 ev_start (EV_A_ (W)w, ++checkcnt);
1518 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2); 1578 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1519 checks [checkcnt - 1] = w; 1579 checks [checkcnt - 1] = w;
… …
1521 1581
1522void 1582void
1523ev_check_stop (EV_P_ struct ev_check *w) 1583ev_check_stop (EV_P_ struct ev_check *w)
1524{ 1584{
1525 ev_clear_pending (EV_A_ (W)w); 1585 ev_clear_pending (EV_A_ (W)w);
1526 if (!ev_is_active (w)) 1586 if (expect_false (!ev_is_active (w)))
1527 return; 1587 return;
1528 1588
1529 checks [((W)w)->active - 1] = checks [--checkcnt]; 1589 checks [((W)w)->active - 1] = checks [--checkcnt];
1530 ev_stop (EV_A_ (W)w); 1590 ev_stop (EV_A_ (W)w);
1531} 1591}
… …
1538ev_signal_start (EV_P_ struct ev_signal *w) 1598ev_signal_start (EV_P_ struct ev_signal *w)
1539{ 1599{
1540#if EV_MULTIPLICITY 1600#if EV_MULTIPLICITY
1541 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1601 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1542#endif 1602#endif
1543 if (ev_is_active (w)) 1603 if (expect_false (ev_is_active (w)))
1544 return; 1604 return;
1545 1605
1546 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1606 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1547 1607
1548 ev_start (EV_A_ (W)w, 1); 1608 ev_start (EV_A_ (W)w, 1);
… …
1565 1625
1566void 1626void
1567ev_signal_stop (EV_P_ struct ev_signal *w) 1627ev_signal_stop (EV_P_ struct ev_signal *w)
1568{ 1628{
1569 ev_clear_pending (EV_A_ (W)w); 1629 ev_clear_pending (EV_A_ (W)w);
1570 if (!ev_is_active (w)) 1630 if (expect_false (!ev_is_active (w)))
1571 return; 1631 return;
1572 1632
1573 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1633 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1574 ev_stop (EV_A_ (W)w); 1634 ev_stop (EV_A_ (W)w);
1575 1635
… …
1581ev_child_start (EV_P_ struct ev_child *w) 1641ev_child_start (EV_P_ struct ev_child *w)
1582{ 1642{
1583#if EV_MULTIPLICITY 1643#if EV_MULTIPLICITY
1584 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1644 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1585#endif 1645#endif
1586 if (ev_is_active (w)) 1646 if (expect_false (ev_is_active (w)))
1587 return; 1647 return;
1588 1648
1589 ev_start (EV_A_ (W)w, 1); 1649 ev_start (EV_A_ (W)w, 1);
1590 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1650 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1591} 1651}
1592 1652
1593void 1653void
1594ev_child_stop (EV_P_ struct ev_child *w) 1654ev_child_stop (EV_P_ struct ev_child *w)
1595{ 1655{
1596 ev_clear_pending (EV_A_ (W)w); 1656 ev_clear_pending (EV_A_ (W)w);
1597 if (!ev_is_active (w)) 1657 if (expect_false (!ev_is_active (w)))
1598 return; 1658 return;
1599 1659
1600 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1660 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1601 ev_stop (EV_A_ (W)w); 1661 ev_stop (EV_A_ (W)w);
1602} 1662}
… …
1639void 1699void
1640ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1700ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1641{ 1701{
1642 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 1702 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1643 1703
1644 if (!once) 1704 if (expect_false (!once))
1705 {
1645 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1706 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1646 else 1707 return;
1647 { 1708 }
1709
1648 once->cb = cb; 1710 once->cb = cb;
1649 once->arg = arg; 1711 once->arg = arg;
1650 1712
1651 ev_init (&once->io, once_cb_io); 1713 ev_init (&once->io, once_cb_io);
1652 if (fd >= 0) 1714 if (fd >= 0)
1653 { 1715 {
1654 ev_io_set (&once->io, fd, events); 1716 ev_io_set (&once->io, fd, events);
1655 ev_io_start (EV_A_ &once->io); 1717 ev_io_start (EV_A_ &once->io);
1656 } 1718 }
1657 1719
1658 ev_init (&once->to, once_cb_to); 1720 ev_init (&once->to, once_cb_to);
1659 if (timeout >= 0.) 1721 if (timeout >= 0.)
1660 { 1722 {
1661 ev_timer_set (&once->to, timeout, 0.); 1723 ev_timer_set (&once->to, timeout, 0.);
1662 ev_timer_start (EV_A_ &once->to); 1724 ev_timer_start (EV_A_ &once->to);
1663 }
1664 } 1725 }
1665} 1726}
1666 1727
1667#ifdef __cplusplus 1728#ifdef __cplusplus
1668} 1729}

Diff Legend

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