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

Comparing libev/ev.c (file contents):
Revision 1.104 by root, Mon Nov 12 00:39:45 2007 UTC vs.
Revision 1.129 by root, Fri Nov 23 05:00:44 2007 UTC

… …
41# define EV_USE_MONOTONIC 1 41# define EV_USE_MONOTONIC 1
42# endif 42# endif
43# ifndef EV_USE_REALTIME 43# ifndef EV_USE_REALTIME
44# define EV_USE_REALTIME 1 44# define EV_USE_REALTIME 1
45# endif 45# endif
46# else
47# ifndef EV_USE_MONOTONIC
48# define EV_USE_MONOTONIC 0
49# endif
50# ifndef EV_USE_REALTIME
51# define EV_USE_REALTIME 0
52# endif
46# endif 53# endif
47 54
48# if HAVE_SELECT && HAVE_SYS_SELECT_H && !defined (EV_USE_SELECT) 55# ifndef EV_USE_SELECT
56# if HAVE_SELECT && HAVE_SYS_SELECT_H
49# define EV_USE_SELECT 1 57# define EV_USE_SELECT 1
58# else
59# define EV_USE_SELECT 0
60# endif
50# endif 61# endif
51 62
52# if HAVE_POLL && HAVE_POLL_H && !defined (EV_USE_POLL) 63# ifndef EV_USE_POLL
64# if HAVE_POLL && HAVE_POLL_H
53# define EV_USE_POLL 1 65# define EV_USE_POLL 1
66# else
67# define EV_USE_POLL 0
68# endif
54# endif 69# endif
55 70
56# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H && !defined (EV_USE_EPOLL) 71# ifndef EV_USE_EPOLL
72# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
57# define EV_USE_EPOLL 1 73# define EV_USE_EPOLL 1
74# else
75# define EV_USE_EPOLL 0
76# endif
58# endif 77# endif
59 78
79# ifndef EV_USE_KQUEUE
60# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE) 80# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
61# define EV_USE_KQUEUE 1 81# define EV_USE_KQUEUE 1
82# else
83# define EV_USE_KQUEUE 0
84# endif
85# endif
86
87# ifndef EV_USE_PORT
88# if HAVE_PORT_H && HAVE_PORT_CREATE
89# define EV_USE_PORT 1
90# else
91# define EV_USE_PORT 0
92# endif
62# endif 93# endif
63 94
64#endif 95#endif
65 96
66#include <math.h> 97#include <math.h>
… …
90#endif 121#endif
91 122
92/**/ 123/**/
93 124
94#ifndef EV_USE_MONOTONIC 125#ifndef EV_USE_MONOTONIC
95# define EV_USE_MONOTONIC 1 126# define EV_USE_MONOTONIC 0
127#endif
128
129#ifndef EV_USE_REALTIME
130# define EV_USE_REALTIME 0
96#endif 131#endif
97 132
98#ifndef EV_USE_SELECT 133#ifndef EV_USE_SELECT
99# define EV_USE_SELECT 1 134# define EV_USE_SELECT 1
100# define EV_SELECT_USE_FD_SET 1
101#endif 135#endif
102 136
103#ifndef EV_USE_POLL 137#ifndef EV_USE_POLL
104# ifdef _WIN32 138# ifdef _WIN32
105# define EV_USE_POLL 0 139# define EV_USE_POLL 0
… …
114 148
115#ifndef EV_USE_KQUEUE 149#ifndef EV_USE_KQUEUE
116# define EV_USE_KQUEUE 0 150# define EV_USE_KQUEUE 0
117#endif 151#endif
118 152
119#ifndef EV_USE_REALTIME 153#ifndef EV_USE_PORT
120# define EV_USE_REALTIME 1 154# define EV_USE_PORT 0
121#endif 155#endif
122 156
123/**/ 157/**/
124 158
125#ifndef CLOCK_MONOTONIC 159#ifndef CLOCK_MONOTONIC
… …
137#endif 171#endif
138 172
139/**/ 173/**/
140 174
141#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 175#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
142#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */ 176#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
143#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */ 177#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
144/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */ 178/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
145 179
146#ifdef EV_H 180#ifdef EV_H
147# include EV_H 181# include EV_H
148#else 182#else
149# include "ev.h" 183# include "ev.h"
150#endif 184#endif
151 185
152#if __GNUC__ >= 3 186#if __GNUC__ >= 3
153# define expect(expr,value) __builtin_expect ((expr),(value)) 187# define expect(expr,value) __builtin_expect ((expr),(value))
154# define inline inline 188# define inline static inline
155#else 189#else
156# define expect(expr,value) (expr) 190# define expect(expr,value) (expr)
157# define inline static 191# define inline static
158#endif 192#endif
159 193
… …
161#define expect_true(expr) expect ((expr) != 0, 1) 195#define expect_true(expr) expect ((expr) != 0, 1)
162 196
163#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 197#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
164#define ABSPRI(w) ((w)->priority - EV_MINPRI) 198#define ABSPRI(w) ((w)->priority - EV_MINPRI)
165 199
166#define EMPTY /* required for microsofts broken pseudo-c compiler */ 200#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
201#define EMPTY2(a,b) /* used to suppress some warnings */
167 202
168typedef struct ev_watcher *W; 203typedef struct ev_watcher *W;
169typedef struct ev_watcher_list *WL; 204typedef struct ev_watcher_list *WL;
170typedef struct ev_watcher_time *WT; 205typedef struct ev_watcher_time *WT;
171 206
… …
251 #include "ev_vars.h" 286 #include "ev_vars.h"
252 #undef VAR 287 #undef VAR
253 }; 288 };
254 #include "ev_wrap.h" 289 #include "ev_wrap.h"
255 290
256 struct ev_loop default_loop_struct; 291 static struct ev_loop default_loop_struct;
257 static struct ev_loop *default_loop; 292 struct ev_loop *ev_default_loop_ptr;
258 293
259#else 294#else
260 295
261 ev_tstamp ev_rt_now; 296 ev_tstamp ev_rt_now;
262 #define VAR(name,decl) static decl; 297 #define VAR(name,decl) static decl;
263 #include "ev_vars.h" 298 #include "ev_vars.h"
264 #undef VAR 299 #undef VAR
265 300
266 static int default_loop; 301 static int ev_default_loop_ptr;
267 302
268#endif 303#endif
269 304
270/*****************************************************************************/ 305/*****************************************************************************/
271 306
… …
304{ 339{
305 return ev_rt_now; 340 return ev_rt_now;
306} 341}
307#endif 342#endif
308 343
309#define array_roundsize(type,n) ((n) | 4 & ~3) 344#define array_roundsize(type,n) (((n) | 4) & ~3)
310 345
311#define array_needsize(type,base,cur,cnt,init) \ 346#define array_needsize(type,base,cur,cnt,init) \
312 if (expect_false ((cnt) > cur)) \ 347 if (expect_false ((cnt) > cur)) \
313 { \ 348 { \
314 int newcnt = cur; \ 349 int newcnt = cur; \
… …
352void 387void
353ev_feed_event (EV_P_ void *w, int revents) 388ev_feed_event (EV_P_ void *w, int revents)
354{ 389{
355 W w_ = (W)w; 390 W w_ = (W)w;
356 391
357 if (w_->pending) 392 if (expect_false (w_->pending))
358 { 393 {
359 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 394 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
360 return; 395 return;
361 } 396 }
362 397
363 w_->pending = ++pendingcnt [ABSPRI (w_)]; 398 w_->pending = ++pendingcnt [ABSPRI (w_)];
364 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void)); 399 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
365 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 400 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
366 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 401 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
367} 402}
368 403
369static void 404static void
… …
396 fd_event (EV_A_ fd, revents); 431 fd_event (EV_A_ fd, revents);
397} 432}
398 433
399/*****************************************************************************/ 434/*****************************************************************************/
400 435
401static void 436inline void
402fd_reify (EV_P) 437fd_reify (EV_P)
403{ 438{
404 int i; 439 int i;
405 440
406 for (i = 0; i < fdchangecnt; ++i) 441 for (i = 0; i < fdchangecnt; ++i)
… …
433} 468}
434 469
435static void 470static void
436fd_change (EV_P_ int fd) 471fd_change (EV_P_ int fd)
437{ 472{
438 if (anfds [fd].reify) 473 if (expect_false (anfds [fd].reify))
439 return; 474 return;
440 475
441 anfds [fd].reify = 1; 476 anfds [fd].reify = 1;
442 477
443 ++fdchangecnt; 478 ++fdchangecnt;
444 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 479 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
445 fdchanges [fdchangecnt - 1] = fd; 480 fdchanges [fdchangecnt - 1] = fd;
446} 481}
447 482
448static void 483static void
449fd_kill (EV_P_ int fd) 484fd_kill (EV_P_ int fd)
… …
455 ev_io_stop (EV_A_ w); 490 ev_io_stop (EV_A_ w);
456 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 491 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
457 } 492 }
458} 493}
459 494
460static int 495inline int
461fd_valid (int fd) 496fd_valid (int fd)
462{ 497{
463#ifdef _WIN32 498#ifdef _WIN32
464 return _get_osfhandle (fd) != -1; 499 return _get_osfhandle (fd) != -1;
465#else 500#else
… …
607ev_feed_signal_event (EV_P_ int signum) 642ev_feed_signal_event (EV_P_ int signum)
608{ 643{
609 WL w; 644 WL w;
610 645
611#if EV_MULTIPLICITY 646#if EV_MULTIPLICITY
612 assert (("feeding signal events is only supported in the default loop", loop == default_loop)); 647 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
613#endif 648#endif
614 649
615 --signum; 650 --signum;
616 651
617 if (signum < 0 || signum >= signalmax) 652 if (signum < 0 || signum >= signalmax)
… …
634 for (signum = signalmax; signum--; ) 669 for (signum = signalmax; signum--; )
635 if (signals [signum].gotsig) 670 if (signals [signum].gotsig)
636 ev_feed_signal_event (EV_A_ signum + 1); 671 ev_feed_signal_event (EV_A_ signum + 1);
637} 672}
638 673
639inline void 674static void
640fd_intern (int fd) 675fd_intern (int fd)
641{ 676{
642#ifdef _WIN32 677#ifdef _WIN32
643 int arg = 1; 678 int arg = 1;
644 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 679 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
703 738
704#endif 739#endif
705 740
706/*****************************************************************************/ 741/*****************************************************************************/
707 742
743#if EV_USE_PORT
744# include "ev_port.c"
745#endif
708#if EV_USE_KQUEUE 746#if EV_USE_KQUEUE
709# include "ev_kqueue.c" 747# include "ev_kqueue.c"
710#endif 748#endif
711#if EV_USE_EPOLL 749#if EV_USE_EPOLL
712# include "ev_epoll.c" 750# include "ev_epoll.c"
… …
740 return getuid () != geteuid () 778 return getuid () != geteuid ()
741 || getgid () != getegid (); 779 || getgid () != getegid ();
742#endif 780#endif
743} 781}
744 782
745int 783unsigned int
746ev_method (EV_P) 784ev_supported_backends (void)
747{ 785{
748 return method;
749} 786}
750 787
788unsigned int
789ev_recommended_backends (void)
790{
791 unsigned int flags;
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_backend (EV_P)
804{
805 unsigned int flags = ev_recommended_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
751static void 820static void
752loop_init (EV_P_ int methods) 821loop_init (EV_P_ unsigned int flags)
753{ 822{
754 if (!method) 823 if (!method)
755 { 824 {
756#if EV_USE_MONOTONIC 825#if EV_USE_MONOTONIC
757 { 826 {
… …
764 ev_rt_now = ev_time (); 833 ev_rt_now = ev_time ();
765 mn_now = get_clock (); 834 mn_now = get_clock ();
766 now_floor = mn_now; 835 now_floor = mn_now;
767 rtmn_diff = ev_rt_now - mn_now; 836 rtmn_diff = ev_rt_now - mn_now;
768 837
769 if (methods == EVMETHOD_AUTO) 838 if (!(flags & EVFLAG_NOENV)
770 if (!enable_secure () && getenv ("LIBEV_METHODS")) 839 && !enable_secure ()
840 && getenv ("LIBEV_FLAGS"))
771 methods = atoi (getenv ("LIBEV_METHODS")); 841 flags = atoi (getenv ("LIBEV_FLAGS"));
772 else 842
773 methods = EVMETHOD_ANY; 843 if (!(flags & 0x0000ffffUL))
844 flags |= ev_recommended_backends ();
774 845
775 method = 0; 846 method = 0;
847#if EV_USE_PORT
848 if (!method && (flags & EVBACKEND_PORT )) method = port_init (EV_A_ flags);
849#endif
776#if EV_USE_KQUEUE 850#if EV_USE_KQUEUE
777 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 851 if (!method && (flags & EVBACKEND_KQUEUE)) method = kqueue_init (EV_A_ flags);
778#endif 852#endif
779#if EV_USE_EPOLL 853#if EV_USE_EPOLL
780 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 854 if (!method && (flags & EVBACKEND_EPOLL )) method = epoll_init (EV_A_ flags);
781#endif 855#endif
782#if EV_USE_POLL 856#if EV_USE_POLL
783 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 857 if (!method && (flags & EVBACKEND_POLL )) method = poll_init (EV_A_ flags);
784#endif 858#endif
785#if EV_USE_SELECT 859#if EV_USE_SELECT
786 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 860 if (!method && (flags & EVBACKEND_SELECT)) method = select_init (EV_A_ flags);
787#endif 861#endif
788 862
789 ev_init (&sigev, sigcb); 863 ev_init (&sigev, sigcb);
790 ev_set_priority (&sigev, EV_MAXPRI); 864 ev_set_priority (&sigev, EV_MAXPRI);
791 } 865 }
792} 866}
793 867
794void 868static void
795loop_destroy (EV_P) 869loop_destroy (EV_P)
796{ 870{
797 int i; 871 int i;
798 872
873#if EV_USE_PORT
874 if (method == EVBACKEND_PORT ) port_destroy (EV_A);
875#endif
799#if EV_USE_KQUEUE 876#if EV_USE_KQUEUE
800 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 877 if (method == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
801#endif 878#endif
802#if EV_USE_EPOLL 879#if EV_USE_EPOLL
803 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 880 if (method == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
804#endif 881#endif
805#if EV_USE_POLL 882#if EV_USE_POLL
806 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 883 if (method == EVBACKEND_POLL ) poll_destroy (EV_A);
807#endif 884#endif
808#if EV_USE_SELECT 885#if EV_USE_SELECT
809 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 886 if (method == EVBACKEND_SELECT) select_destroy (EV_A);
810#endif 887#endif
811 888
812 for (i = NUMPRI; i--; ) 889 for (i = NUMPRI; i--; )
813 array_free (pending, [i]); 890 array_free (pending, [i]);
814 891
815 /* have to use the microsoft-never-gets-it-right macro */ 892 /* have to use the microsoft-never-gets-it-right macro */
816 array_free (fdchange, EMPTY); 893 array_free (fdchange, EMPTY0);
817 array_free (timer, EMPTY); 894 array_free (timer, EMPTY0);
818#if EV_PERIODICS 895#if EV_PERIODICS
819 array_free (periodic, EMPTY); 896 array_free (periodic, EMPTY0);
820#endif 897#endif
821 array_free (idle, EMPTY); 898 array_free (idle, EMPTY0);
822 array_free (prepare, EMPTY); 899 array_free (prepare, EMPTY0);
823 array_free (check, EMPTY); 900 array_free (check, EMPTY0);
824 901
825 method = 0; 902 method = 0;
826} 903}
827 904
828static void 905static void
829loop_fork (EV_P) 906loop_fork (EV_P)
830{ 907{
908#if EV_USE_PORT
909 if (method == EVBACKEND_PORT ) port_fork (EV_A);
910#endif
911#if EV_USE_KQUEUE
912 if (method == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
913#endif
831#if EV_USE_EPOLL 914#if EV_USE_EPOLL
832 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 915 if (method == EVBACKEND_EPOLL ) epoll_fork (EV_A);
833#endif
834#if EV_USE_KQUEUE
835 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
836#endif 916#endif
837 917
838 if (ev_is_active (&sigev)) 918 if (ev_is_active (&sigev))
839 { 919 {
840 /* default loop */ 920 /* default loop */
… …
853 postfork = 0; 933 postfork = 0;
854} 934}
855 935
856#if EV_MULTIPLICITY 936#if EV_MULTIPLICITY
857struct ev_loop * 937struct ev_loop *
858ev_loop_new (int methods) 938ev_loop_new (unsigned int flags)
859{ 939{
860 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 940 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
861 941
862 memset (loop, 0, sizeof (struct ev_loop)); 942 memset (loop, 0, sizeof (struct ev_loop));
863 943
864 loop_init (EV_A_ methods); 944 loop_init (EV_A_ flags);
865 945
866 if (ev_method (EV_A)) 946 if (ev_method (EV_A))
867 return loop; 947 return loop;
868 948
869 return 0; 949 return 0;
… …
884 964
885#endif 965#endif
886 966
887#if EV_MULTIPLICITY 967#if EV_MULTIPLICITY
888struct ev_loop * 968struct ev_loop *
969ev_default_loop_init (unsigned int flags)
889#else 970#else
890int 971int
972ev_default_loop (unsigned int flags)
891#endif 973#endif
892ev_default_loop (int methods)
893{ 974{
894 if (sigpipe [0] == sigpipe [1]) 975 if (sigpipe [0] == sigpipe [1])
895 if (pipe (sigpipe)) 976 if (pipe (sigpipe))
896 return 0; 977 return 0;
897 978
898 if (!default_loop) 979 if (!ev_default_loop_ptr)
899 { 980 {
900#if EV_MULTIPLICITY 981#if EV_MULTIPLICITY
901 struct ev_loop *loop = default_loop = &default_loop_struct; 982 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
902#else 983#else
903 default_loop = 1; 984 ev_default_loop_ptr = 1;
904#endif 985#endif
905 986
906 loop_init (EV_A_ methods); 987 loop_init (EV_A_ flags);
907 988
908 if (ev_method (EV_A)) 989 if (ev_method (EV_A))
909 { 990 {
910 siginit (EV_A); 991 siginit (EV_A);
911 992
… …
915 ev_signal_start (EV_A_ &childev); 996 ev_signal_start (EV_A_ &childev);
916 ev_unref (EV_A); /* child watcher should not keep loop alive */ 997 ev_unref (EV_A); /* child watcher should not keep loop alive */
917#endif 998#endif
918 } 999 }
919 else 1000 else
920 default_loop = 0; 1001 ev_default_loop_ptr = 0;
921 } 1002 }
922 1003
923 return default_loop; 1004 return ev_default_loop_ptr;
924} 1005}
925 1006
926void 1007void
927ev_default_destroy (void) 1008ev_default_destroy (void)
928{ 1009{
929#if EV_MULTIPLICITY 1010#if EV_MULTIPLICITY
930 struct ev_loop *loop = default_loop; 1011 struct ev_loop *loop = ev_default_loop_ptr;
931#endif 1012#endif
932 1013
933#ifndef _WIN32 1014#ifndef _WIN32
934 ev_ref (EV_A); /* child watcher */ 1015 ev_ref (EV_A); /* child watcher */
935 ev_signal_stop (EV_A_ &childev); 1016 ev_signal_stop (EV_A_ &childev);
… …
946 1027
947void 1028void
948ev_default_fork (void) 1029ev_default_fork (void)
949{ 1030{
950#if EV_MULTIPLICITY 1031#if EV_MULTIPLICITY
951 struct ev_loop *loop = default_loop; 1032 struct ev_loop *loop = ev_default_loop_ptr;
952#endif 1033#endif
953 1034
954 if (method) 1035 if (method)
955 postfork = 1; 1036 postfork = 1;
956} 1037}
… …
967 return 1; 1048 return 1;
968 1049
969 return 0; 1050 return 0;
970} 1051}
971 1052
972static void 1053inline void
973call_pending (EV_P) 1054call_pending (EV_P)
974{ 1055{
975 int pri; 1056 int pri;
976 1057
977 for (pri = NUMPRI; pri--; ) 1058 for (pri = NUMPRI; pri--; )
978 while (pendingcnt [pri]) 1059 while (pendingcnt [pri])
979 { 1060 {
980 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1061 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
981 1062
982 if (p->w) 1063 if (expect_true (p->w))
983 { 1064 {
984 p->w->pending = 0; 1065 p->w->pending = 0;
985 EV_CB_INVOKE (p->w, p->events); 1066 EV_CB_INVOKE (p->w, p->events);
986 } 1067 }
987 } 1068 }
988} 1069}
989 1070
990static void 1071inline void
991timers_reify (EV_P) 1072timers_reify (EV_P)
992{ 1073{
993 while (timercnt && ((WT)timers [0])->at <= mn_now) 1074 while (timercnt && ((WT)timers [0])->at <= mn_now)
994 { 1075 {
995 struct ev_timer *w = timers [0]; 1076 struct ev_timer *w = timers [0];
… …
1013 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1094 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1014 } 1095 }
1015} 1096}
1016 1097
1017#if EV_PERIODICS 1098#if EV_PERIODICS
1018static void 1099inline void
1019periodics_reify (EV_P) 1100periodics_reify (EV_P)
1020{ 1101{
1021 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1102 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1022 { 1103 {
1023 struct ev_periodic *w = periodics [0]; 1104 struct ev_periodic *w = periodics [0];
… …
1025 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1106 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
1026 1107
1027 /* first reschedule or stop timer */ 1108 /* first reschedule or stop timer */
1028 if (w->reschedule_cb) 1109 if (w->reschedule_cb)
1029 { 1110 {
1030 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1111 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1031
1032 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1112 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1033 downheap ((WT *)periodics, periodiccnt, 0); 1113 downheap ((WT *)periodics, periodiccnt, 0);
1034 } 1114 }
1035 else if (w->interval) 1115 else if (w->interval)
1036 { 1116 {
… …
1083 ev_rt_now = ev_time (); 1163 ev_rt_now = ev_time ();
1084 return 1; 1164 return 1;
1085 } 1165 }
1086} 1166}
1087 1167
1088static void 1168inline void
1089time_update (EV_P) 1169time_update (EV_P)
1090{ 1170{
1091 int i; 1171 int i;
1092 1172
1093#if EV_USE_MONOTONIC 1173#if EV_USE_MONOTONIC
… …
1154ev_loop (EV_P_ int flags) 1234ev_loop (EV_P_ int flags)
1155{ 1235{
1156 double block; 1236 double block;
1157 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1237 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1158 1238
1159 do 1239 while (activecnt)
1160 { 1240 {
1161 /* queue check watchers (and execute them) */ 1241 /* queue check watchers (and execute them) */
1162 if (expect_false (preparecnt)) 1242 if (expect_false (preparecnt))
1163 { 1243 {
1164 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1244 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
… …
1204 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1284 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1205 if (block > to) block = to; 1285 if (block > to) block = to;
1206 } 1286 }
1207#endif 1287#endif
1208 1288
1209 if (block < 0.) block = 0.; 1289 if (expect_false (block < 0.)) block = 0.;
1210 } 1290 }
1211 1291
1212 method_poll (EV_A_ block); 1292 method_poll (EV_A_ block);
1213 1293
1214 /* update ev_rt_now, do magic */ 1294 /* update ev_rt_now, do magic */
… …
1223 /* queue idle watchers unless io or timers are pending */ 1303 /* queue idle watchers unless io or timers are pending */
1224 if (idlecnt && !any_pending (EV_A)) 1304 if (idlecnt && !any_pending (EV_A))
1225 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1305 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1226 1306
1227 /* queue check watchers, to be executed first */ 1307 /* queue check watchers, to be executed first */
1228 if (checkcnt) 1308 if (expect_false (checkcnt))
1229 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1309 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1230 1310
1231 call_pending (EV_A); 1311 call_pending (EV_A);
1312
1313 if (expect_false (loop_done))
1314 break;
1232 } 1315 }
1233 while (activecnt && !loop_done);
1234 1316
1235 if (loop_done != 2) 1317 if (loop_done != 2)
1236 loop_done = 0; 1318 loop_done = 0;
1237} 1319}
1238 1320
… …
1298void 1380void
1299ev_io_start (EV_P_ struct ev_io *w) 1381ev_io_start (EV_P_ struct ev_io *w)
1300{ 1382{
1301 int fd = w->fd; 1383 int fd = w->fd;
1302 1384
1303 if (ev_is_active (w)) 1385 if (expect_false (ev_is_active (w)))
1304 return; 1386 return;
1305 1387
1306 assert (("ev_io_start called with negative fd", fd >= 0)); 1388 assert (("ev_io_start called with negative fd", fd >= 0));
1307 1389
1308 ev_start (EV_A_ (W)w, 1); 1390 ev_start (EV_A_ (W)w, 1);
… …
1314 1396
1315void 1397void
1316ev_io_stop (EV_P_ struct ev_io *w) 1398ev_io_stop (EV_P_ struct ev_io *w)
1317{ 1399{
1318 ev_clear_pending (EV_A_ (W)w); 1400 ev_clear_pending (EV_A_ (W)w);
1319 if (!ev_is_active (w)) 1401 if (expect_false (!ev_is_active (w)))
1320 return; 1402 return;
1321 1403
1322 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1404 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1323 1405
1324 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1406 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
… …
1328} 1410}
1329 1411
1330void 1412void
1331ev_timer_start (EV_P_ struct ev_timer *w) 1413ev_timer_start (EV_P_ struct ev_timer *w)
1332{ 1414{
1333 if (ev_is_active (w)) 1415 if (expect_false (ev_is_active (w)))
1334 return; 1416 return;
1335 1417
1336 ((WT)w)->at += mn_now; 1418 ((WT)w)->at += mn_now;
1337 1419
1338 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1420 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1339 1421
1340 ev_start (EV_A_ (W)w, ++timercnt); 1422 ev_start (EV_A_ (W)w, ++timercnt);
1341 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1423 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1342 timers [timercnt - 1] = w; 1424 timers [timercnt - 1] = w;
1343 upheap ((WT *)timers, timercnt - 1); 1425 upheap ((WT *)timers, timercnt - 1);
1344 1426
1345 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1427 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1346} 1428}
1347 1429
1348void 1430void
1349ev_timer_stop (EV_P_ struct ev_timer *w) 1431ev_timer_stop (EV_P_ struct ev_timer *w)
1350{ 1432{
1351 ev_clear_pending (EV_A_ (W)w); 1433 ev_clear_pending (EV_A_ (W)w);
1352 if (!ev_is_active (w)) 1434 if (expect_false (!ev_is_active (w)))
1353 return; 1435 return;
1354 1436
1355 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1437 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1356 1438
1357 if (((W)w)->active < timercnt--) 1439 if (expect_true (((W)w)->active < timercnt--))
1358 { 1440 {
1359 timers [((W)w)->active - 1] = timers [timercnt]; 1441 timers [((W)w)->active - 1] = timers [timercnt];
1360 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1442 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1361 } 1443 }
1362 1444
… …
1377 } 1459 }
1378 else 1460 else
1379 ev_timer_stop (EV_A_ w); 1461 ev_timer_stop (EV_A_ w);
1380 } 1462 }
1381 else if (w->repeat) 1463 else if (w->repeat)
1464 {
1465 w->at = w->repeat;
1382 ev_timer_start (EV_A_ w); 1466 ev_timer_start (EV_A_ w);
1467 }
1383} 1468}
1384 1469
1385#if EV_PERIODICS 1470#if EV_PERIODICS
1386void 1471void
1387ev_periodic_start (EV_P_ struct ev_periodic *w) 1472ev_periodic_start (EV_P_ struct ev_periodic *w)
1388{ 1473{
1389 if (ev_is_active (w)) 1474 if (expect_false (ev_is_active (w)))
1390 return; 1475 return;
1391 1476
1392 if (w->reschedule_cb) 1477 if (w->reschedule_cb)
1393 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1478 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1394 else if (w->interval) 1479 else if (w->interval)
… …
1397 /* this formula differs from the one in periodic_reify because we do not always round up */ 1482 /* this formula differs from the one in periodic_reify because we do not always round up */
1398 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1483 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1399 } 1484 }
1400 1485
1401 ev_start (EV_A_ (W)w, ++periodiccnt); 1486 ev_start (EV_A_ (W)w, ++periodiccnt);
1402 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1487 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1403 periodics [periodiccnt - 1] = w; 1488 periodics [periodiccnt - 1] = w;
1404 upheap ((WT *)periodics, periodiccnt - 1); 1489 upheap ((WT *)periodics, periodiccnt - 1);
1405 1490
1406 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1491 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1407} 1492}
1408 1493
1409void 1494void
1410ev_periodic_stop (EV_P_ struct ev_periodic *w) 1495ev_periodic_stop (EV_P_ struct ev_periodic *w)
1411{ 1496{
1412 ev_clear_pending (EV_A_ (W)w); 1497 ev_clear_pending (EV_A_ (W)w);
1413 if (!ev_is_active (w)) 1498 if (expect_false (!ev_is_active (w)))
1414 return; 1499 return;
1415 1500
1416 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1501 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1417 1502
1418 if (((W)w)->active < periodiccnt--) 1503 if (expect_true (((W)w)->active < periodiccnt--))
1419 { 1504 {
1420 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1505 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1421 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1506 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1422 } 1507 }
1423 1508
… …
1434#endif 1519#endif
1435 1520
1436void 1521void
1437ev_idle_start (EV_P_ struct ev_idle *w) 1522ev_idle_start (EV_P_ struct ev_idle *w)
1438{ 1523{
1439 if (ev_is_active (w)) 1524 if (expect_false (ev_is_active (w)))
1440 return; 1525 return;
1441 1526
1442 ev_start (EV_A_ (W)w, ++idlecnt); 1527 ev_start (EV_A_ (W)w, ++idlecnt);
1443 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1528 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1444 idles [idlecnt - 1] = w; 1529 idles [idlecnt - 1] = w;
1445} 1530}
1446 1531
1447void 1532void
1448ev_idle_stop (EV_P_ struct ev_idle *w) 1533ev_idle_stop (EV_P_ struct ev_idle *w)
1449{ 1534{
1450 ev_clear_pending (EV_A_ (W)w); 1535 ev_clear_pending (EV_A_ (W)w);
1451 if (!ev_is_active (w)) 1536 if (expect_false (!ev_is_active (w)))
1452 return; 1537 return;
1453 1538
1454 idles [((W)w)->active - 1] = idles [--idlecnt]; 1539 idles [((W)w)->active - 1] = idles [--idlecnt];
1455 ev_stop (EV_A_ (W)w); 1540 ev_stop (EV_A_ (W)w);
1456} 1541}
1457 1542
1458void 1543void
1459ev_prepare_start (EV_P_ struct ev_prepare *w) 1544ev_prepare_start (EV_P_ struct ev_prepare *w)
1460{ 1545{
1461 if (ev_is_active (w)) 1546 if (expect_false (ev_is_active (w)))
1462 return; 1547 return;
1463 1548
1464 ev_start (EV_A_ (W)w, ++preparecnt); 1549 ev_start (EV_A_ (W)w, ++preparecnt);
1465 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1550 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1466 prepares [preparecnt - 1] = w; 1551 prepares [preparecnt - 1] = w;
1467} 1552}
1468 1553
1469void 1554void
1470ev_prepare_stop (EV_P_ struct ev_prepare *w) 1555ev_prepare_stop (EV_P_ struct ev_prepare *w)
1471{ 1556{
1472 ev_clear_pending (EV_A_ (W)w); 1557 ev_clear_pending (EV_A_ (W)w);
1473 if (!ev_is_active (w)) 1558 if (expect_false (!ev_is_active (w)))
1474 return; 1559 return;
1475 1560
1476 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1561 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1477 ev_stop (EV_A_ (W)w); 1562 ev_stop (EV_A_ (W)w);
1478} 1563}
1479 1564
1480void 1565void
1481ev_check_start (EV_P_ struct ev_check *w) 1566ev_check_start (EV_P_ struct ev_check *w)
1482{ 1567{
1483 if (ev_is_active (w)) 1568 if (expect_false (ev_is_active (w)))
1484 return; 1569 return;
1485 1570
1486 ev_start (EV_A_ (W)w, ++checkcnt); 1571 ev_start (EV_A_ (W)w, ++checkcnt);
1487 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1572 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1488 checks [checkcnt - 1] = w; 1573 checks [checkcnt - 1] = w;
1489} 1574}
1490 1575
1491void 1576void
1492ev_check_stop (EV_P_ struct ev_check *w) 1577ev_check_stop (EV_P_ struct ev_check *w)
1493{ 1578{
1494 ev_clear_pending (EV_A_ (W)w); 1579 ev_clear_pending (EV_A_ (W)w);
1495 if (!ev_is_active (w)) 1580 if (expect_false (!ev_is_active (w)))
1496 return; 1581 return;
1497 1582
1498 checks [((W)w)->active - 1] = checks [--checkcnt]; 1583 checks [((W)w)->active - 1] = checks [--checkcnt];
1499 ev_stop (EV_A_ (W)w); 1584 ev_stop (EV_A_ (W)w);
1500} 1585}
… …
1505 1590
1506void 1591void
1507ev_signal_start (EV_P_ struct ev_signal *w) 1592ev_signal_start (EV_P_ struct ev_signal *w)
1508{ 1593{
1509#if EV_MULTIPLICITY 1594#if EV_MULTIPLICITY
1510 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1595 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1511#endif 1596#endif
1512 if (ev_is_active (w)) 1597 if (expect_false (ev_is_active (w)))
1513 return; 1598 return;
1514 1599
1515 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1600 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1516 1601
1517 ev_start (EV_A_ (W)w, 1); 1602 ev_start (EV_A_ (W)w, 1);
… …
1534 1619
1535void 1620void
1536ev_signal_stop (EV_P_ struct ev_signal *w) 1621ev_signal_stop (EV_P_ struct ev_signal *w)
1537{ 1622{
1538 ev_clear_pending (EV_A_ (W)w); 1623 ev_clear_pending (EV_A_ (W)w);
1539 if (!ev_is_active (w)) 1624 if (expect_false (!ev_is_active (w)))
1540 return; 1625 return;
1541 1626
1542 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1627 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1543 ev_stop (EV_A_ (W)w); 1628 ev_stop (EV_A_ (W)w);
1544 1629
… …
1548 1633
1549void 1634void
1550ev_child_start (EV_P_ struct ev_child *w) 1635ev_child_start (EV_P_ struct ev_child *w)
1551{ 1636{
1552#if EV_MULTIPLICITY 1637#if EV_MULTIPLICITY
1553 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1638 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1554#endif 1639#endif
1555 if (ev_is_active (w)) 1640 if (expect_false (ev_is_active (w)))
1556 return; 1641 return;
1557 1642
1558 ev_start (EV_A_ (W)w, 1); 1643 ev_start (EV_A_ (W)w, 1);
1559 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1644 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1560} 1645}
1561 1646
1562void 1647void
1563ev_child_stop (EV_P_ struct ev_child *w) 1648ev_child_stop (EV_P_ struct ev_child *w)
1564{ 1649{
1565 ev_clear_pending (EV_A_ (W)w); 1650 ev_clear_pending (EV_A_ (W)w);
1566 if (!ev_is_active (w)) 1651 if (expect_false (!ev_is_active (w)))
1567 return; 1652 return;
1568 1653
1569 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1654 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1570 ev_stop (EV_A_ (W)w); 1655 ev_stop (EV_A_ (W)w);
1571} 1656}
… …
1608void 1693void
1609ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1694ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1610{ 1695{
1611 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 1696 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1612 1697
1613 if (!once) 1698 if (expect_false (!once))
1699 {
1614 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1700 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1615 else 1701 return;
1616 { 1702 }
1703
1617 once->cb = cb; 1704 once->cb = cb;
1618 once->arg = arg; 1705 once->arg = arg;
1619 1706
1620 ev_init (&once->io, once_cb_io); 1707 ev_init (&once->io, once_cb_io);
1621 if (fd >= 0) 1708 if (fd >= 0)
1622 { 1709 {
1623 ev_io_set (&once->io, fd, events); 1710 ev_io_set (&once->io, fd, events);
1624 ev_io_start (EV_A_ &once->io); 1711 ev_io_start (EV_A_ &once->io);
1625 } 1712 }
1626 1713
1627 ev_init (&once->to, once_cb_to); 1714 ev_init (&once->to, once_cb_to);
1628 if (timeout >= 0.) 1715 if (timeout >= 0.)
1629 { 1716 {
1630 ev_timer_set (&once->to, timeout, 0.); 1717 ev_timer_set (&once->to, timeout, 0.);
1631 ev_timer_start (EV_A_ &once->to); 1718 ev_timer_start (EV_A_ &once->to);
1632 }
1633 } 1719 }
1634} 1720}
1635 1721
1636#ifdef __cplusplus 1722#ifdef __cplusplus
1637} 1723}

Diff Legend

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