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.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#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/**/
158
159/* darwin simply cannot be helped */
160#ifdef __APPLE__
161# undef EV_USE_POLL
162# undef EV_USE_KQUEUE
163#endif
119 164
120#ifndef CLOCK_MONOTONIC 165#ifndef CLOCK_MONOTONIC
121# undef EV_USE_MONOTONIC 166# undef EV_USE_MONOTONIC
122# define EV_USE_MONOTONIC 0 167# define EV_USE_MONOTONIC 0
123#endif 168#endif
… …
132#endif 177#endif
133 178
134/**/ 179/**/
135 180
136#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) */
137#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) */
138#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 */
139/*#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 */
140 185
141#ifdef EV_H 186#ifdef EV_H
142# include EV_H 187# include EV_H
143#else 188#else
144# include "ev.h" 189# include "ev.h"
145#endif 190#endif
146 191
147#if __GNUC__ >= 3 192#if __GNUC__ >= 3
148# define expect(expr,value) __builtin_expect ((expr),(value)) 193# define expect(expr,value) __builtin_expect ((expr),(value))
149# define inline inline 194# define inline static inline
150#else 195#else
151# define expect(expr,value) (expr) 196# define expect(expr,value) (expr)
152# define inline static 197# define inline static
153#endif 198#endif
154 199
… …
156#define expect_true(expr) expect ((expr) != 0, 1) 201#define expect_true(expr) expect ((expr) != 0, 1)
157 202
158#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 203#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
159#define ABSPRI(w) ((w)->priority - EV_MINPRI) 204#define ABSPRI(w) ((w)->priority - EV_MINPRI)
160 205
161#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 */
162 208
163typedef struct ev_watcher *W; 209typedef struct ev_watcher *W;
164typedef struct ev_watcher_list *WL; 210typedef struct ev_watcher_list *WL;
165typedef struct ev_watcher_time *WT; 211typedef struct ev_watcher_time *WT;
166 212
… …
246 #include "ev_vars.h" 292 #include "ev_vars.h"
247 #undef VAR 293 #undef VAR
248 }; 294 };
249 #include "ev_wrap.h" 295 #include "ev_wrap.h"
250 296
251 struct ev_loop default_loop_struct; 297 static struct ev_loop default_loop_struct;
252 static struct ev_loop *default_loop; 298 struct ev_loop *ev_default_loop_ptr;
253 299
254#else 300#else
255 301
256 ev_tstamp ev_rt_now; 302 ev_tstamp ev_rt_now;
257 #define VAR(name,decl) static decl; 303 #define VAR(name,decl) static decl;
258 #include "ev_vars.h" 304 #include "ev_vars.h"
259 #undef VAR 305 #undef VAR
260 306
261 static int default_loop; 307 static int ev_default_loop_ptr;
262 308
263#endif 309#endif
264 310
265/*****************************************************************************/ 311/*****************************************************************************/
266 312
… …
299{ 345{
300 return ev_rt_now; 346 return ev_rt_now;
301} 347}
302#endif 348#endif
303 349
304#define array_roundsize(type,n) ((n) | 4 & ~3) 350#define array_roundsize(type,n) (((n) | 4) & ~3)
305 351
306#define array_needsize(type,base,cur,cnt,init) \ 352#define array_needsize(type,base,cur,cnt,init) \
307 if (expect_false ((cnt) > cur)) \ 353 if (expect_false ((cnt) > cur)) \
308 { \ 354 { \
309 int newcnt = cur; \ 355 int newcnt = cur; \
… …
347void 393void
348ev_feed_event (EV_P_ void *w, int revents) 394ev_feed_event (EV_P_ void *w, int revents)
349{ 395{
350 W w_ = (W)w; 396 W w_ = (W)w;
351 397
352 if (w_->pending) 398 if (expect_false (w_->pending))
353 { 399 {
354 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 400 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
355 return; 401 return;
356 } 402 }
357 403
358 w_->pending = ++pendingcnt [ABSPRI (w_)]; 404 w_->pending = ++pendingcnt [ABSPRI (w_)];
359 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);
360 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 406 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
361 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 407 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
362} 408}
363 409
364static void 410static void
… …
391 fd_event (EV_A_ fd, revents); 437 fd_event (EV_A_ fd, revents);
392} 438}
393 439
394/*****************************************************************************/ 440/*****************************************************************************/
395 441
396static void 442inline void
397fd_reify (EV_P) 443fd_reify (EV_P)
398{ 444{
399 int i; 445 int i;
400 446
401 for (i = 0; i < fdchangecnt; ++i) 447 for (i = 0; i < fdchangecnt; ++i)
… …
428} 474}
429 475
430static void 476static void
431fd_change (EV_P_ int fd) 477fd_change (EV_P_ int fd)
432{ 478{
433 if (anfds [fd].reify) 479 if (expect_false (anfds [fd].reify))
434 return; 480 return;
435 481
436 anfds [fd].reify = 1; 482 anfds [fd].reify = 1;
437 483
438 ++fdchangecnt; 484 ++fdchangecnt;
439 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 485 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
440 fdchanges [fdchangecnt - 1] = fd; 486 fdchanges [fdchangecnt - 1] = fd;
441} 487}
442 488
443static void 489static void
444fd_kill (EV_P_ int fd) 490fd_kill (EV_P_ int fd)
… …
450 ev_io_stop (EV_A_ w); 496 ev_io_stop (EV_A_ w);
451 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);
452 } 498 }
453} 499}
454 500
455static int 501inline int
456fd_valid (int fd) 502fd_valid (int fd)
457{ 503{
458#ifdef _WIN32 504#ifdef _WIN32
459 return _get_osfhandle (fd) != -1; 505 return _get_osfhandle (fd) != -1;
460#else 506#else
… …
602ev_feed_signal_event (EV_P_ int signum) 648ev_feed_signal_event (EV_P_ int signum)
603{ 649{
604 WL w; 650 WL w;
605 651
606#if EV_MULTIPLICITY 652#if EV_MULTIPLICITY
607 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));
608#endif 654#endif
609 655
610 --signum; 656 --signum;
611 657
612 if (signum < 0 || signum >= signalmax) 658 if (signum < 0 || signum >= signalmax)
… …
629 for (signum = signalmax; signum--; ) 675 for (signum = signalmax; signum--; )
630 if (signals [signum].gotsig) 676 if (signals [signum].gotsig)
631 ev_feed_signal_event (EV_A_ signum + 1); 677 ev_feed_signal_event (EV_A_ signum + 1);
632} 678}
633 679
634inline void 680static void
635fd_intern (int fd) 681fd_intern (int fd)
636{ 682{
637#ifdef _WIN32 683#ifdef _WIN32
638 int arg = 1; 684 int arg = 1;
639 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 685 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
698 744
699#endif 745#endif
700 746
701/*****************************************************************************/ 747/*****************************************************************************/
702 748
749#if EV_USE_PORT
750# include "ev_port.c"
751#endif
703#if EV_USE_KQUEUE 752#if EV_USE_KQUEUE
704# include "ev_kqueue.c" 753# include "ev_kqueue.c"
705#endif 754#endif
706#if EV_USE_EPOLL 755#if EV_USE_EPOLL
707# include "ev_epoll.c" 756# include "ev_epoll.c"
… …
735 return getuid () != geteuid () 784 return getuid () != geteuid ()
736 || getgid () != getegid (); 785 || getgid () != getegid ();
737#endif 786#endif
738} 787}
739 788
740int 789unsigned int
741ev_method (EV_P) 790ev_method (EV_P)
742{ 791{
743 return method; 792 return method;
744} 793}
745 794
746static void 795static void
747loop_init (EV_P_ int methods) 796loop_init (EV_P_ unsigned int flags)
748{ 797{
749 if (!method) 798 if (!method)
750 { 799 {
751#if EV_USE_MONOTONIC 800#if EV_USE_MONOTONIC
752 { 801 {
… …
759 ev_rt_now = ev_time (); 808 ev_rt_now = ev_time ();
760 mn_now = get_clock (); 809 mn_now = get_clock ();
761 now_floor = mn_now; 810 now_floor = mn_now;
762 rtmn_diff = ev_rt_now - mn_now; 811 rtmn_diff = ev_rt_now - mn_now;
763 812
764 if (methods == EVMETHOD_AUTO) 813 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS"))
765 if (!enable_secure () && getenv ("LIBEV_METHODS"))
766 methods = atoi (getenv ("LIBEV_METHODS")); 814 flags = atoi (getenv ("LIBEV_FLAGS"));
767 else 815
768 methods = EVMETHOD_ANY; 816 if (!(flags & 0x0000ffff))
817 flags |= 0x0000ffff;
769 818
770 method = 0; 819 method = 0;
820#if EV_USE_PORT
821 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags);
822#endif
771#if EV_USE_KQUEUE 823#if EV_USE_KQUEUE
772 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 824 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
773#endif 825#endif
774#if EV_USE_EPOLL 826#if EV_USE_EPOLL
775 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 827 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
776#endif 828#endif
777#if EV_USE_POLL 829#if EV_USE_POLL
778 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 830 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags);
779#endif 831#endif
780#if EV_USE_SELECT 832#if EV_USE_SELECT
781 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 833 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
782#endif 834#endif
783 835
784 ev_init (&sigev, sigcb); 836 ev_init (&sigev, sigcb);
785 ev_set_priority (&sigev, EV_MAXPRI); 837 ev_set_priority (&sigev, EV_MAXPRI);
786 } 838 }
787} 839}
788 840
789void 841static void
790loop_destroy (EV_P) 842loop_destroy (EV_P)
791{ 843{
792 int i; 844 int i;
793 845
846#if EV_USE_PORT
847 if (method == EVMETHOD_PORT ) port_destroy (EV_A);
848#endif
794#if EV_USE_KQUEUE 849#if EV_USE_KQUEUE
795 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 850 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
796#endif 851#endif
797#if EV_USE_EPOLL 852#if EV_USE_EPOLL
798 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 853 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
… …
806 861
807 for (i = NUMPRI; i--; ) 862 for (i = NUMPRI; i--; )
808 array_free (pending, [i]); 863 array_free (pending, [i]);
809 864
810 /* have to use the microsoft-never-gets-it-right macro */ 865 /* have to use the microsoft-never-gets-it-right macro */
811 array_free (fdchange, EMPTY); 866 array_free (fdchange, EMPTY0);
812 array_free (timer, EMPTY); 867 array_free (timer, EMPTY0);
813#if EV_PERIODICS 868#if EV_PERIODICS
814 array_free (periodic, EMPTY); 869 array_free (periodic, EMPTY0);
815#endif 870#endif
816 array_free (idle, EMPTY); 871 array_free (idle, EMPTY0);
817 array_free (prepare, EMPTY); 872 array_free (prepare, EMPTY0);
818 array_free (check, EMPTY); 873 array_free (check, EMPTY0);
819 874
820 method = 0; 875 method = 0;
821} 876}
822 877
823static void 878static void
824loop_fork (EV_P) 879loop_fork (EV_P)
825{ 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
826#if EV_USE_EPOLL 887#if EV_USE_EPOLL
827 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 888 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
828#endif
829#if EV_USE_KQUEUE
830 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
831#endif 889#endif
832 890
833 if (ev_is_active (&sigev)) 891 if (ev_is_active (&sigev))
834 { 892 {
835 /* default loop */ 893 /* default loop */
… …
848 postfork = 0; 906 postfork = 0;
849} 907}
850 908
851#if EV_MULTIPLICITY 909#if EV_MULTIPLICITY
852struct ev_loop * 910struct ev_loop *
853ev_loop_new (int methods) 911ev_loop_new (unsigned int flags)
854{ 912{
855 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));
856 914
857 memset (loop, 0, sizeof (struct ev_loop)); 915 memset (loop, 0, sizeof (struct ev_loop));
858 916
859 loop_init (EV_A_ methods); 917 loop_init (EV_A_ flags);
860 918
861 if (ev_method (EV_A)) 919 if (ev_method (EV_A))
862 return loop; 920 return loop;
863 921
864 return 0; 922 return 0;
… …
879 937
880#endif 938#endif
881 939
882#if EV_MULTIPLICITY 940#if EV_MULTIPLICITY
883struct ev_loop * 941struct ev_loop *
942ev_default_loop_init (unsigned int flags)
884#else 943#else
885int 944int
945ev_default_loop (unsigned int flags)
886#endif 946#endif
887ev_default_loop (int methods)
888{ 947{
889 if (sigpipe [0] == sigpipe [1]) 948 if (sigpipe [0] == sigpipe [1])
890 if (pipe (sigpipe)) 949 if (pipe (sigpipe))
891 return 0; 950 return 0;
892 951
893 if (!default_loop) 952 if (!ev_default_loop_ptr)
894 { 953 {
895#if EV_MULTIPLICITY 954#if EV_MULTIPLICITY
896 struct ev_loop *loop = default_loop = &default_loop_struct; 955 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
897#else 956#else
898 default_loop = 1; 957 ev_default_loop_ptr = 1;
899#endif 958#endif
900 959
901 loop_init (EV_A_ methods); 960 loop_init (EV_A_ flags);
902 961
903 if (ev_method (EV_A)) 962 if (ev_method (EV_A))
904 { 963 {
905 siginit (EV_A); 964 siginit (EV_A);
906 965
… …
910 ev_signal_start (EV_A_ &childev); 969 ev_signal_start (EV_A_ &childev);
911 ev_unref (EV_A); /* child watcher should not keep loop alive */ 970 ev_unref (EV_A); /* child watcher should not keep loop alive */
912#endif 971#endif
913 } 972 }
914 else 973 else
915 default_loop = 0; 974 ev_default_loop_ptr = 0;
916 } 975 }
917 976
918 return default_loop; 977 return ev_default_loop_ptr;
919} 978}
920 979
921void 980void
922ev_default_destroy (void) 981ev_default_destroy (void)
923{ 982{
924#if EV_MULTIPLICITY 983#if EV_MULTIPLICITY
925 struct ev_loop *loop = default_loop; 984 struct ev_loop *loop = ev_default_loop_ptr;
926#endif 985#endif
927 986
928#ifndef _WIN32 987#ifndef _WIN32
929 ev_ref (EV_A); /* child watcher */ 988 ev_ref (EV_A); /* child watcher */
930 ev_signal_stop (EV_A_ &childev); 989 ev_signal_stop (EV_A_ &childev);
… …
941 1000
942void 1001void
943ev_default_fork (void) 1002ev_default_fork (void)
944{ 1003{
945#if EV_MULTIPLICITY 1004#if EV_MULTIPLICITY
946 struct ev_loop *loop = default_loop; 1005 struct ev_loop *loop = ev_default_loop_ptr;
947#endif 1006#endif
948 1007
949 if (method) 1008 if (method)
950 postfork = 1; 1009 postfork = 1;
951} 1010}
… …
962 return 1; 1021 return 1;
963 1022
964 return 0; 1023 return 0;
965} 1024}
966 1025
967static void 1026inline void
968call_pending (EV_P) 1027call_pending (EV_P)
969{ 1028{
970 int pri; 1029 int pri;
971 1030
972 for (pri = NUMPRI; pri--; ) 1031 for (pri = NUMPRI; pri--; )
973 while (pendingcnt [pri]) 1032 while (pendingcnt [pri])
974 { 1033 {
975 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1034 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
976 1035
977 if (p->w) 1036 if (expect_true (p->w))
978 { 1037 {
979 p->w->pending = 0; 1038 p->w->pending = 0;
980 EV_CB_INVOKE (p->w, p->events); 1039 EV_CB_INVOKE (p->w, p->events);
981 } 1040 }
982 } 1041 }
983} 1042}
984 1043
985static void 1044inline void
986timers_reify (EV_P) 1045timers_reify (EV_P)
987{ 1046{
988 while (timercnt && ((WT)timers [0])->at <= mn_now) 1047 while (timercnt && ((WT)timers [0])->at <= mn_now)
989 { 1048 {
990 struct ev_timer *w = timers [0]; 1049 struct ev_timer *w = timers [0];
… …
1008 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1067 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1009 } 1068 }
1010} 1069}
1011 1070
1012#if EV_PERIODICS 1071#if EV_PERIODICS
1013static void 1072inline void
1014periodics_reify (EV_P) 1073periodics_reify (EV_P)
1015{ 1074{
1016 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1075 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1017 { 1076 {
1018 struct ev_periodic *w = periodics [0]; 1077 struct ev_periodic *w = periodics [0];
… …
1020 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1079 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
1021 1080
1022 /* first reschedule or stop timer */ 1081 /* first reschedule or stop timer */
1023 if (w->reschedule_cb) 1082 if (w->reschedule_cb)
1024 { 1083 {
1025 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);
1026
1027 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));
1028 downheap ((WT *)periodics, periodiccnt, 0); 1086 downheap ((WT *)periodics, periodiccnt, 0);
1029 } 1087 }
1030 else if (w->interval) 1088 else if (w->interval)
1031 { 1089 {
… …
1078 ev_rt_now = ev_time (); 1136 ev_rt_now = ev_time ();
1079 return 1; 1137 return 1;
1080 } 1138 }
1081} 1139}
1082 1140
1083static void 1141inline void
1084time_update (EV_P) 1142time_update (EV_P)
1085{ 1143{
1086 int i; 1144 int i;
1087 1145
1088#if EV_USE_MONOTONIC 1146#if EV_USE_MONOTONIC
… …
1149ev_loop (EV_P_ int flags) 1207ev_loop (EV_P_ int flags)
1150{ 1208{
1151 double block; 1209 double block;
1152 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1210 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1153 1211
1154 do 1212 while (activecnt)
1155 { 1213 {
1156 /* queue check watchers (and execute them) */ 1214 /* queue check watchers (and execute them) */
1157 if (expect_false (preparecnt)) 1215 if (expect_false (preparecnt))
1158 { 1216 {
1159 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1217 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
… …
1199 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;
1200 if (block > to) block = to; 1258 if (block > to) block = to;
1201 } 1259 }
1202#endif 1260#endif
1203 1261
1204 if (block < 0.) block = 0.; 1262 if (expect_false (block < 0.)) block = 0.;
1205 } 1263 }
1206 1264
1207 method_poll (EV_A_ block); 1265 method_poll (EV_A_ block);
1208 1266
1209 /* update ev_rt_now, do magic */ 1267 /* update ev_rt_now, do magic */
… …
1218 /* queue idle watchers unless io or timers are pending */ 1276 /* queue idle watchers unless io or timers are pending */
1219 if (idlecnt && !any_pending (EV_A)) 1277 if (idlecnt && !any_pending (EV_A))
1220 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1278 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1221 1279
1222 /* queue check watchers, to be executed first */ 1280 /* queue check watchers, to be executed first */
1223 if (checkcnt) 1281 if (expect_false (checkcnt))
1224 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1282 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1225 1283
1226 call_pending (EV_A); 1284 call_pending (EV_A);
1285
1286 if (expect_false (loop_done))
1287 break;
1227 } 1288 }
1228 while (activecnt && !loop_done);
1229 1289
1230 if (loop_done != 2) 1290 if (loop_done != 2)
1231 loop_done = 0; 1291 loop_done = 0;
1232} 1292}
1233 1293
… …
1293void 1353void
1294ev_io_start (EV_P_ struct ev_io *w) 1354ev_io_start (EV_P_ struct ev_io *w)
1295{ 1355{
1296 int fd = w->fd; 1356 int fd = w->fd;
1297 1357
1298 if (ev_is_active (w)) 1358 if (expect_false (ev_is_active (w)))
1299 return; 1359 return;
1300 1360
1301 assert (("ev_io_start called with negative fd", fd >= 0)); 1361 assert (("ev_io_start called with negative fd", fd >= 0));
1302 1362
1303 ev_start (EV_A_ (W)w, 1); 1363 ev_start (EV_A_ (W)w, 1);
… …
1309 1369
1310void 1370void
1311ev_io_stop (EV_P_ struct ev_io *w) 1371ev_io_stop (EV_P_ struct ev_io *w)
1312{ 1372{
1313 ev_clear_pending (EV_A_ (W)w); 1373 ev_clear_pending (EV_A_ (W)w);
1314 if (!ev_is_active (w)) 1374 if (expect_false (!ev_is_active (w)))
1315 return; 1375 return;
1316 1376
1317 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));
1318 1378
1319 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1379 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
… …
1323} 1383}
1324 1384
1325void 1385void
1326ev_timer_start (EV_P_ struct ev_timer *w) 1386ev_timer_start (EV_P_ struct ev_timer *w)
1327{ 1387{
1328 if (ev_is_active (w)) 1388 if (expect_false (ev_is_active (w)))
1329 return; 1389 return;
1330 1390
1331 ((WT)w)->at += mn_now; 1391 ((WT)w)->at += mn_now;
1332 1392
1333 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.));
1334 1394
1335 ev_start (EV_A_ (W)w, ++timercnt); 1395 ev_start (EV_A_ (W)w, ++timercnt);
1336 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1396 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1337 timers [timercnt - 1] = w; 1397 timers [timercnt - 1] = w;
1338 upheap ((WT *)timers, timercnt - 1); 1398 upheap ((WT *)timers, timercnt - 1);
1339 1399
1340 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1400 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1341} 1401}
1342 1402
1343void 1403void
1344ev_timer_stop (EV_P_ struct ev_timer *w) 1404ev_timer_stop (EV_P_ struct ev_timer *w)
1345{ 1405{
1346 ev_clear_pending (EV_A_ (W)w); 1406 ev_clear_pending (EV_A_ (W)w);
1347 if (!ev_is_active (w)) 1407 if (expect_false (!ev_is_active (w)))
1348 return; 1408 return;
1349 1409
1350 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1410 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1351 1411
1352 if (((W)w)->active < timercnt--) 1412 if (expect_true (((W)w)->active < timercnt--))
1353 { 1413 {
1354 timers [((W)w)->active - 1] = timers [timercnt]; 1414 timers [((W)w)->active - 1] = timers [timercnt];
1355 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1415 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1356 } 1416 }
1357 1417
… …
1372 } 1432 }
1373 else 1433 else
1374 ev_timer_stop (EV_A_ w); 1434 ev_timer_stop (EV_A_ w);
1375 } 1435 }
1376 else if (w->repeat) 1436 else if (w->repeat)
1437 {
1438 w->at = w->repeat;
1377 ev_timer_start (EV_A_ w); 1439 ev_timer_start (EV_A_ w);
1440 }
1378} 1441}
1379 1442
1380#if EV_PERIODICS 1443#if EV_PERIODICS
1381void 1444void
1382ev_periodic_start (EV_P_ struct ev_periodic *w) 1445ev_periodic_start (EV_P_ struct ev_periodic *w)
1383{ 1446{
1384 if (ev_is_active (w)) 1447 if (expect_false (ev_is_active (w)))
1385 return; 1448 return;
1386 1449
1387 if (w->reschedule_cb) 1450 if (w->reschedule_cb)
1388 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1451 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1389 else if (w->interval) 1452 else if (w->interval)
… …
1392 /* 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 */
1393 ((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;
1394 } 1457 }
1395 1458
1396 ev_start (EV_A_ (W)w, ++periodiccnt); 1459 ev_start (EV_A_ (W)w, ++periodiccnt);
1397 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1460 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1398 periodics [periodiccnt - 1] = w; 1461 periodics [periodiccnt - 1] = w;
1399 upheap ((WT *)periodics, periodiccnt - 1); 1462 upheap ((WT *)periodics, periodiccnt - 1);
1400 1463
1401 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1464 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1402} 1465}
1403 1466
1404void 1467void
1405ev_periodic_stop (EV_P_ struct ev_periodic *w) 1468ev_periodic_stop (EV_P_ struct ev_periodic *w)
1406{ 1469{
1407 ev_clear_pending (EV_A_ (W)w); 1470 ev_clear_pending (EV_A_ (W)w);
1408 if (!ev_is_active (w)) 1471 if (expect_false (!ev_is_active (w)))
1409 return; 1472 return;
1410 1473
1411 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1474 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1412 1475
1413 if (((W)w)->active < periodiccnt--) 1476 if (expect_true (((W)w)->active < periodiccnt--))
1414 { 1477 {
1415 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1478 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1416 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1479 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1417 } 1480 }
1418 1481
… …
1429#endif 1492#endif
1430 1493
1431void 1494void
1432ev_idle_start (EV_P_ struct ev_idle *w) 1495ev_idle_start (EV_P_ struct ev_idle *w)
1433{ 1496{
1434 if (ev_is_active (w)) 1497 if (expect_false (ev_is_active (w)))
1435 return; 1498 return;
1436 1499
1437 ev_start (EV_A_ (W)w, ++idlecnt); 1500 ev_start (EV_A_ (W)w, ++idlecnt);
1438 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1501 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1439 idles [idlecnt - 1] = w; 1502 idles [idlecnt - 1] = w;
1440} 1503}
1441 1504
1442void 1505void
1443ev_idle_stop (EV_P_ struct ev_idle *w) 1506ev_idle_stop (EV_P_ struct ev_idle *w)
1444{ 1507{
1445 ev_clear_pending (EV_A_ (W)w); 1508 ev_clear_pending (EV_A_ (W)w);
1446 if (!ev_is_active (w)) 1509 if (expect_false (!ev_is_active (w)))
1447 return; 1510 return;
1448 1511
1449 idles [((W)w)->active - 1] = idles [--idlecnt]; 1512 idles [((W)w)->active - 1] = idles [--idlecnt];
1450 ev_stop (EV_A_ (W)w); 1513 ev_stop (EV_A_ (W)w);
1451} 1514}
1452 1515
1453void 1516void
1454ev_prepare_start (EV_P_ struct ev_prepare *w) 1517ev_prepare_start (EV_P_ struct ev_prepare *w)
1455{ 1518{
1456 if (ev_is_active (w)) 1519 if (expect_false (ev_is_active (w)))
1457 return; 1520 return;
1458 1521
1459 ev_start (EV_A_ (W)w, ++preparecnt); 1522 ev_start (EV_A_ (W)w, ++preparecnt);
1460 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1523 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1461 prepares [preparecnt - 1] = w; 1524 prepares [preparecnt - 1] = w;
1462} 1525}
1463 1526
1464void 1527void
1465ev_prepare_stop (EV_P_ struct ev_prepare *w) 1528ev_prepare_stop (EV_P_ struct ev_prepare *w)
1466{ 1529{
1467 ev_clear_pending (EV_A_ (W)w); 1530 ev_clear_pending (EV_A_ (W)w);
1468 if (!ev_is_active (w)) 1531 if (expect_false (!ev_is_active (w)))
1469 return; 1532 return;
1470 1533
1471 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1534 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1472 ev_stop (EV_A_ (W)w); 1535 ev_stop (EV_A_ (W)w);
1473} 1536}
1474 1537
1475void 1538void
1476ev_check_start (EV_P_ struct ev_check *w) 1539ev_check_start (EV_P_ struct ev_check *w)
1477{ 1540{
1478 if (ev_is_active (w)) 1541 if (expect_false (ev_is_active (w)))
1479 return; 1542 return;
1480 1543
1481 ev_start (EV_A_ (W)w, ++checkcnt); 1544 ev_start (EV_A_ (W)w, ++checkcnt);
1482 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1545 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1483 checks [checkcnt - 1] = w; 1546 checks [checkcnt - 1] = w;
1484} 1547}
1485 1548
1486void 1549void
1487ev_check_stop (EV_P_ struct ev_check *w) 1550ev_check_stop (EV_P_ struct ev_check *w)
1488{ 1551{
1489 ev_clear_pending (EV_A_ (W)w); 1552 ev_clear_pending (EV_A_ (W)w);
1490 if (!ev_is_active (w)) 1553 if (expect_false (!ev_is_active (w)))
1491 return; 1554 return;
1492 1555
1493 checks [((W)w)->active - 1] = checks [--checkcnt]; 1556 checks [((W)w)->active - 1] = checks [--checkcnt];
1494 ev_stop (EV_A_ (W)w); 1557 ev_stop (EV_A_ (W)w);
1495} 1558}
… …
1500 1563
1501void 1564void
1502ev_signal_start (EV_P_ struct ev_signal *w) 1565ev_signal_start (EV_P_ struct ev_signal *w)
1503{ 1566{
1504#if EV_MULTIPLICITY 1567#if EV_MULTIPLICITY
1505 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));
1506#endif 1569#endif
1507 if (ev_is_active (w)) 1570 if (expect_false (ev_is_active (w)))
1508 return; 1571 return;
1509 1572
1510 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));
1511 1574
1512 ev_start (EV_A_ (W)w, 1); 1575 ev_start (EV_A_ (W)w, 1);
… …
1529 1592
1530void 1593void
1531ev_signal_stop (EV_P_ struct ev_signal *w) 1594ev_signal_stop (EV_P_ struct ev_signal *w)
1532{ 1595{
1533 ev_clear_pending (EV_A_ (W)w); 1596 ev_clear_pending (EV_A_ (W)w);
1534 if (!ev_is_active (w)) 1597 if (expect_false (!ev_is_active (w)))
1535 return; 1598 return;
1536 1599
1537 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1600 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1538 ev_stop (EV_A_ (W)w); 1601 ev_stop (EV_A_ (W)w);
1539 1602
… …
1543 1606
1544void 1607void
1545ev_child_start (EV_P_ struct ev_child *w) 1608ev_child_start (EV_P_ struct ev_child *w)
1546{ 1609{
1547#if EV_MULTIPLICITY 1610#if EV_MULTIPLICITY
1548 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));
1549#endif 1612#endif
1550 if (ev_is_active (w)) 1613 if (expect_false (ev_is_active (w)))
1551 return; 1614 return;
1552 1615
1553 ev_start (EV_A_ (W)w, 1); 1616 ev_start (EV_A_ (W)w, 1);
1554 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1617 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1555} 1618}
1556 1619
1557void 1620void
1558ev_child_stop (EV_P_ struct ev_child *w) 1621ev_child_stop (EV_P_ struct ev_child *w)
1559{ 1622{
1560 ev_clear_pending (EV_A_ (W)w); 1623 ev_clear_pending (EV_A_ (W)w);
1561 if (!ev_is_active (w)) 1624 if (expect_false (!ev_is_active (w)))
1562 return; 1625 return;
1563 1626
1564 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1627 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1565 ev_stop (EV_A_ (W)w); 1628 ev_stop (EV_A_ (W)w);
1566} 1629}
… …
1603void 1666void
1604ev_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)
1605{ 1668{
1606 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));
1607 1670
1608 if (!once) 1671 if (expect_false (!once))
1672 {
1609 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1673 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1610 else 1674 return;
1611 { 1675 }
1676
1612 once->cb = cb; 1677 once->cb = cb;
1613 once->arg = arg; 1678 once->arg = arg;
1614 1679
1615 ev_init (&once->io, once_cb_io); 1680 ev_init (&once->io, once_cb_io);
1616 if (fd >= 0) 1681 if (fd >= 0)
1617 { 1682 {
1618 ev_io_set (&once->io, fd, events); 1683 ev_io_set (&once->io, fd, events);
1619 ev_io_start (EV_A_ &once->io); 1684 ev_io_start (EV_A_ &once->io);
1620 } 1685 }
1621 1686
1622 ev_init (&once->to, once_cb_to); 1687 ev_init (&once->to, once_cb_to);
1623 if (timeout >= 0.) 1688 if (timeout >= 0.)
1624 { 1689 {
1625 ev_timer_set (&once->to, timeout, 0.); 1690 ev_timer_set (&once->to, timeout, 0.);
1626 ev_timer_start (EV_A_ &once->to); 1691 ev_timer_start (EV_A_ &once->to);
1627 }
1628 } 1692 }
1629} 1693}
1630 1694
1631#ifdef __cplusplus 1695#ifdef __cplusplus
1632} 1696}

Diff Legend

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