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

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

Diff Legend

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