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

Comparing libev/ev.c (file contents):
Revision 1.103 by root, Mon Nov 12 00:31:08 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#endif 135#endif
101 136
102#ifndef EV_USE_POLL 137#ifndef EV_USE_POLL
103# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */ 138# ifdef _WIN32
139# define EV_USE_POLL 0
140# else
141# define EV_USE_POLL 1
142# endif
104#endif 143#endif
105 144
106#ifndef EV_USE_EPOLL 145#ifndef EV_USE_EPOLL
107# define EV_USE_EPOLL 0 146# define EV_USE_EPOLL 0
108#endif 147#endif
109 148
110#ifndef EV_USE_KQUEUE 149#ifndef EV_USE_KQUEUE
111# define EV_USE_KQUEUE 0 150# define EV_USE_KQUEUE 0
112#endif 151#endif
113 152
114#ifndef EV_USE_REALTIME 153#ifndef EV_USE_PORT
115# define EV_USE_REALTIME 1 154# define EV_USE_PORT 0
116#endif 155#endif
117 156
118/**/ 157/**/
119 158
120#ifndef CLOCK_MONOTONIC 159#ifndef CLOCK_MONOTONIC
… …
132#endif 171#endif
133 172
134/**/ 173/**/
135 174
136#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) */
137#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) */
138#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 */
139/*#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 */
140 179
141#ifdef EV_H 180#ifdef EV_H
142# include EV_H 181# include EV_H
143#else 182#else
144# include "ev.h" 183# include "ev.h"
145#endif 184#endif
146 185
147#if __GNUC__ >= 3 186#if __GNUC__ >= 3
148# define expect(expr,value) __builtin_expect ((expr),(value)) 187# define expect(expr,value) __builtin_expect ((expr),(value))
149# define inline inline 188# define inline static inline
150#else 189#else
151# define expect(expr,value) (expr) 190# define expect(expr,value) (expr)
152# define inline static 191# define inline static
153#endif 192#endif
154 193
… …
156#define expect_true(expr) expect ((expr) != 0, 1) 195#define expect_true(expr) expect ((expr) != 0, 1)
157 196
158#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 197#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
159#define ABSPRI(w) ((w)->priority - EV_MINPRI) 198#define ABSPRI(w) ((w)->priority - EV_MINPRI)
160 199
161#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 */
162 202
163typedef struct ev_watcher *W; 203typedef struct ev_watcher *W;
164typedef struct ev_watcher_list *WL; 204typedef struct ev_watcher_list *WL;
165typedef struct ev_watcher_time *WT; 205typedef struct ev_watcher_time *WT;
166 206
… …
246 #include "ev_vars.h" 286 #include "ev_vars.h"
247 #undef VAR 287 #undef VAR
248 }; 288 };
249 #include "ev_wrap.h" 289 #include "ev_wrap.h"
250 290
251 struct ev_loop default_loop_struct; 291 static struct ev_loop default_loop_struct;
252 static struct ev_loop *default_loop; 292 struct ev_loop *ev_default_loop_ptr;
253 293
254#else 294#else
255 295
256 ev_tstamp ev_rt_now; 296 ev_tstamp ev_rt_now;
257 #define VAR(name,decl) static decl; 297 #define VAR(name,decl) static decl;
258 #include "ev_vars.h" 298 #include "ev_vars.h"
259 #undef VAR 299 #undef VAR
260 300
261 static int default_loop; 301 static int ev_default_loop_ptr;
262 302
263#endif 303#endif
264 304
265/*****************************************************************************/ 305/*****************************************************************************/
266 306
… …
299{ 339{
300 return ev_rt_now; 340 return ev_rt_now;
301} 341}
302#endif 342#endif
303 343
304#define array_roundsize(type,n) ((n) | 4 & ~3) 344#define array_roundsize(type,n) (((n) | 4) & ~3)
305 345
306#define array_needsize(type,base,cur,cnt,init) \ 346#define array_needsize(type,base,cur,cnt,init) \
307 if (expect_false ((cnt) > cur)) \ 347 if (expect_false ((cnt) > cur)) \
308 { \ 348 { \
309 int newcnt = cur; \ 349 int newcnt = cur; \
… …
347void 387void
348ev_feed_event (EV_P_ void *w, int revents) 388ev_feed_event (EV_P_ void *w, int revents)
349{ 389{
350 W w_ = (W)w; 390 W w_ = (W)w;
351 391
352 if (w_->pending) 392 if (expect_false (w_->pending))
353 { 393 {
354 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 394 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
355 return; 395 return;
356 } 396 }
357 397
358 w_->pending = ++pendingcnt [ABSPRI (w_)]; 398 w_->pending = ++pendingcnt [ABSPRI (w_)];
359 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);
360 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 400 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
361 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 401 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
362} 402}
363 403
364static void 404static void
… …
391 fd_event (EV_A_ fd, revents); 431 fd_event (EV_A_ fd, revents);
392} 432}
393 433
394/*****************************************************************************/ 434/*****************************************************************************/
395 435
396static void 436inline void
397fd_reify (EV_P) 437fd_reify (EV_P)
398{ 438{
399 int i; 439 int i;
400 440
401 for (i = 0; i < fdchangecnt; ++i) 441 for (i = 0; i < fdchangecnt; ++i)
… …
428} 468}
429 469
430static void 470static void
431fd_change (EV_P_ int fd) 471fd_change (EV_P_ int fd)
432{ 472{
433 if (anfds [fd].reify) 473 if (expect_false (anfds [fd].reify))
434 return; 474 return;
435 475
436 anfds [fd].reify = 1; 476 anfds [fd].reify = 1;
437 477
438 ++fdchangecnt; 478 ++fdchangecnt;
439 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 479 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
440 fdchanges [fdchangecnt - 1] = fd; 480 fdchanges [fdchangecnt - 1] = fd;
441} 481}
442 482
443static void 483static void
444fd_kill (EV_P_ int fd) 484fd_kill (EV_P_ int fd)
… …
450 ev_io_stop (EV_A_ w); 490 ev_io_stop (EV_A_ w);
451 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);
452 } 492 }
453} 493}
454 494
455static int 495inline int
456fd_valid (int fd) 496fd_valid (int fd)
457{ 497{
458#ifdef _WIN32 498#ifdef _WIN32
459 return _get_osfhandle (fd) != -1; 499 return _get_osfhandle (fd) != -1;
460#else 500#else
… …
602ev_feed_signal_event (EV_P_ int signum) 642ev_feed_signal_event (EV_P_ int signum)
603{ 643{
604 WL w; 644 WL w;
605 645
606#if EV_MULTIPLICITY 646#if EV_MULTIPLICITY
607 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));
608#endif 648#endif
609 649
610 --signum; 650 --signum;
611 651
612 if (signum < 0 || signum >= signalmax) 652 if (signum < 0 || signum >= signalmax)
… …
629 for (signum = signalmax; signum--; ) 669 for (signum = signalmax; signum--; )
630 if (signals [signum].gotsig) 670 if (signals [signum].gotsig)
631 ev_feed_signal_event (EV_A_ signum + 1); 671 ev_feed_signal_event (EV_A_ signum + 1);
632} 672}
633 673
634inline void 674static void
635fd_intern (int fd) 675fd_intern (int fd)
636{ 676{
637#ifdef _WIN32 677#ifdef _WIN32
638 int arg = 1; 678 int arg = 1;
639 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 679 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
698 738
699#endif 739#endif
700 740
701/*****************************************************************************/ 741/*****************************************************************************/
702 742
743#if EV_USE_PORT
744# include "ev_port.c"
745#endif
703#if EV_USE_KQUEUE 746#if EV_USE_KQUEUE
704# include "ev_kqueue.c" 747# include "ev_kqueue.c"
705#endif 748#endif
706#if EV_USE_EPOLL 749#if EV_USE_EPOLL
707# include "ev_epoll.c" 750# include "ev_epoll.c"
… …
735 return getuid () != geteuid () 778 return getuid () != geteuid ()
736 || getgid () != getegid (); 779 || getgid () != getegid ();
737#endif 780#endif
738} 781}
739 782
740int 783unsigned int
741ev_method (EV_P) 784ev_supported_backends (void)
742{ 785{
743 return method;
744} 786}
745 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
746static void 820static void
747loop_init (EV_P_ int methods) 821loop_init (EV_P_ unsigned int flags)
748{ 822{
749 if (!method) 823 if (!method)
750 { 824 {
751#if EV_USE_MONOTONIC 825#if EV_USE_MONOTONIC
752 { 826 {
… …
759 ev_rt_now = ev_time (); 833 ev_rt_now = ev_time ();
760 mn_now = get_clock (); 834 mn_now = get_clock ();
761 now_floor = mn_now; 835 now_floor = mn_now;
762 rtmn_diff = ev_rt_now - mn_now; 836 rtmn_diff = ev_rt_now - mn_now;
763 837
764 if (methods == EVMETHOD_AUTO) 838 if (!(flags & EVFLAG_NOENV)
765 if (!enable_secure () && getenv ("LIBEV_METHODS")) 839 && !enable_secure ()
840 && getenv ("LIBEV_FLAGS"))
766 methods = atoi (getenv ("LIBEV_METHODS")); 841 flags = atoi (getenv ("LIBEV_FLAGS"));
767 else 842
768 methods = EVMETHOD_ANY; 843 if (!(flags & 0x0000ffffUL))
844 flags |= ev_recommended_backends ();
769 845
770 method = 0; 846 method = 0;
847#if EV_USE_PORT
848 if (!method && (flags & EVBACKEND_PORT )) method = port_init (EV_A_ flags);
849#endif
771#if EV_USE_KQUEUE 850#if EV_USE_KQUEUE
772 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 851 if (!method && (flags & EVBACKEND_KQUEUE)) method = kqueue_init (EV_A_ flags);
773#endif 852#endif
774#if EV_USE_EPOLL 853#if EV_USE_EPOLL
775 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 854 if (!method && (flags & EVBACKEND_EPOLL )) method = epoll_init (EV_A_ flags);
776#endif 855#endif
777#if EV_USE_POLL 856#if EV_USE_POLL
778 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 857 if (!method && (flags & EVBACKEND_POLL )) method = poll_init (EV_A_ flags);
779#endif 858#endif
780#if EV_USE_SELECT 859#if EV_USE_SELECT
781 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 860 if (!method && (flags & EVBACKEND_SELECT)) method = select_init (EV_A_ flags);
782#endif 861#endif
783 862
784 ev_init (&sigev, sigcb); 863 ev_init (&sigev, sigcb);
785 ev_set_priority (&sigev, EV_MAXPRI); 864 ev_set_priority (&sigev, EV_MAXPRI);
786 } 865 }
787} 866}
788 867
789void 868static void
790loop_destroy (EV_P) 869loop_destroy (EV_P)
791{ 870{
792 int i; 871 int i;
793 872
873#if EV_USE_PORT
874 if (method == EVBACKEND_PORT ) port_destroy (EV_A);
875#endif
794#if EV_USE_KQUEUE 876#if EV_USE_KQUEUE
795 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 877 if (method == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
796#endif 878#endif
797#if EV_USE_EPOLL 879#if EV_USE_EPOLL
798 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 880 if (method == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
799#endif 881#endif
800#if EV_USE_POLL 882#if EV_USE_POLL
801 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 883 if (method == EVBACKEND_POLL ) poll_destroy (EV_A);
802#endif 884#endif
803#if EV_USE_SELECT 885#if EV_USE_SELECT
804 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 886 if (method == EVBACKEND_SELECT) select_destroy (EV_A);
805#endif 887#endif
806 888
807 for (i = NUMPRI; i--; ) 889 for (i = NUMPRI; i--; )
808 array_free (pending, [i]); 890 array_free (pending, [i]);
809 891
810 /* have to use the microsoft-never-gets-it-right macro */ 892 /* have to use the microsoft-never-gets-it-right macro */
811 array_free (fdchange, EMPTY); 893 array_free (fdchange, EMPTY0);
812 array_free (timer, EMPTY); 894 array_free (timer, EMPTY0);
813#if EV_PERIODICS 895#if EV_PERIODICS
814 array_free (periodic, EMPTY); 896 array_free (periodic, EMPTY0);
815#endif 897#endif
816 array_free (idle, EMPTY); 898 array_free (idle, EMPTY0);
817 array_free (prepare, EMPTY); 899 array_free (prepare, EMPTY0);
818 array_free (check, EMPTY); 900 array_free (check, EMPTY0);
819 901
820 method = 0; 902 method = 0;
821} 903}
822 904
823static void 905static void
824loop_fork (EV_P) 906loop_fork (EV_P)
825{ 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
826#if EV_USE_EPOLL 914#if EV_USE_EPOLL
827 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 915 if (method == EVBACKEND_EPOLL ) epoll_fork (EV_A);
828#endif
829#if EV_USE_KQUEUE
830 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
831#endif 916#endif
832 917
833 if (ev_is_active (&sigev)) 918 if (ev_is_active (&sigev))
834 { 919 {
835 /* default loop */ 920 /* default loop */
… …
848 postfork = 0; 933 postfork = 0;
849} 934}
850 935
851#if EV_MULTIPLICITY 936#if EV_MULTIPLICITY
852struct ev_loop * 937struct ev_loop *
853ev_loop_new (int methods) 938ev_loop_new (unsigned int flags)
854{ 939{
855 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));
856 941
857 memset (loop, 0, sizeof (struct ev_loop)); 942 memset (loop, 0, sizeof (struct ev_loop));
858 943
859 loop_init (EV_A_ methods); 944 loop_init (EV_A_ flags);
860 945
861 if (ev_method (EV_A)) 946 if (ev_method (EV_A))
862 return loop; 947 return loop;
863 948
864 return 0; 949 return 0;
… …
879 964
880#endif 965#endif
881 966
882#if EV_MULTIPLICITY 967#if EV_MULTIPLICITY
883struct ev_loop * 968struct ev_loop *
969ev_default_loop_init (unsigned int flags)
884#else 970#else
885int 971int
972ev_default_loop (unsigned int flags)
886#endif 973#endif
887ev_default_loop (int methods)
888{ 974{
889 if (sigpipe [0] == sigpipe [1]) 975 if (sigpipe [0] == sigpipe [1])
890 if (pipe (sigpipe)) 976 if (pipe (sigpipe))
891 return 0; 977 return 0;
892 978
893 if (!default_loop) 979 if (!ev_default_loop_ptr)
894 { 980 {
895#if EV_MULTIPLICITY 981#if EV_MULTIPLICITY
896 struct ev_loop *loop = default_loop = &default_loop_struct; 982 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
897#else 983#else
898 default_loop = 1; 984 ev_default_loop_ptr = 1;
899#endif 985#endif
900 986
901 loop_init (EV_A_ methods); 987 loop_init (EV_A_ flags);
902 988
903 if (ev_method (EV_A)) 989 if (ev_method (EV_A))
904 { 990 {
905 siginit (EV_A); 991 siginit (EV_A);
906 992
… …
910 ev_signal_start (EV_A_ &childev); 996 ev_signal_start (EV_A_ &childev);
911 ev_unref (EV_A); /* child watcher should not keep loop alive */ 997 ev_unref (EV_A); /* child watcher should not keep loop alive */
912#endif 998#endif
913 } 999 }
914 else 1000 else
915 default_loop = 0; 1001 ev_default_loop_ptr = 0;
916 } 1002 }
917 1003
918 return default_loop; 1004 return ev_default_loop_ptr;
919} 1005}
920 1006
921void 1007void
922ev_default_destroy (void) 1008ev_default_destroy (void)
923{ 1009{
924#if EV_MULTIPLICITY 1010#if EV_MULTIPLICITY
925 struct ev_loop *loop = default_loop; 1011 struct ev_loop *loop = ev_default_loop_ptr;
926#endif 1012#endif
927 1013
928#ifndef _WIN32 1014#ifndef _WIN32
929 ev_ref (EV_A); /* child watcher */ 1015 ev_ref (EV_A); /* child watcher */
930 ev_signal_stop (EV_A_ &childev); 1016 ev_signal_stop (EV_A_ &childev);
… …
941 1027
942void 1028void
943ev_default_fork (void) 1029ev_default_fork (void)
944{ 1030{
945#if EV_MULTIPLICITY 1031#if EV_MULTIPLICITY
946 struct ev_loop *loop = default_loop; 1032 struct ev_loop *loop = ev_default_loop_ptr;
947#endif 1033#endif
948 1034
949 if (method) 1035 if (method)
950 postfork = 1; 1036 postfork = 1;
951} 1037}
… …
962 return 1; 1048 return 1;
963 1049
964 return 0; 1050 return 0;
965} 1051}
966 1052
967static void 1053inline void
968call_pending (EV_P) 1054call_pending (EV_P)
969{ 1055{
970 int pri; 1056 int pri;
971 1057
972 for (pri = NUMPRI; pri--; ) 1058 for (pri = NUMPRI; pri--; )
973 while (pendingcnt [pri]) 1059 while (pendingcnt [pri])
974 { 1060 {
975 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1061 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
976 1062
977 if (p->w) 1063 if (expect_true (p->w))
978 { 1064 {
979 p->w->pending = 0; 1065 p->w->pending = 0;
980 EV_CB_INVOKE (p->w, p->events); 1066 EV_CB_INVOKE (p->w, p->events);
981 } 1067 }
982 } 1068 }
983} 1069}
984 1070
985static void 1071inline void
986timers_reify (EV_P) 1072timers_reify (EV_P)
987{ 1073{
988 while (timercnt && ((WT)timers [0])->at <= mn_now) 1074 while (timercnt && ((WT)timers [0])->at <= mn_now)
989 { 1075 {
990 struct ev_timer *w = timers [0]; 1076 struct ev_timer *w = timers [0];
… …
1008 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1094 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1009 } 1095 }
1010} 1096}
1011 1097
1012#if EV_PERIODICS 1098#if EV_PERIODICS
1013static void 1099inline void
1014periodics_reify (EV_P) 1100periodics_reify (EV_P)
1015{ 1101{
1016 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1102 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1017 { 1103 {
1018 struct ev_periodic *w = periodics [0]; 1104 struct ev_periodic *w = periodics [0];
… …
1020 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1106 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
1021 1107
1022 /* first reschedule or stop timer */ 1108 /* first reschedule or stop timer */
1023 if (w->reschedule_cb) 1109 if (w->reschedule_cb)
1024 { 1110 {
1025 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);
1026
1027 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));
1028 downheap ((WT *)periodics, periodiccnt, 0); 1113 downheap ((WT *)periodics, periodiccnt, 0);
1029 } 1114 }
1030 else if (w->interval) 1115 else if (w->interval)
1031 { 1116 {
… …
1078 ev_rt_now = ev_time (); 1163 ev_rt_now = ev_time ();
1079 return 1; 1164 return 1;
1080 } 1165 }
1081} 1166}
1082 1167
1083static void 1168inline void
1084time_update (EV_P) 1169time_update (EV_P)
1085{ 1170{
1086 int i; 1171 int i;
1087 1172
1088#if EV_USE_MONOTONIC 1173#if EV_USE_MONOTONIC
… …
1149ev_loop (EV_P_ int flags) 1234ev_loop (EV_P_ int flags)
1150{ 1235{
1151 double block; 1236 double block;
1152 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1237 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1153 1238
1154 do 1239 while (activecnt)
1155 { 1240 {
1156 /* queue check watchers (and execute them) */ 1241 /* queue check watchers (and execute them) */
1157 if (expect_false (preparecnt)) 1242 if (expect_false (preparecnt))
1158 { 1243 {
1159 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1244 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
… …
1199 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;
1200 if (block > to) block = to; 1285 if (block > to) block = to;
1201 } 1286 }
1202#endif 1287#endif
1203 1288
1204 if (block < 0.) block = 0.; 1289 if (expect_false (block < 0.)) block = 0.;
1205 } 1290 }
1206 1291
1207 method_poll (EV_A_ block); 1292 method_poll (EV_A_ block);
1208 1293
1209 /* update ev_rt_now, do magic */ 1294 /* update ev_rt_now, do magic */
… …
1218 /* queue idle watchers unless io or timers are pending */ 1303 /* queue idle watchers unless io or timers are pending */
1219 if (idlecnt && !any_pending (EV_A)) 1304 if (idlecnt && !any_pending (EV_A))
1220 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1305 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1221 1306
1222 /* queue check watchers, to be executed first */ 1307 /* queue check watchers, to be executed first */
1223 if (checkcnt) 1308 if (expect_false (checkcnt))
1224 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1309 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1225 1310
1226 call_pending (EV_A); 1311 call_pending (EV_A);
1312
1313 if (expect_false (loop_done))
1314 break;
1227 } 1315 }
1228 while (activecnt && !loop_done);
1229 1316
1230 if (loop_done != 2) 1317 if (loop_done != 2)
1231 loop_done = 0; 1318 loop_done = 0;
1232} 1319}
1233 1320
… …
1293void 1380void
1294ev_io_start (EV_P_ struct ev_io *w) 1381ev_io_start (EV_P_ struct ev_io *w)
1295{ 1382{
1296 int fd = w->fd; 1383 int fd = w->fd;
1297 1384
1298 if (ev_is_active (w)) 1385 if (expect_false (ev_is_active (w)))
1299 return; 1386 return;
1300 1387
1301 assert (("ev_io_start called with negative fd", fd >= 0)); 1388 assert (("ev_io_start called with negative fd", fd >= 0));
1302 1389
1303 ev_start (EV_A_ (W)w, 1); 1390 ev_start (EV_A_ (W)w, 1);
… …
1309 1396
1310void 1397void
1311ev_io_stop (EV_P_ struct ev_io *w) 1398ev_io_stop (EV_P_ struct ev_io *w)
1312{ 1399{
1313 ev_clear_pending (EV_A_ (W)w); 1400 ev_clear_pending (EV_A_ (W)w);
1314 if (!ev_is_active (w)) 1401 if (expect_false (!ev_is_active (w)))
1315 return; 1402 return;
1316 1403
1317 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));
1318 1405
1319 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1406 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
… …
1323} 1410}
1324 1411
1325void 1412void
1326ev_timer_start (EV_P_ struct ev_timer *w) 1413ev_timer_start (EV_P_ struct ev_timer *w)
1327{ 1414{
1328 if (ev_is_active (w)) 1415 if (expect_false (ev_is_active (w)))
1329 return; 1416 return;
1330 1417
1331 ((WT)w)->at += mn_now; 1418 ((WT)w)->at += mn_now;
1332 1419
1333 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.));
1334 1421
1335 ev_start (EV_A_ (W)w, ++timercnt); 1422 ev_start (EV_A_ (W)w, ++timercnt);
1336 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1423 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1337 timers [timercnt - 1] = w; 1424 timers [timercnt - 1] = w;
1338 upheap ((WT *)timers, timercnt - 1); 1425 upheap ((WT *)timers, timercnt - 1);
1339 1426
1340 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1427 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1341} 1428}
1342 1429
1343void 1430void
1344ev_timer_stop (EV_P_ struct ev_timer *w) 1431ev_timer_stop (EV_P_ struct ev_timer *w)
1345{ 1432{
1346 ev_clear_pending (EV_A_ (W)w); 1433 ev_clear_pending (EV_A_ (W)w);
1347 if (!ev_is_active (w)) 1434 if (expect_false (!ev_is_active (w)))
1348 return; 1435 return;
1349 1436
1350 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1437 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1351 1438
1352 if (((W)w)->active < timercnt--) 1439 if (expect_true (((W)w)->active < timercnt--))
1353 { 1440 {
1354 timers [((W)w)->active - 1] = timers [timercnt]; 1441 timers [((W)w)->active - 1] = timers [timercnt];
1355 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1442 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1356 } 1443 }
1357 1444
… …
1372 } 1459 }
1373 else 1460 else
1374 ev_timer_stop (EV_A_ w); 1461 ev_timer_stop (EV_A_ w);
1375 } 1462 }
1376 else if (w->repeat) 1463 else if (w->repeat)
1464 {
1465 w->at = w->repeat;
1377 ev_timer_start (EV_A_ w); 1466 ev_timer_start (EV_A_ w);
1467 }
1378} 1468}
1379 1469
1380#if EV_PERIODICS 1470#if EV_PERIODICS
1381void 1471void
1382ev_periodic_start (EV_P_ struct ev_periodic *w) 1472ev_periodic_start (EV_P_ struct ev_periodic *w)
1383{ 1473{
1384 if (ev_is_active (w)) 1474 if (expect_false (ev_is_active (w)))
1385 return; 1475 return;
1386 1476
1387 if (w->reschedule_cb) 1477 if (w->reschedule_cb)
1388 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1478 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1389 else if (w->interval) 1479 else if (w->interval)
… …
1392 /* 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 */
1393 ((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;
1394 } 1484 }
1395 1485
1396 ev_start (EV_A_ (W)w, ++periodiccnt); 1486 ev_start (EV_A_ (W)w, ++periodiccnt);
1397 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1487 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1398 periodics [periodiccnt - 1] = w; 1488 periodics [periodiccnt - 1] = w;
1399 upheap ((WT *)periodics, periodiccnt - 1); 1489 upheap ((WT *)periodics, periodiccnt - 1);
1400 1490
1401 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1491 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1402} 1492}
1403 1493
1404void 1494void
1405ev_periodic_stop (EV_P_ struct ev_periodic *w) 1495ev_periodic_stop (EV_P_ struct ev_periodic *w)
1406{ 1496{
1407 ev_clear_pending (EV_A_ (W)w); 1497 ev_clear_pending (EV_A_ (W)w);
1408 if (!ev_is_active (w)) 1498 if (expect_false (!ev_is_active (w)))
1409 return; 1499 return;
1410 1500
1411 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1501 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1412 1502
1413 if (((W)w)->active < periodiccnt--) 1503 if (expect_true (((W)w)->active < periodiccnt--))
1414 { 1504 {
1415 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1505 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1416 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1506 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1417 } 1507 }
1418 1508
… …
1429#endif 1519#endif
1430 1520
1431void 1521void
1432ev_idle_start (EV_P_ struct ev_idle *w) 1522ev_idle_start (EV_P_ struct ev_idle *w)
1433{ 1523{
1434 if (ev_is_active (w)) 1524 if (expect_false (ev_is_active (w)))
1435 return; 1525 return;
1436 1526
1437 ev_start (EV_A_ (W)w, ++idlecnt); 1527 ev_start (EV_A_ (W)w, ++idlecnt);
1438 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1528 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1439 idles [idlecnt - 1] = w; 1529 idles [idlecnt - 1] = w;
1440} 1530}
1441 1531
1442void 1532void
1443ev_idle_stop (EV_P_ struct ev_idle *w) 1533ev_idle_stop (EV_P_ struct ev_idle *w)
1444{ 1534{
1445 ev_clear_pending (EV_A_ (W)w); 1535 ev_clear_pending (EV_A_ (W)w);
1446 if (!ev_is_active (w)) 1536 if (expect_false (!ev_is_active (w)))
1447 return; 1537 return;
1448 1538
1449 idles [((W)w)->active - 1] = idles [--idlecnt]; 1539 idles [((W)w)->active - 1] = idles [--idlecnt];
1450 ev_stop (EV_A_ (W)w); 1540 ev_stop (EV_A_ (W)w);
1451} 1541}
1452 1542
1453void 1543void
1454ev_prepare_start (EV_P_ struct ev_prepare *w) 1544ev_prepare_start (EV_P_ struct ev_prepare *w)
1455{ 1545{
1456 if (ev_is_active (w)) 1546 if (expect_false (ev_is_active (w)))
1457 return; 1547 return;
1458 1548
1459 ev_start (EV_A_ (W)w, ++preparecnt); 1549 ev_start (EV_A_ (W)w, ++preparecnt);
1460 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1550 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1461 prepares [preparecnt - 1] = w; 1551 prepares [preparecnt - 1] = w;
1462} 1552}
1463 1553
1464void 1554void
1465ev_prepare_stop (EV_P_ struct ev_prepare *w) 1555ev_prepare_stop (EV_P_ struct ev_prepare *w)
1466{ 1556{
1467 ev_clear_pending (EV_A_ (W)w); 1557 ev_clear_pending (EV_A_ (W)w);
1468 if (!ev_is_active (w)) 1558 if (expect_false (!ev_is_active (w)))
1469 return; 1559 return;
1470 1560
1471 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1561 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1472 ev_stop (EV_A_ (W)w); 1562 ev_stop (EV_A_ (W)w);
1473} 1563}
1474 1564
1475void 1565void
1476ev_check_start (EV_P_ struct ev_check *w) 1566ev_check_start (EV_P_ struct ev_check *w)
1477{ 1567{
1478 if (ev_is_active (w)) 1568 if (expect_false (ev_is_active (w)))
1479 return; 1569 return;
1480 1570
1481 ev_start (EV_A_ (W)w, ++checkcnt); 1571 ev_start (EV_A_ (W)w, ++checkcnt);
1482 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1572 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1483 checks [checkcnt - 1] = w; 1573 checks [checkcnt - 1] = w;
1484} 1574}
1485 1575
1486void 1576void
1487ev_check_stop (EV_P_ struct ev_check *w) 1577ev_check_stop (EV_P_ struct ev_check *w)
1488{ 1578{
1489 ev_clear_pending (EV_A_ (W)w); 1579 ev_clear_pending (EV_A_ (W)w);
1490 if (!ev_is_active (w)) 1580 if (expect_false (!ev_is_active (w)))
1491 return; 1581 return;
1492 1582
1493 checks [((W)w)->active - 1] = checks [--checkcnt]; 1583 checks [((W)w)->active - 1] = checks [--checkcnt];
1494 ev_stop (EV_A_ (W)w); 1584 ev_stop (EV_A_ (W)w);
1495} 1585}
… …
1500 1590
1501void 1591void
1502ev_signal_start (EV_P_ struct ev_signal *w) 1592ev_signal_start (EV_P_ struct ev_signal *w)
1503{ 1593{
1504#if EV_MULTIPLICITY 1594#if EV_MULTIPLICITY
1505 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));
1506#endif 1596#endif
1507 if (ev_is_active (w)) 1597 if (expect_false (ev_is_active (w)))
1508 return; 1598 return;
1509 1599
1510 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));
1511 1601
1512 ev_start (EV_A_ (W)w, 1); 1602 ev_start (EV_A_ (W)w, 1);
… …
1529 1619
1530void 1620void
1531ev_signal_stop (EV_P_ struct ev_signal *w) 1621ev_signal_stop (EV_P_ struct ev_signal *w)
1532{ 1622{
1533 ev_clear_pending (EV_A_ (W)w); 1623 ev_clear_pending (EV_A_ (W)w);
1534 if (!ev_is_active (w)) 1624 if (expect_false (!ev_is_active (w)))
1535 return; 1625 return;
1536 1626
1537 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1627 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1538 ev_stop (EV_A_ (W)w); 1628 ev_stop (EV_A_ (W)w);
1539 1629
… …
1543 1633
1544void 1634void
1545ev_child_start (EV_P_ struct ev_child *w) 1635ev_child_start (EV_P_ struct ev_child *w)
1546{ 1636{
1547#if EV_MULTIPLICITY 1637#if EV_MULTIPLICITY
1548 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));
1549#endif 1639#endif
1550 if (ev_is_active (w)) 1640 if (expect_false (ev_is_active (w)))
1551 return; 1641 return;
1552 1642
1553 ev_start (EV_A_ (W)w, 1); 1643 ev_start (EV_A_ (W)w, 1);
1554 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1644 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1555} 1645}
1556 1646
1557void 1647void
1558ev_child_stop (EV_P_ struct ev_child *w) 1648ev_child_stop (EV_P_ struct ev_child *w)
1559{ 1649{
1560 ev_clear_pending (EV_A_ (W)w); 1650 ev_clear_pending (EV_A_ (W)w);
1561 if (!ev_is_active (w)) 1651 if (expect_false (!ev_is_active (w)))
1562 return; 1652 return;
1563 1653
1564 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1654 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1565 ev_stop (EV_A_ (W)w); 1655 ev_stop (EV_A_ (W)w);
1566} 1656}
… …
1603void 1693void
1604ev_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)
1605{ 1695{
1606 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));
1607 1697
1608 if (!once) 1698 if (expect_false (!once))
1699 {
1609 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1700 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1610 else 1701 return;
1611 { 1702 }
1703
1612 once->cb = cb; 1704 once->cb = cb;
1613 once->arg = arg; 1705 once->arg = arg;
1614 1706
1615 ev_init (&once->io, once_cb_io); 1707 ev_init (&once->io, once_cb_io);
1616 if (fd >= 0) 1708 if (fd >= 0)
1617 { 1709 {
1618 ev_io_set (&once->io, fd, events); 1710 ev_io_set (&once->io, fd, events);
1619 ev_io_start (EV_A_ &once->io); 1711 ev_io_start (EV_A_ &once->io);
1620 } 1712 }
1621 1713
1622 ev_init (&once->to, once_cb_to); 1714 ev_init (&once->to, once_cb_to);
1623 if (timeout >= 0.) 1715 if (timeout >= 0.)
1624 { 1716 {
1625 ev_timer_set (&once->to, timeout, 0.); 1717 ev_timer_set (&once->to, timeout, 0.);
1626 ev_timer_start (EV_A_ &once->to); 1718 ev_timer_start (EV_A_ &once->to);
1627 }
1628 } 1719 }
1629} 1720}
1630 1721
1631#ifdef __cplusplus 1722#ifdef __cplusplus
1632} 1723}

Diff Legend

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