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

Comparing libev/ev.c (file contents):
Revision 1.117 by ayin, Thu Nov 15 17:15:56 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
89# endif
90
91# ifndef EV_USE_PORT
92# if HAVE_PORT_H && HAVE_PORT_CREATE
93# define EV_USE_PORT 1
94# else
95# define EV_USE_PORT 0
96# endif
62# endif 97# endif
63 98
64#endif 99#endif
65 100
66#include <math.h> 101#include <math.h>
… …
90#endif 125#endif
91 126
92/**/ 127/**/
93 128
94#ifndef EV_USE_MONOTONIC 129#ifndef EV_USE_MONOTONIC
95# define EV_USE_MONOTONIC 1 130# define EV_USE_MONOTONIC 0
131#endif
132
133#ifndef EV_USE_REALTIME
134# define EV_USE_REALTIME 0
96#endif 135#endif
97 136
98#ifndef EV_USE_SELECT 137#ifndef EV_USE_SELECT
99# define EV_USE_SELECT 1 138# define EV_USE_SELECT 1
100# define EV_SELECT_USE_FD_SET 1
101#endif 139#endif
102 140
103#ifndef EV_USE_POLL 141#ifndef EV_USE_POLL
104# ifdef _WIN32 142# ifdef _WIN32
105# define EV_USE_POLL 0 143# define EV_USE_POLL 0
… …
114 152
115#ifndef EV_USE_KQUEUE 153#ifndef EV_USE_KQUEUE
116# define EV_USE_KQUEUE 0 154# define EV_USE_KQUEUE 0
117#endif 155#endif
118 156
119#ifndef EV_USE_REALTIME 157#ifndef EV_USE_PORT
120# define EV_USE_REALTIME 1 158# define EV_USE_PORT 0
121#endif 159#endif
122 160
123/**/ 161/**/
124
125/* darwin simply cannot be helped */
126#ifdef __APPLE__
127# undef EV_USE_POLL
128# undef EV_USE_KQUEUE
129#endif
130 162
131#ifndef CLOCK_MONOTONIC 163#ifndef CLOCK_MONOTONIC
132# undef EV_USE_MONOTONIC 164# undef EV_USE_MONOTONIC
133# define EV_USE_MONOTONIC 0 165# define EV_USE_MONOTONIC 0
134#endif 166#endif
… …
143#endif 175#endif
144 176
145/**/ 177/**/
146 178
147#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) */
148#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) */
149#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 */
150/*#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 */
151 183
152#ifdef EV_H 184#ifdef EV_H
153# include EV_H 185# include EV_H
154#else 186#else
155# include "ev.h" 187# include "ev.h"
156#endif 188#endif
157 189
158#if __GNUC__ >= 3 190#if __GNUC__ >= 3
159# define expect(expr,value) __builtin_expect ((expr),(value)) 191# define expect(expr,value) __builtin_expect ((expr),(value))
160# define inline inline 192# define inline static inline
161#else 193#else
162# define expect(expr,value) (expr) 194# define expect(expr,value) (expr)
163# define inline static 195# define inline static
164#endif 196#endif
165 197
… …
359void 391void
360ev_feed_event (EV_P_ void *w, int revents) 392ev_feed_event (EV_P_ void *w, int revents)
361{ 393{
362 W w_ = (W)w; 394 W w_ = (W)w;
363 395
364 if (w_->pending) 396 if (expect_false (w_->pending))
365 { 397 {
366 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 398 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
367 return; 399 return;
368 } 400 }
369 401
… …
403 fd_event (EV_A_ fd, revents); 435 fd_event (EV_A_ fd, revents);
404} 436}
405 437
406/*****************************************************************************/ 438/*****************************************************************************/
407 439
408static void 440inline void
409fd_reify (EV_P) 441fd_reify (EV_P)
410{ 442{
411 int i; 443 int i;
412 444
413 for (i = 0; i < fdchangecnt; ++i) 445 for (i = 0; i < fdchangecnt; ++i)
… …
430 } 462 }
431#endif 463#endif
432 464
433 anfd->reify = 0; 465 anfd->reify = 0;
434 466
435 method_modify (EV_A_ fd, anfd->events, events); 467 backend_modify (EV_A_ fd, anfd->events, events);
436 anfd->events = events; 468 anfd->events = events;
437 } 469 }
438 470
439 fdchangecnt = 0; 471 fdchangecnt = 0;
440} 472}
441 473
442static void 474static void
443fd_change (EV_P_ int fd) 475fd_change (EV_P_ int fd)
444{ 476{
445 if (anfds [fd].reify) 477 if (expect_false (anfds [fd].reify))
446 return; 478 return;
447 479
448 anfds [fd].reify = 1; 480 anfds [fd].reify = 1;
449 481
450 ++fdchangecnt; 482 ++fdchangecnt;
… …
462 ev_io_stop (EV_A_ w); 494 ev_io_stop (EV_A_ w);
463 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);
464 } 496 }
465} 497}
466 498
467static int 499inline int
468fd_valid (int fd) 500fd_valid (int fd)
469{ 501{
470#ifdef _WIN32 502#ifdef _WIN32
471 return _get_osfhandle (fd) != -1; 503 return _get_osfhandle (fd) != -1;
472#else 504#else
… …
498 fd_kill (EV_A_ fd); 530 fd_kill (EV_A_ fd);
499 return; 531 return;
500 } 532 }
501} 533}
502 534
503/* 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 */
504static void 536static void
505fd_rearm_all (EV_P) 537fd_rearm_all (EV_P)
506{ 538{
507 int fd; 539 int fd;
508 540
… …
641 for (signum = signalmax; signum--; ) 673 for (signum = signalmax; signum--; )
642 if (signals [signum].gotsig) 674 if (signals [signum].gotsig)
643 ev_feed_signal_event (EV_A_ signum + 1); 675 ev_feed_signal_event (EV_A_ signum + 1);
644} 676}
645 677
646inline void 678static void
647fd_intern (int fd) 679fd_intern (int fd)
648{ 680{
649#ifdef _WIN32 681#ifdef _WIN32
650 int arg = 1; 682 int arg = 1;
651 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 683 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
699 int pid, status; 731 int pid, status;
700 732
701 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 733 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
702 { 734 {
703 /* 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 */
704 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 737 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
705 738
706 child_reap (EV_A_ sw, pid, pid, status); 739 child_reap (EV_A_ sw, pid, pid, status);
707 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 */
708 } 741 }
709} 742}
710 743
711#endif 744#endif
712 745
713/*****************************************************************************/ 746/*****************************************************************************/
714 747
748#if EV_USE_PORT
749# include "ev_port.c"
750#endif
715#if EV_USE_KQUEUE 751#if EV_USE_KQUEUE
716# include "ev_kqueue.c" 752# include "ev_kqueue.c"
717#endif 753#endif
718#if EV_USE_EPOLL 754#if EV_USE_EPOLL
719# include "ev_epoll.c" 755# include "ev_epoll.c"
… …
748 || getgid () != getegid (); 784 || getgid () != getegid ();
749#endif 785#endif
750} 786}
751 787
752unsigned int 788unsigned int
753ev_method (EV_P) 789ev_supported_backends (void)
754{ 790{
755 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;
756} 824}
757 825
758static void 826static void
759loop_init (EV_P_ unsigned int flags) 827loop_init (EV_P_ unsigned int flags)
760{ 828{
761 if (!method) 829 if (!backend)
762 { 830 {
763#if EV_USE_MONOTONIC 831#if EV_USE_MONOTONIC
764 { 832 {
765 struct timespec ts; 833 struct timespec ts;
766 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 834 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
… …
771 ev_rt_now = ev_time (); 839 ev_rt_now = ev_time ();
772 mn_now = get_clock (); 840 mn_now = get_clock ();
773 now_floor = mn_now; 841 now_floor = mn_now;
774 rtmn_diff = ev_rt_now - mn_now; 842 rtmn_diff = ev_rt_now - mn_now;
775 843
776 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS")) 844 if (!(flags & EVFLAG_NOENV)
845 && !enable_secure ()
846 && getenv ("LIBEV_FLAGS"))
777 flags = atoi (getenv ("LIBEV_FLAGS")); 847 flags = atoi (getenv ("LIBEV_FLAGS"));
778 848
779 if (!(flags & 0x0000ffff)) 849 if (!(flags & 0x0000ffffUL))
780 flags |= 0x0000ffff; 850 flags |= ev_recommended_backends ();
781 851
782 method = 0; 852 backend = 0;
853#if EV_USE_PORT
854 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
855#endif
783#if EV_USE_KQUEUE 856#if EV_USE_KQUEUE
784 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags); 857 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
785#endif 858#endif
786#if EV_USE_EPOLL 859#if EV_USE_EPOLL
787 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags); 860 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
788#endif 861#endif
789#if EV_USE_POLL 862#if EV_USE_POLL
790 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags); 863 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
791#endif 864#endif
792#if EV_USE_SELECT 865#if EV_USE_SELECT
793 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags); 866 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
794#endif 867#endif
795 868
796 ev_init (&sigev, sigcb); 869 ev_init (&sigev, sigcb);
797 ev_set_priority (&sigev, EV_MAXPRI); 870 ev_set_priority (&sigev, EV_MAXPRI);
798 } 871 }
799} 872}
800 873
801void 874static void
802loop_destroy (EV_P) 875loop_destroy (EV_P)
803{ 876{
804 int i; 877 int i;
805 878
879#if EV_USE_PORT
880 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
881#endif
806#if EV_USE_KQUEUE 882#if EV_USE_KQUEUE
807 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 883 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
808#endif 884#endif
809#if EV_USE_EPOLL 885#if EV_USE_EPOLL
810 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 886 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
811#endif 887#endif
812#if EV_USE_POLL 888#if EV_USE_POLL
813 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 889 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
814#endif 890#endif
815#if EV_USE_SELECT 891#if EV_USE_SELECT
816 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 892 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
817#endif 893#endif
818 894
819 for (i = NUMPRI; i--; ) 895 for (i = NUMPRI; i--; )
820 array_free (pending, [i]); 896 array_free (pending, [i]);
821 897
… …
827#endif 903#endif
828 array_free (idle, EMPTY0); 904 array_free (idle, EMPTY0);
829 array_free (prepare, EMPTY0); 905 array_free (prepare, EMPTY0);
830 array_free (check, EMPTY0); 906 array_free (check, EMPTY0);
831 907
832 method = 0; 908 backend = 0;
833} 909}
834 910
835static void 911static void
836loop_fork (EV_P) 912loop_fork (EV_P)
837{ 913{
914#if EV_USE_PORT
915 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
916#endif
917#if EV_USE_KQUEUE
918 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
919#endif
838#if EV_USE_EPOLL 920#if EV_USE_EPOLL
839 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 921 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
840#endif
841#if EV_USE_KQUEUE
842 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
843#endif 922#endif
844 923
845 if (ev_is_active (&sigev)) 924 if (ev_is_active (&sigev))
846 { 925 {
847 /* default loop */ 926 /* default loop */
… …
868 947
869 memset (loop, 0, sizeof (struct ev_loop)); 948 memset (loop, 0, sizeof (struct ev_loop));
870 949
871 loop_init (EV_A_ flags); 950 loop_init (EV_A_ flags);
872 951
873 if (ev_method (EV_A)) 952 if (ev_backend (EV_A))
874 return loop; 953 return loop;
875 954
876 return 0; 955 return 0;
877} 956}
878 957
… …
891 970
892#endif 971#endif
893 972
894#if EV_MULTIPLICITY 973#if EV_MULTIPLICITY
895struct ev_loop * 974struct ev_loop *
896ev_default_loop_ (unsigned int flags) 975ev_default_loop_init (unsigned int flags)
897#else 976#else
898int 977int
899ev_default_loop (unsigned int flags) 978ev_default_loop (unsigned int flags)
900#endif 979#endif
901{ 980{
… …
911 ev_default_loop_ptr = 1; 990 ev_default_loop_ptr = 1;
912#endif 991#endif
913 992
914 loop_init (EV_A_ flags); 993 loop_init (EV_A_ flags);
915 994
916 if (ev_method (EV_A)) 995 if (ev_backend (EV_A))
917 { 996 {
918 siginit (EV_A); 997 siginit (EV_A);
919 998
920#ifndef _WIN32 999#ifndef _WIN32
921 ev_signal_init (&childev, childcb, SIGCHLD); 1000 ev_signal_init (&childev, childcb, SIGCHLD);
… …
957{ 1036{
958#if EV_MULTIPLICITY 1037#if EV_MULTIPLICITY
959 struct ev_loop *loop = ev_default_loop_ptr; 1038 struct ev_loop *loop = ev_default_loop_ptr;
960#endif 1039#endif
961 1040
962 if (method) 1041 if (backend)
963 postfork = 1; 1042 postfork = 1;
964} 1043}
965 1044
966/*****************************************************************************/ 1045/*****************************************************************************/
967 1046
… …
975 return 1; 1054 return 1;
976 1055
977 return 0; 1056 return 0;
978} 1057}
979 1058
980static void 1059inline void
981call_pending (EV_P) 1060call_pending (EV_P)
982{ 1061{
983 int pri; 1062 int pri;
984 1063
985 for (pri = NUMPRI; pri--; ) 1064 for (pri = NUMPRI; pri--; )
986 while (pendingcnt [pri]) 1065 while (pendingcnt [pri])
987 { 1066 {
988 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1067 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
989 1068
990 if (p->w) 1069 if (expect_true (p->w))
991 { 1070 {
992 p->w->pending = 0; 1071 p->w->pending = 0;
993 EV_CB_INVOKE (p->w, p->events); 1072 EV_CB_INVOKE (p->w, p->events);
994 } 1073 }
995 } 1074 }
996} 1075}
997 1076
998static void 1077inline void
999timers_reify (EV_P) 1078timers_reify (EV_P)
1000{ 1079{
1001 while (timercnt && ((WT)timers [0])->at <= mn_now) 1080 while (timercnt && ((WT)timers [0])->at <= mn_now)
1002 { 1081 {
1003 struct ev_timer *w = timers [0]; 1082 struct ev_timer *w = timers [0];
… …
1021 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1100 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1022 } 1101 }
1023} 1102}
1024 1103
1025#if EV_PERIODICS 1104#if EV_PERIODICS
1026static void 1105inline void
1027periodics_reify (EV_P) 1106periodics_reify (EV_P)
1028{ 1107{
1029 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1108 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1030 { 1109 {
1031 struct ev_periodic *w = periodics [0]; 1110 struct ev_periodic *w = periodics [0];
… …
1090 ev_rt_now = ev_time (); 1169 ev_rt_now = ev_time ();
1091 return 1; 1170 return 1;
1092 } 1171 }
1093} 1172}
1094 1173
1095static void 1174inline void
1096time_update (EV_P) 1175time_update (EV_P)
1097{ 1176{
1098 int i; 1177 int i;
1099 1178
1100#if EV_USE_MONOTONIC 1179#if EV_USE_MONOTONIC
… …
1199 { 1278 {
1200 block = MAX_BLOCKTIME; 1279 block = MAX_BLOCKTIME;
1201 1280
1202 if (timercnt) 1281 if (timercnt)
1203 { 1282 {
1204 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1283 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1205 if (block > to) block = to; 1284 if (block > to) block = to;
1206 } 1285 }
1207 1286
1208#if EV_PERIODICS 1287#if EV_PERIODICS
1209 if (periodiccnt) 1288 if (periodiccnt)
1210 { 1289 {
1211 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;
1212 if (block > to) block = to; 1291 if (block > to) block = to;
1213 } 1292 }
1214#endif 1293#endif
1215 1294
1216 if (block < 0.) block = 0.; 1295 if (expect_false (block < 0.)) block = 0.;
1217 } 1296 }
1218 1297
1219 method_poll (EV_A_ block); 1298 backend_poll (EV_A_ block);
1220 1299
1221 /* update ev_rt_now, do magic */ 1300 /* update ev_rt_now, do magic */
1222 time_update (EV_A); 1301 time_update (EV_A);
1223 1302
1224 /* queue pending timers and reschedule them */ 1303 /* queue pending timers and reschedule them */
… …
1230 /* queue idle watchers unless io or timers are pending */ 1309 /* queue idle watchers unless io or timers are pending */
1231 if (idlecnt && !any_pending (EV_A)) 1310 if (idlecnt && !any_pending (EV_A))
1232 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1311 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1233 1312
1234 /* queue check watchers, to be executed first */ 1313 /* queue check watchers, to be executed first */
1235 if (checkcnt) 1314 if (expect_false (checkcnt))
1236 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1315 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1237 1316
1238 call_pending (EV_A); 1317 call_pending (EV_A);
1239 1318
1240 if (loop_done) 1319 if (expect_false (loop_done))
1241 break; 1320 break;
1242 } 1321 }
1243 1322
1244 if (loop_done != 2) 1323 if (loop_done != 2)
1245 loop_done = 0; 1324 loop_done = 0;
… …
1307void 1386void
1308ev_io_start (EV_P_ struct ev_io *w) 1387ev_io_start (EV_P_ struct ev_io *w)
1309{ 1388{
1310 int fd = w->fd; 1389 int fd = w->fd;
1311 1390
1312 if (ev_is_active (w)) 1391 if (expect_false (ev_is_active (w)))
1313 return; 1392 return;
1314 1393
1315 assert (("ev_io_start called with negative fd", fd >= 0)); 1394 assert (("ev_io_start called with negative fd", fd >= 0));
1316 1395
1317 ev_start (EV_A_ (W)w, 1); 1396 ev_start (EV_A_ (W)w, 1);
… …
1323 1402
1324void 1403void
1325ev_io_stop (EV_P_ struct ev_io *w) 1404ev_io_stop (EV_P_ struct ev_io *w)
1326{ 1405{
1327 ev_clear_pending (EV_A_ (W)w); 1406 ev_clear_pending (EV_A_ (W)w);
1328 if (!ev_is_active (w)) 1407 if (expect_false (!ev_is_active (w)))
1329 return; 1408 return;
1330 1409
1331 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));
1332 1411
1333 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1412 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
… …
1337} 1416}
1338 1417
1339void 1418void
1340ev_timer_start (EV_P_ struct ev_timer *w) 1419ev_timer_start (EV_P_ struct ev_timer *w)
1341{ 1420{
1342 if (ev_is_active (w)) 1421 if (expect_false (ev_is_active (w)))
1343 return; 1422 return;
1344 1423
1345 ((WT)w)->at += mn_now; 1424 ((WT)w)->at += mn_now;
1346 1425
1347 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.));
… …
1356 1435
1357void 1436void
1358ev_timer_stop (EV_P_ struct ev_timer *w) 1437ev_timer_stop (EV_P_ struct ev_timer *w)
1359{ 1438{
1360 ev_clear_pending (EV_A_ (W)w); 1439 ev_clear_pending (EV_A_ (W)w);
1361 if (!ev_is_active (w)) 1440 if (expect_false (!ev_is_active (w)))
1362 return; 1441 return;
1363 1442
1364 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1443 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1365 1444
1366 if (((W)w)->active < timercnt--) 1445 if (expect_true (((W)w)->active < timercnt--))
1367 { 1446 {
1368 timers [((W)w)->active - 1] = timers [timercnt]; 1447 timers [((W)w)->active - 1] = timers [timercnt];
1369 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1448 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1370 } 1449 }
1371 1450
… …
1396 1475
1397#if EV_PERIODICS 1476#if EV_PERIODICS
1398void 1477void
1399ev_periodic_start (EV_P_ struct ev_periodic *w) 1478ev_periodic_start (EV_P_ struct ev_periodic *w)
1400{ 1479{
1401 if (ev_is_active (w)) 1480 if (expect_false (ev_is_active (w)))
1402 return; 1481 return;
1403 1482
1404 if (w->reschedule_cb) 1483 if (w->reschedule_cb)
1405 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1484 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1406 else if (w->interval) 1485 else if (w->interval)
… …
1420 1499
1421void 1500void
1422ev_periodic_stop (EV_P_ struct ev_periodic *w) 1501ev_periodic_stop (EV_P_ struct ev_periodic *w)
1423{ 1502{
1424 ev_clear_pending (EV_A_ (W)w); 1503 ev_clear_pending (EV_A_ (W)w);
1425 if (!ev_is_active (w)) 1504 if (expect_false (!ev_is_active (w)))
1426 return; 1505 return;
1427 1506
1428 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1507 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1429 1508
1430 if (((W)w)->active < periodiccnt--) 1509 if (expect_true (((W)w)->active < periodiccnt--))
1431 { 1510 {
1432 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1511 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1433 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1512 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1434 } 1513 }
1435 1514
… …
1446#endif 1525#endif
1447 1526
1448void 1527void
1449ev_idle_start (EV_P_ struct ev_idle *w) 1528ev_idle_start (EV_P_ struct ev_idle *w)
1450{ 1529{
1451 if (ev_is_active (w)) 1530 if (expect_false (ev_is_active (w)))
1452 return; 1531 return;
1453 1532
1454 ev_start (EV_A_ (W)w, ++idlecnt); 1533 ev_start (EV_A_ (W)w, ++idlecnt);
1455 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2); 1534 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1456 idles [idlecnt - 1] = w; 1535 idles [idlecnt - 1] = w;
… …
1458 1537
1459void 1538void
1460ev_idle_stop (EV_P_ struct ev_idle *w) 1539ev_idle_stop (EV_P_ struct ev_idle *w)
1461{ 1540{
1462 ev_clear_pending (EV_A_ (W)w); 1541 ev_clear_pending (EV_A_ (W)w);
1463 if (!ev_is_active (w)) 1542 if (expect_false (!ev_is_active (w)))
1464 return; 1543 return;
1465 1544
1466 idles [((W)w)->active - 1] = idles [--idlecnt]; 1545 idles [((W)w)->active - 1] = idles [--idlecnt];
1467 ev_stop (EV_A_ (W)w); 1546 ev_stop (EV_A_ (W)w);
1468} 1547}
1469 1548
1470void 1549void
1471ev_prepare_start (EV_P_ struct ev_prepare *w) 1550ev_prepare_start (EV_P_ struct ev_prepare *w)
1472{ 1551{
1473 if (ev_is_active (w)) 1552 if (expect_false (ev_is_active (w)))
1474 return; 1553 return;
1475 1554
1476 ev_start (EV_A_ (W)w, ++preparecnt); 1555 ev_start (EV_A_ (W)w, ++preparecnt);
1477 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 1556 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1478 prepares [preparecnt - 1] = w; 1557 prepares [preparecnt - 1] = w;
… …
1480 1559
1481void 1560void
1482ev_prepare_stop (EV_P_ struct ev_prepare *w) 1561ev_prepare_stop (EV_P_ struct ev_prepare *w)
1483{ 1562{
1484 ev_clear_pending (EV_A_ (W)w); 1563 ev_clear_pending (EV_A_ (W)w);
1485 if (!ev_is_active (w)) 1564 if (expect_false (!ev_is_active (w)))
1486 return; 1565 return;
1487 1566
1488 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1567 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1489 ev_stop (EV_A_ (W)w); 1568 ev_stop (EV_A_ (W)w);
1490} 1569}
1491 1570
1492void 1571void
1493ev_check_start (EV_P_ struct ev_check *w) 1572ev_check_start (EV_P_ struct ev_check *w)
1494{ 1573{
1495 if (ev_is_active (w)) 1574 if (expect_false (ev_is_active (w)))
1496 return; 1575 return;
1497 1576
1498 ev_start (EV_A_ (W)w, ++checkcnt); 1577 ev_start (EV_A_ (W)w, ++checkcnt);
1499 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2); 1578 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1500 checks [checkcnt - 1] = w; 1579 checks [checkcnt - 1] = w;
… …
1502 1581
1503void 1582void
1504ev_check_stop (EV_P_ struct ev_check *w) 1583ev_check_stop (EV_P_ struct ev_check *w)
1505{ 1584{
1506 ev_clear_pending (EV_A_ (W)w); 1585 ev_clear_pending (EV_A_ (W)w);
1507 if (!ev_is_active (w)) 1586 if (expect_false (!ev_is_active (w)))
1508 return; 1587 return;
1509 1588
1510 checks [((W)w)->active - 1] = checks [--checkcnt]; 1589 checks [((W)w)->active - 1] = checks [--checkcnt];
1511 ev_stop (EV_A_ (W)w); 1590 ev_stop (EV_A_ (W)w);
1512} 1591}
… …
1519ev_signal_start (EV_P_ struct ev_signal *w) 1598ev_signal_start (EV_P_ struct ev_signal *w)
1520{ 1599{
1521#if EV_MULTIPLICITY 1600#if EV_MULTIPLICITY
1522 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));
1523#endif 1602#endif
1524 if (ev_is_active (w)) 1603 if (expect_false (ev_is_active (w)))
1525 return; 1604 return;
1526 1605
1527 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));
1528 1607
1529 ev_start (EV_A_ (W)w, 1); 1608 ev_start (EV_A_ (W)w, 1);
… …
1546 1625
1547void 1626void
1548ev_signal_stop (EV_P_ struct ev_signal *w) 1627ev_signal_stop (EV_P_ struct ev_signal *w)
1549{ 1628{
1550 ev_clear_pending (EV_A_ (W)w); 1629 ev_clear_pending (EV_A_ (W)w);
1551 if (!ev_is_active (w)) 1630 if (expect_false (!ev_is_active (w)))
1552 return; 1631 return;
1553 1632
1554 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1633 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1555 ev_stop (EV_A_ (W)w); 1634 ev_stop (EV_A_ (W)w);
1556 1635
… …
1562ev_child_start (EV_P_ struct ev_child *w) 1641ev_child_start (EV_P_ struct ev_child *w)
1563{ 1642{
1564#if EV_MULTIPLICITY 1643#if EV_MULTIPLICITY
1565 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));
1566#endif 1645#endif
1567 if (ev_is_active (w)) 1646 if (expect_false (ev_is_active (w)))
1568 return; 1647 return;
1569 1648
1570 ev_start (EV_A_ (W)w, 1); 1649 ev_start (EV_A_ (W)w, 1);
1571 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1650 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1572} 1651}
1573 1652
1574void 1653void
1575ev_child_stop (EV_P_ struct ev_child *w) 1654ev_child_stop (EV_P_ struct ev_child *w)
1576{ 1655{
1577 ev_clear_pending (EV_A_ (W)w); 1656 ev_clear_pending (EV_A_ (W)w);
1578 if (!ev_is_active (w)) 1657 if (expect_false (!ev_is_active (w)))
1579 return; 1658 return;
1580 1659
1581 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1660 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1582 ev_stop (EV_A_ (W)w); 1661 ev_stop (EV_A_ (W)w);
1583} 1662}
… …
1620void 1699void
1621ev_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)
1622{ 1701{
1623 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));
1624 1703
1625 if (!once) 1704 if (expect_false (!once))
1705 {
1626 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1706 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1627 else 1707 return;
1628 { 1708 }
1709
1629 once->cb = cb; 1710 once->cb = cb;
1630 once->arg = arg; 1711 once->arg = arg;
1631 1712
1632 ev_init (&once->io, once_cb_io); 1713 ev_init (&once->io, once_cb_io);
1633 if (fd >= 0) 1714 if (fd >= 0)
1634 { 1715 {
1635 ev_io_set (&once->io, fd, events); 1716 ev_io_set (&once->io, fd, events);
1636 ev_io_start (EV_A_ &once->io); 1717 ev_io_start (EV_A_ &once->io);
1637 } 1718 }
1638 1719
1639 ev_init (&once->to, once_cb_to); 1720 ev_init (&once->to, once_cb_to);
1640 if (timeout >= 0.) 1721 if (timeout >= 0.)
1641 { 1722 {
1642 ev_timer_set (&once->to, timeout, 0.); 1723 ev_timer_set (&once->to, timeout, 0.);
1643 ev_timer_start (EV_A_ &once->to); 1724 ev_timer_start (EV_A_ &once->to);
1644 }
1645 } 1725 }
1646} 1726}
1647 1727
1648#ifdef __cplusplus 1728#ifdef __cplusplus
1649} 1729}

Diff Legend

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