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

Comparing libev/ev.c (file contents):
Revision 1.107 by root, Mon Nov 12 01:20:25 2007 UTC vs.
Revision 1.127 by root, Sun Nov 18 02:17:57 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/* darwin simply cannot be helped */ 159/* darwin simply cannot be helped */
… …
143#endif 177#endif
144 178
145/**/ 179/**/
146 180
147#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 181#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) */ 182#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 */ 183#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 */ 184/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
151 185
152#ifdef EV_H 186#ifdef EV_H
153# include EV_H 187# include EV_H
154#else 188#else
155# include "ev.h" 189# include "ev.h"
156#endif 190#endif
157 191
158#if __GNUC__ >= 3 192#if __GNUC__ >= 3
159# define expect(expr,value) __builtin_expect ((expr),(value)) 193# define expect(expr,value) __builtin_expect ((expr),(value))
160# define inline inline 194# define inline static inline
161#else 195#else
162# define expect(expr,value) (expr) 196# define expect(expr,value) (expr)
163# define inline static 197# define inline static
164#endif 198#endif
165 199
… …
167#define expect_true(expr) expect ((expr) != 0, 1) 201#define expect_true(expr) expect ((expr) != 0, 1)
168 202
169#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 203#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
170#define ABSPRI(w) ((w)->priority - EV_MINPRI) 204#define ABSPRI(w) ((w)->priority - EV_MINPRI)
171 205
172#define EMPTY /* required for microsofts broken pseudo-c compiler */ 206#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
207#define EMPTY2(a,b) /* used to suppress some warnings */
173 208
174typedef struct ev_watcher *W; 209typedef struct ev_watcher *W;
175typedef struct ev_watcher_list *WL; 210typedef struct ev_watcher_list *WL;
176typedef struct ev_watcher_time *WT; 211typedef struct ev_watcher_time *WT;
177 212
… …
257 #include "ev_vars.h" 292 #include "ev_vars.h"
258 #undef VAR 293 #undef VAR
259 }; 294 };
260 #include "ev_wrap.h" 295 #include "ev_wrap.h"
261 296
262 struct ev_loop default_loop_struct; 297 static struct ev_loop default_loop_struct;
263 static struct ev_loop *default_loop; 298 struct ev_loop *ev_default_loop_ptr;
264 299
265#else 300#else
266 301
267 ev_tstamp ev_rt_now; 302 ev_tstamp ev_rt_now;
268 #define VAR(name,decl) static decl; 303 #define VAR(name,decl) static decl;
269 #include "ev_vars.h" 304 #include "ev_vars.h"
270 #undef VAR 305 #undef VAR
271 306
272 static int default_loop; 307 static int ev_default_loop_ptr;
273 308
274#endif 309#endif
275 310
276/*****************************************************************************/ 311/*****************************************************************************/
277 312
… …
310{ 345{
311 return ev_rt_now; 346 return ev_rt_now;
312} 347}
313#endif 348#endif
314 349
315#define array_roundsize(type,n) ((n) | 4 & ~3) 350#define array_roundsize(type,n) (((n) | 4) & ~3)
316 351
317#define array_needsize(type,base,cur,cnt,init) \ 352#define array_needsize(type,base,cur,cnt,init) \
318 if (expect_false ((cnt) > cur)) \ 353 if (expect_false ((cnt) > cur)) \
319 { \ 354 { \
320 int newcnt = cur; \ 355 int newcnt = cur; \
… …
358void 393void
359ev_feed_event (EV_P_ void *w, int revents) 394ev_feed_event (EV_P_ void *w, int revents)
360{ 395{
361 W w_ = (W)w; 396 W w_ = (W)w;
362 397
363 if (w_->pending) 398 if (expect_false (w_->pending))
364 { 399 {
365 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 400 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
366 return; 401 return;
367 } 402 }
368 403
369 w_->pending = ++pendingcnt [ABSPRI (w_)]; 404 w_->pending = ++pendingcnt [ABSPRI (w_)];
370 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void)); 405 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
371 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 406 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
372 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 407 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
373} 408}
374 409
375static void 410static void
… …
402 fd_event (EV_A_ fd, revents); 437 fd_event (EV_A_ fd, revents);
403} 438}
404 439
405/*****************************************************************************/ 440/*****************************************************************************/
406 441
407static void 442inline void
408fd_reify (EV_P) 443fd_reify (EV_P)
409{ 444{
410 int i; 445 int i;
411 446
412 for (i = 0; i < fdchangecnt; ++i) 447 for (i = 0; i < fdchangecnt; ++i)
… …
439} 474}
440 475
441static void 476static void
442fd_change (EV_P_ int fd) 477fd_change (EV_P_ int fd)
443{ 478{
444 if (anfds [fd].reify) 479 if (expect_false (anfds [fd].reify))
445 return; 480 return;
446 481
447 anfds [fd].reify = 1; 482 anfds [fd].reify = 1;
448 483
449 ++fdchangecnt; 484 ++fdchangecnt;
450 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 485 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
451 fdchanges [fdchangecnt - 1] = fd; 486 fdchanges [fdchangecnt - 1] = fd;
452} 487}
453 488
454static void 489static void
455fd_kill (EV_P_ int fd) 490fd_kill (EV_P_ int fd)
… …
461 ev_io_stop (EV_A_ w); 496 ev_io_stop (EV_A_ w);
462 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 497 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
463 } 498 }
464} 499}
465 500
466static int 501inline int
467fd_valid (int fd) 502fd_valid (int fd)
468{ 503{
469#ifdef _WIN32 504#ifdef _WIN32
470 return _get_osfhandle (fd) != -1; 505 return _get_osfhandle (fd) != -1;
471#else 506#else
… …
613ev_feed_signal_event (EV_P_ int signum) 648ev_feed_signal_event (EV_P_ int signum)
614{ 649{
615 WL w; 650 WL w;
616 651
617#if EV_MULTIPLICITY 652#if EV_MULTIPLICITY
618 assert (("feeding signal events is only supported in the default loop", loop == default_loop)); 653 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
619#endif 654#endif
620 655
621 --signum; 656 --signum;
622 657
623 if (signum < 0 || signum >= signalmax) 658 if (signum < 0 || signum >= signalmax)
… …
640 for (signum = signalmax; signum--; ) 675 for (signum = signalmax; signum--; )
641 if (signals [signum].gotsig) 676 if (signals [signum].gotsig)
642 ev_feed_signal_event (EV_A_ signum + 1); 677 ev_feed_signal_event (EV_A_ signum + 1);
643} 678}
644 679
645inline void 680static void
646fd_intern (int fd) 681fd_intern (int fd)
647{ 682{
648#ifdef _WIN32 683#ifdef _WIN32
649 int arg = 1; 684 int arg = 1;
650 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 685 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
709 744
710#endif 745#endif
711 746
712/*****************************************************************************/ 747/*****************************************************************************/
713 748
749#if EV_USE_PORT
750# include "ev_port.c"
751#endif
714#if EV_USE_KQUEUE 752#if EV_USE_KQUEUE
715# include "ev_kqueue.c" 753# include "ev_kqueue.c"
716#endif 754#endif
717#if EV_USE_EPOLL 755#if EV_USE_EPOLL
718# include "ev_epoll.c" 756# include "ev_epoll.c"
… …
746 return getuid () != geteuid () 784 return getuid () != geteuid ()
747 || getgid () != getegid (); 785 || getgid () != getegid ();
748#endif 786#endif
749} 787}
750 788
751int 789unsigned int
752ev_method (EV_P) 790ev_method (EV_P)
753{ 791{
754 return method; 792 return method;
755} 793}
756 794
757static void 795static void
758loop_init (EV_P_ int methods) 796loop_init (EV_P_ unsigned int flags)
759{ 797{
760 if (!method) 798 if (!method)
761 { 799 {
762#if EV_USE_MONOTONIC 800#if EV_USE_MONOTONIC
763 { 801 {
… …
770 ev_rt_now = ev_time (); 808 ev_rt_now = ev_time ();
771 mn_now = get_clock (); 809 mn_now = get_clock ();
772 now_floor = mn_now; 810 now_floor = mn_now;
773 rtmn_diff = ev_rt_now - mn_now; 811 rtmn_diff = ev_rt_now - mn_now;
774 812
775 if (methods == EVMETHOD_AUTO) 813 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS"))
776 if (!enable_secure () && getenv ("LIBEV_METHODS"))
777 methods = atoi (getenv ("LIBEV_METHODS")); 814 flags = atoi (getenv ("LIBEV_FLAGS"));
778 else 815
779 methods = EVMETHOD_ANY; 816 if (!(flags & 0x0000ffff))
817 flags |= 0x0000ffff;
780 818
781 method = 0; 819 method = 0;
820#if EV_USE_PORT
821 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags);
822#endif
782#if EV_USE_KQUEUE 823#if EV_USE_KQUEUE
783 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 824 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
784#endif 825#endif
785#if EV_USE_EPOLL 826#if EV_USE_EPOLL
786 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 827 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
787#endif 828#endif
788#if EV_USE_POLL 829#if EV_USE_POLL
789 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 830 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags);
790#endif 831#endif
791#if EV_USE_SELECT 832#if EV_USE_SELECT
792 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 833 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
793#endif 834#endif
794 835
795 ev_init (&sigev, sigcb); 836 ev_init (&sigev, sigcb);
796 ev_set_priority (&sigev, EV_MAXPRI); 837 ev_set_priority (&sigev, EV_MAXPRI);
797 } 838 }
798} 839}
799 840
800void 841static void
801loop_destroy (EV_P) 842loop_destroy (EV_P)
802{ 843{
803 int i; 844 int i;
804 845
846#if EV_USE_PORT
847 if (method == EVMETHOD_PORT ) port_destroy (EV_A);
848#endif
805#if EV_USE_KQUEUE 849#if EV_USE_KQUEUE
806 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 850 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
807#endif 851#endif
808#if EV_USE_EPOLL 852#if EV_USE_EPOLL
809 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 853 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
… …
817 861
818 for (i = NUMPRI; i--; ) 862 for (i = NUMPRI; i--; )
819 array_free (pending, [i]); 863 array_free (pending, [i]);
820 864
821 /* have to use the microsoft-never-gets-it-right macro */ 865 /* have to use the microsoft-never-gets-it-right macro */
822 array_free (fdchange, EMPTY); 866 array_free (fdchange, EMPTY0);
823 array_free (timer, EMPTY); 867 array_free (timer, EMPTY0);
824#if EV_PERIODICS 868#if EV_PERIODICS
825 array_free (periodic, EMPTY); 869 array_free (periodic, EMPTY0);
826#endif 870#endif
827 array_free (idle, EMPTY); 871 array_free (idle, EMPTY0);
828 array_free (prepare, EMPTY); 872 array_free (prepare, EMPTY0);
829 array_free (check, EMPTY); 873 array_free (check, EMPTY0);
830 874
831 method = 0; 875 method = 0;
832} 876}
833 877
834static void 878static void
835loop_fork (EV_P) 879loop_fork (EV_P)
836{ 880{
881#if EV_USE_PORT
882 if (method == EVMETHOD_PORT ) port_fork (EV_A);
883#endif
884#if EV_USE_KQUEUE
885 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
886#endif
837#if EV_USE_EPOLL 887#if EV_USE_EPOLL
838 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 888 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
839#endif
840#if EV_USE_KQUEUE
841 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
842#endif 889#endif
843 890
844 if (ev_is_active (&sigev)) 891 if (ev_is_active (&sigev))
845 { 892 {
846 /* default loop */ 893 /* default loop */
… …
859 postfork = 0; 906 postfork = 0;
860} 907}
861 908
862#if EV_MULTIPLICITY 909#if EV_MULTIPLICITY
863struct ev_loop * 910struct ev_loop *
864ev_loop_new (int methods) 911ev_loop_new (unsigned int flags)
865{ 912{
866 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 913 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
867 914
868 memset (loop, 0, sizeof (struct ev_loop)); 915 memset (loop, 0, sizeof (struct ev_loop));
869 916
870 loop_init (EV_A_ methods); 917 loop_init (EV_A_ flags);
871 918
872 if (ev_method (EV_A)) 919 if (ev_method (EV_A))
873 return loop; 920 return loop;
874 921
875 return 0; 922 return 0;
… …
890 937
891#endif 938#endif
892 939
893#if EV_MULTIPLICITY 940#if EV_MULTIPLICITY
894struct ev_loop * 941struct ev_loop *
942ev_default_loop_init (unsigned int flags)
895#else 943#else
896int 944int
945ev_default_loop (unsigned int flags)
897#endif 946#endif
898ev_default_loop (int methods)
899{ 947{
900 if (sigpipe [0] == sigpipe [1]) 948 if (sigpipe [0] == sigpipe [1])
901 if (pipe (sigpipe)) 949 if (pipe (sigpipe))
902 return 0; 950 return 0;
903 951
904 if (!default_loop) 952 if (!ev_default_loop_ptr)
905 { 953 {
906#if EV_MULTIPLICITY 954#if EV_MULTIPLICITY
907 struct ev_loop *loop = default_loop = &default_loop_struct; 955 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
908#else 956#else
909 default_loop = 1; 957 ev_default_loop_ptr = 1;
910#endif 958#endif
911 959
912 loop_init (EV_A_ methods); 960 loop_init (EV_A_ flags);
913 961
914 if (ev_method (EV_A)) 962 if (ev_method (EV_A))
915 { 963 {
916 siginit (EV_A); 964 siginit (EV_A);
917 965
… …
921 ev_signal_start (EV_A_ &childev); 969 ev_signal_start (EV_A_ &childev);
922 ev_unref (EV_A); /* child watcher should not keep loop alive */ 970 ev_unref (EV_A); /* child watcher should not keep loop alive */
923#endif 971#endif
924 } 972 }
925 else 973 else
926 default_loop = 0; 974 ev_default_loop_ptr = 0;
927 } 975 }
928 976
929 return default_loop; 977 return ev_default_loop_ptr;
930} 978}
931 979
932void 980void
933ev_default_destroy (void) 981ev_default_destroy (void)
934{ 982{
935#if EV_MULTIPLICITY 983#if EV_MULTIPLICITY
936 struct ev_loop *loop = default_loop; 984 struct ev_loop *loop = ev_default_loop_ptr;
937#endif 985#endif
938 986
939#ifndef _WIN32 987#ifndef _WIN32
940 ev_ref (EV_A); /* child watcher */ 988 ev_ref (EV_A); /* child watcher */
941 ev_signal_stop (EV_A_ &childev); 989 ev_signal_stop (EV_A_ &childev);
… …
952 1000
953void 1001void
954ev_default_fork (void) 1002ev_default_fork (void)
955{ 1003{
956#if EV_MULTIPLICITY 1004#if EV_MULTIPLICITY
957 struct ev_loop *loop = default_loop; 1005 struct ev_loop *loop = ev_default_loop_ptr;
958#endif 1006#endif
959 1007
960 if (method) 1008 if (method)
961 postfork = 1; 1009 postfork = 1;
962} 1010}
… …
973 return 1; 1021 return 1;
974 1022
975 return 0; 1023 return 0;
976} 1024}
977 1025
978static void 1026inline void
979call_pending (EV_P) 1027call_pending (EV_P)
980{ 1028{
981 int pri; 1029 int pri;
982 1030
983 for (pri = NUMPRI; pri--; ) 1031 for (pri = NUMPRI; pri--; )
984 while (pendingcnt [pri]) 1032 while (pendingcnt [pri])
985 { 1033 {
986 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1034 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
987 1035
988 if (p->w) 1036 if (expect_true (p->w))
989 { 1037 {
990 p->w->pending = 0; 1038 p->w->pending = 0;
991 EV_CB_INVOKE (p->w, p->events); 1039 EV_CB_INVOKE (p->w, p->events);
992 } 1040 }
993 } 1041 }
994} 1042}
995 1043
996static void 1044inline void
997timers_reify (EV_P) 1045timers_reify (EV_P)
998{ 1046{
999 while (timercnt && ((WT)timers [0])->at <= mn_now) 1047 while (timercnt && ((WT)timers [0])->at <= mn_now)
1000 { 1048 {
1001 struct ev_timer *w = timers [0]; 1049 struct ev_timer *w = timers [0];
… …
1019 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1067 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1020 } 1068 }
1021} 1069}
1022 1070
1023#if EV_PERIODICS 1071#if EV_PERIODICS
1024static void 1072inline void
1025periodics_reify (EV_P) 1073periodics_reify (EV_P)
1026{ 1074{
1027 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1075 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1028 { 1076 {
1029 struct ev_periodic *w = periodics [0]; 1077 struct ev_periodic *w = periodics [0];
… …
1031 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1079 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
1032 1080
1033 /* first reschedule or stop timer */ 1081 /* first reschedule or stop timer */
1034 if (w->reschedule_cb) 1082 if (w->reschedule_cb)
1035 { 1083 {
1036 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1084 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1037
1038 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1085 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1039 downheap ((WT *)periodics, periodiccnt, 0); 1086 downheap ((WT *)periodics, periodiccnt, 0);
1040 } 1087 }
1041 else if (w->interval) 1088 else if (w->interval)
1042 { 1089 {
… …
1089 ev_rt_now = ev_time (); 1136 ev_rt_now = ev_time ();
1090 return 1; 1137 return 1;
1091 } 1138 }
1092} 1139}
1093 1140
1094static void 1141inline void
1095time_update (EV_P) 1142time_update (EV_P)
1096{ 1143{
1097 int i; 1144 int i;
1098 1145
1099#if EV_USE_MONOTONIC 1146#if EV_USE_MONOTONIC
… …
1160ev_loop (EV_P_ int flags) 1207ev_loop (EV_P_ int flags)
1161{ 1208{
1162 double block; 1209 double block;
1163 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1210 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1164 1211
1165 do 1212 while (activecnt)
1166 { 1213 {
1167 /* queue check watchers (and execute them) */ 1214 /* queue check watchers (and execute them) */
1168 if (expect_false (preparecnt)) 1215 if (expect_false (preparecnt))
1169 { 1216 {
1170 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1217 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
… …
1210 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1257 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1211 if (block > to) block = to; 1258 if (block > to) block = to;
1212 } 1259 }
1213#endif 1260#endif
1214 1261
1215 if (block < 0.) block = 0.; 1262 if (expect_false (block < 0.)) block = 0.;
1216 } 1263 }
1217 1264
1218 method_poll (EV_A_ block); 1265 method_poll (EV_A_ block);
1219 1266
1220 /* update ev_rt_now, do magic */ 1267 /* update ev_rt_now, do magic */
… …
1229 /* queue idle watchers unless io or timers are pending */ 1276 /* queue idle watchers unless io or timers are pending */
1230 if (idlecnt && !any_pending (EV_A)) 1277 if (idlecnt && !any_pending (EV_A))
1231 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1278 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1232 1279
1233 /* queue check watchers, to be executed first */ 1280 /* queue check watchers, to be executed first */
1234 if (checkcnt) 1281 if (expect_false (checkcnt))
1235 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1282 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1236 1283
1237 call_pending (EV_A); 1284 call_pending (EV_A);
1285
1286 if (expect_false (loop_done))
1287 break;
1238 } 1288 }
1239 while (activecnt && !loop_done);
1240 1289
1241 if (loop_done != 2) 1290 if (loop_done != 2)
1242 loop_done = 0; 1291 loop_done = 0;
1243} 1292}
1244 1293
… …
1304void 1353void
1305ev_io_start (EV_P_ struct ev_io *w) 1354ev_io_start (EV_P_ struct ev_io *w)
1306{ 1355{
1307 int fd = w->fd; 1356 int fd = w->fd;
1308 1357
1309 if (ev_is_active (w)) 1358 if (expect_false (ev_is_active (w)))
1310 return; 1359 return;
1311 1360
1312 assert (("ev_io_start called with negative fd", fd >= 0)); 1361 assert (("ev_io_start called with negative fd", fd >= 0));
1313 1362
1314 ev_start (EV_A_ (W)w, 1); 1363 ev_start (EV_A_ (W)w, 1);
… …
1320 1369
1321void 1370void
1322ev_io_stop (EV_P_ struct ev_io *w) 1371ev_io_stop (EV_P_ struct ev_io *w)
1323{ 1372{
1324 ev_clear_pending (EV_A_ (W)w); 1373 ev_clear_pending (EV_A_ (W)w);
1325 if (!ev_is_active (w)) 1374 if (expect_false (!ev_is_active (w)))
1326 return; 1375 return;
1327 1376
1328 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1377 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1329 1378
1330 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1379 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
… …
1334} 1383}
1335 1384
1336void 1385void
1337ev_timer_start (EV_P_ struct ev_timer *w) 1386ev_timer_start (EV_P_ struct ev_timer *w)
1338{ 1387{
1339 if (ev_is_active (w)) 1388 if (expect_false (ev_is_active (w)))
1340 return; 1389 return;
1341 1390
1342 ((WT)w)->at += mn_now; 1391 ((WT)w)->at += mn_now;
1343 1392
1344 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1393 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1345 1394
1346 ev_start (EV_A_ (W)w, ++timercnt); 1395 ev_start (EV_A_ (W)w, ++timercnt);
1347 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1396 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1348 timers [timercnt - 1] = w; 1397 timers [timercnt - 1] = w;
1349 upheap ((WT *)timers, timercnt - 1); 1398 upheap ((WT *)timers, timercnt - 1);
1350 1399
1351 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1400 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1352} 1401}
1353 1402
1354void 1403void
1355ev_timer_stop (EV_P_ struct ev_timer *w) 1404ev_timer_stop (EV_P_ struct ev_timer *w)
1356{ 1405{
1357 ev_clear_pending (EV_A_ (W)w); 1406 ev_clear_pending (EV_A_ (W)w);
1358 if (!ev_is_active (w)) 1407 if (expect_false (!ev_is_active (w)))
1359 return; 1408 return;
1360 1409
1361 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1410 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1362 1411
1363 if (((W)w)->active < timercnt--) 1412 if (expect_true (((W)w)->active < timercnt--))
1364 { 1413 {
1365 timers [((W)w)->active - 1] = timers [timercnt]; 1414 timers [((W)w)->active - 1] = timers [timercnt];
1366 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1415 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1367 } 1416 }
1368 1417
… …
1383 } 1432 }
1384 else 1433 else
1385 ev_timer_stop (EV_A_ w); 1434 ev_timer_stop (EV_A_ w);
1386 } 1435 }
1387 else if (w->repeat) 1436 else if (w->repeat)
1437 {
1438 w->at = w->repeat;
1388 ev_timer_start (EV_A_ w); 1439 ev_timer_start (EV_A_ w);
1440 }
1389} 1441}
1390 1442
1391#if EV_PERIODICS 1443#if EV_PERIODICS
1392void 1444void
1393ev_periodic_start (EV_P_ struct ev_periodic *w) 1445ev_periodic_start (EV_P_ struct ev_periodic *w)
1394{ 1446{
1395 if (ev_is_active (w)) 1447 if (expect_false (ev_is_active (w)))
1396 return; 1448 return;
1397 1449
1398 if (w->reschedule_cb) 1450 if (w->reschedule_cb)
1399 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1451 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1400 else if (w->interval) 1452 else if (w->interval)
… …
1403 /* this formula differs from the one in periodic_reify because we do not always round up */ 1455 /* this formula differs from the one in periodic_reify because we do not always round up */
1404 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1456 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1405 } 1457 }
1406 1458
1407 ev_start (EV_A_ (W)w, ++periodiccnt); 1459 ev_start (EV_A_ (W)w, ++periodiccnt);
1408 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1460 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1409 periodics [periodiccnt - 1] = w; 1461 periodics [periodiccnt - 1] = w;
1410 upheap ((WT *)periodics, periodiccnt - 1); 1462 upheap ((WT *)periodics, periodiccnt - 1);
1411 1463
1412 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1464 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1413} 1465}
1414 1466
1415void 1467void
1416ev_periodic_stop (EV_P_ struct ev_periodic *w) 1468ev_periodic_stop (EV_P_ struct ev_periodic *w)
1417{ 1469{
1418 ev_clear_pending (EV_A_ (W)w); 1470 ev_clear_pending (EV_A_ (W)w);
1419 if (!ev_is_active (w)) 1471 if (expect_false (!ev_is_active (w)))
1420 return; 1472 return;
1421 1473
1422 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1474 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1423 1475
1424 if (((W)w)->active < periodiccnt--) 1476 if (expect_true (((W)w)->active < periodiccnt--))
1425 { 1477 {
1426 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1478 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1427 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1479 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1428 } 1480 }
1429 1481
… …
1440#endif 1492#endif
1441 1493
1442void 1494void
1443ev_idle_start (EV_P_ struct ev_idle *w) 1495ev_idle_start (EV_P_ struct ev_idle *w)
1444{ 1496{
1445 if (ev_is_active (w)) 1497 if (expect_false (ev_is_active (w)))
1446 return; 1498 return;
1447 1499
1448 ev_start (EV_A_ (W)w, ++idlecnt); 1500 ev_start (EV_A_ (W)w, ++idlecnt);
1449 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1501 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1450 idles [idlecnt - 1] = w; 1502 idles [idlecnt - 1] = w;
1451} 1503}
1452 1504
1453void 1505void
1454ev_idle_stop (EV_P_ struct ev_idle *w) 1506ev_idle_stop (EV_P_ struct ev_idle *w)
1455{ 1507{
1456 ev_clear_pending (EV_A_ (W)w); 1508 ev_clear_pending (EV_A_ (W)w);
1457 if (!ev_is_active (w)) 1509 if (expect_false (!ev_is_active (w)))
1458 return; 1510 return;
1459 1511
1460 idles [((W)w)->active - 1] = idles [--idlecnt]; 1512 idles [((W)w)->active - 1] = idles [--idlecnt];
1461 ev_stop (EV_A_ (W)w); 1513 ev_stop (EV_A_ (W)w);
1462} 1514}
1463 1515
1464void 1516void
1465ev_prepare_start (EV_P_ struct ev_prepare *w) 1517ev_prepare_start (EV_P_ struct ev_prepare *w)
1466{ 1518{
1467 if (ev_is_active (w)) 1519 if (expect_false (ev_is_active (w)))
1468 return; 1520 return;
1469 1521
1470 ev_start (EV_A_ (W)w, ++preparecnt); 1522 ev_start (EV_A_ (W)w, ++preparecnt);
1471 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1523 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1472 prepares [preparecnt - 1] = w; 1524 prepares [preparecnt - 1] = w;
1473} 1525}
1474 1526
1475void 1527void
1476ev_prepare_stop (EV_P_ struct ev_prepare *w) 1528ev_prepare_stop (EV_P_ struct ev_prepare *w)
1477{ 1529{
1478 ev_clear_pending (EV_A_ (W)w); 1530 ev_clear_pending (EV_A_ (W)w);
1479 if (!ev_is_active (w)) 1531 if (expect_false (!ev_is_active (w)))
1480 return; 1532 return;
1481 1533
1482 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1534 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1483 ev_stop (EV_A_ (W)w); 1535 ev_stop (EV_A_ (W)w);
1484} 1536}
1485 1537
1486void 1538void
1487ev_check_start (EV_P_ struct ev_check *w) 1539ev_check_start (EV_P_ struct ev_check *w)
1488{ 1540{
1489 if (ev_is_active (w)) 1541 if (expect_false (ev_is_active (w)))
1490 return; 1542 return;
1491 1543
1492 ev_start (EV_A_ (W)w, ++checkcnt); 1544 ev_start (EV_A_ (W)w, ++checkcnt);
1493 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1545 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1494 checks [checkcnt - 1] = w; 1546 checks [checkcnt - 1] = w;
1495} 1547}
1496 1548
1497void 1549void
1498ev_check_stop (EV_P_ struct ev_check *w) 1550ev_check_stop (EV_P_ struct ev_check *w)
1499{ 1551{
1500 ev_clear_pending (EV_A_ (W)w); 1552 ev_clear_pending (EV_A_ (W)w);
1501 if (!ev_is_active (w)) 1553 if (expect_false (!ev_is_active (w)))
1502 return; 1554 return;
1503 1555
1504 checks [((W)w)->active - 1] = checks [--checkcnt]; 1556 checks [((W)w)->active - 1] = checks [--checkcnt];
1505 ev_stop (EV_A_ (W)w); 1557 ev_stop (EV_A_ (W)w);
1506} 1558}
… …
1511 1563
1512void 1564void
1513ev_signal_start (EV_P_ struct ev_signal *w) 1565ev_signal_start (EV_P_ struct ev_signal *w)
1514{ 1566{
1515#if EV_MULTIPLICITY 1567#if EV_MULTIPLICITY
1516 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1568 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1517#endif 1569#endif
1518 if (ev_is_active (w)) 1570 if (expect_false (ev_is_active (w)))
1519 return; 1571 return;
1520 1572
1521 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1573 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1522 1574
1523 ev_start (EV_A_ (W)w, 1); 1575 ev_start (EV_A_ (W)w, 1);
… …
1540 1592
1541void 1593void
1542ev_signal_stop (EV_P_ struct ev_signal *w) 1594ev_signal_stop (EV_P_ struct ev_signal *w)
1543{ 1595{
1544 ev_clear_pending (EV_A_ (W)w); 1596 ev_clear_pending (EV_A_ (W)w);
1545 if (!ev_is_active (w)) 1597 if (expect_false (!ev_is_active (w)))
1546 return; 1598 return;
1547 1599
1548 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1600 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1549 ev_stop (EV_A_ (W)w); 1601 ev_stop (EV_A_ (W)w);
1550 1602
… …
1554 1606
1555void 1607void
1556ev_child_start (EV_P_ struct ev_child *w) 1608ev_child_start (EV_P_ struct ev_child *w)
1557{ 1609{
1558#if EV_MULTIPLICITY 1610#if EV_MULTIPLICITY
1559 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1611 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1560#endif 1612#endif
1561 if (ev_is_active (w)) 1613 if (expect_false (ev_is_active (w)))
1562 return; 1614 return;
1563 1615
1564 ev_start (EV_A_ (W)w, 1); 1616 ev_start (EV_A_ (W)w, 1);
1565 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1617 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1566} 1618}
1567 1619
1568void 1620void
1569ev_child_stop (EV_P_ struct ev_child *w) 1621ev_child_stop (EV_P_ struct ev_child *w)
1570{ 1622{
1571 ev_clear_pending (EV_A_ (W)w); 1623 ev_clear_pending (EV_A_ (W)w);
1572 if (!ev_is_active (w)) 1624 if (expect_false (!ev_is_active (w)))
1573 return; 1625 return;
1574 1626
1575 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1627 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1576 ev_stop (EV_A_ (W)w); 1628 ev_stop (EV_A_ (W)w);
1577} 1629}
… …
1614void 1666void
1615ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1667ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1616{ 1668{
1617 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 1669 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1618 1670
1619 if (!once) 1671 if (expect_false (!once))
1672 {
1620 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1673 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1621 else 1674 return;
1622 { 1675 }
1676
1623 once->cb = cb; 1677 once->cb = cb;
1624 once->arg = arg; 1678 once->arg = arg;
1625 1679
1626 ev_init (&once->io, once_cb_io); 1680 ev_init (&once->io, once_cb_io);
1627 if (fd >= 0) 1681 if (fd >= 0)
1628 { 1682 {
1629 ev_io_set (&once->io, fd, events); 1683 ev_io_set (&once->io, fd, events);
1630 ev_io_start (EV_A_ &once->io); 1684 ev_io_start (EV_A_ &once->io);
1631 } 1685 }
1632 1686
1633 ev_init (&once->to, once_cb_to); 1687 ev_init (&once->to, once_cb_to);
1634 if (timeout >= 0.) 1688 if (timeout >= 0.)
1635 { 1689 {
1636 ev_timer_set (&once->to, timeout, 0.); 1690 ev_timer_set (&once->to, timeout, 0.);
1637 ev_timer_start (EV_A_ &once->to); 1691 ev_timer_start (EV_A_ &once->to);
1638 }
1639 } 1692 }
1640} 1693}
1641 1694
1642#ifdef __cplusplus 1695#ifdef __cplusplus
1643} 1696}

Diff Legend

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