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

Comparing libev/ev.c (file contents):
Revision 1.104 by root, Mon Nov 12 00:39:45 2007 UTC vs.
Revision 1.128 by root, Thu Nov 22 12:28:27 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/**/
158
159/* darwin simply cannot be helped */
160#ifdef __APPLE__
161# undef EV_USE_POLL
162# undef EV_USE_KQUEUE
163#endif
124 164
125#ifndef CLOCK_MONOTONIC 165#ifndef CLOCK_MONOTONIC
126# undef EV_USE_MONOTONIC 166# undef EV_USE_MONOTONIC
127# define EV_USE_MONOTONIC 0 167# define EV_USE_MONOTONIC 0
128#endif 168#endif
… …
137#endif 177#endif
138 178
139/**/ 179/**/
140 180
141#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) */
142#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) */
143#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 */
144/*#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 */
145 185
146#ifdef EV_H 186#ifdef EV_H
147# include EV_H 187# include EV_H
148#else 188#else
149# include "ev.h" 189# include "ev.h"
150#endif 190#endif
151 191
152#if __GNUC__ >= 3 192#if __GNUC__ >= 3
153# define expect(expr,value) __builtin_expect ((expr),(value)) 193# define expect(expr,value) __builtin_expect ((expr),(value))
154# define inline inline 194# define inline static inline
155#else 195#else
156# define expect(expr,value) (expr) 196# define expect(expr,value) (expr)
157# define inline static 197# define inline static
158#endif 198#endif
159 199
… …
161#define expect_true(expr) expect ((expr) != 0, 1) 201#define expect_true(expr) expect ((expr) != 0, 1)
162 202
163#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 203#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
164#define ABSPRI(w) ((w)->priority - EV_MINPRI) 204#define ABSPRI(w) ((w)->priority - EV_MINPRI)
165 205
166#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 */
167 208
168typedef struct ev_watcher *W; 209typedef struct ev_watcher *W;
169typedef struct ev_watcher_list *WL; 210typedef struct ev_watcher_list *WL;
170typedef struct ev_watcher_time *WT; 211typedef struct ev_watcher_time *WT;
171 212
… …
251 #include "ev_vars.h" 292 #include "ev_vars.h"
252 #undef VAR 293 #undef VAR
253 }; 294 };
254 #include "ev_wrap.h" 295 #include "ev_wrap.h"
255 296
256 struct ev_loop default_loop_struct; 297 static struct ev_loop default_loop_struct;
257 static struct ev_loop *default_loop; 298 struct ev_loop *ev_default_loop_ptr;
258 299
259#else 300#else
260 301
261 ev_tstamp ev_rt_now; 302 ev_tstamp ev_rt_now;
262 #define VAR(name,decl) static decl; 303 #define VAR(name,decl) static decl;
263 #include "ev_vars.h" 304 #include "ev_vars.h"
264 #undef VAR 305 #undef VAR
265 306
266 static int default_loop; 307 static int ev_default_loop_ptr;
267 308
268#endif 309#endif
269 310
270/*****************************************************************************/ 311/*****************************************************************************/
271 312
… …
304{ 345{
305 return ev_rt_now; 346 return ev_rt_now;
306} 347}
307#endif 348#endif
308 349
309#define array_roundsize(type,n) ((n) | 4 & ~3) 350#define array_roundsize(type,n) (((n) | 4) & ~3)
310 351
311#define array_needsize(type,base,cur,cnt,init) \ 352#define array_needsize(type,base,cur,cnt,init) \
312 if (expect_false ((cnt) > cur)) \ 353 if (expect_false ((cnt) > cur)) \
313 { \ 354 { \
314 int newcnt = cur; \ 355 int newcnt = cur; \
… …
352void 393void
353ev_feed_event (EV_P_ void *w, int revents) 394ev_feed_event (EV_P_ void *w, int revents)
354{ 395{
355 W w_ = (W)w; 396 W w_ = (W)w;
356 397
357 if (w_->pending) 398 if (expect_false (w_->pending))
358 { 399 {
359 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 400 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
360 return; 401 return;
361 } 402 }
362 403
363 w_->pending = ++pendingcnt [ABSPRI (w_)]; 404 w_->pending = ++pendingcnt [ABSPRI (w_)];
364 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);
365 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 406 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
366 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 407 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
367} 408}
368 409
369static void 410static void
… …
396 fd_event (EV_A_ fd, revents); 437 fd_event (EV_A_ fd, revents);
397} 438}
398 439
399/*****************************************************************************/ 440/*****************************************************************************/
400 441
401static void 442inline void
402fd_reify (EV_P) 443fd_reify (EV_P)
403{ 444{
404 int i; 445 int i;
405 446
406 for (i = 0; i < fdchangecnt; ++i) 447 for (i = 0; i < fdchangecnt; ++i)
… …
433} 474}
434 475
435static void 476static void
436fd_change (EV_P_ int fd) 477fd_change (EV_P_ int fd)
437{ 478{
438 if (anfds [fd].reify) 479 if (expect_false (anfds [fd].reify))
439 return; 480 return;
440 481
441 anfds [fd].reify = 1; 482 anfds [fd].reify = 1;
442 483
443 ++fdchangecnt; 484 ++fdchangecnt;
444 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 485 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
445 fdchanges [fdchangecnt - 1] = fd; 486 fdchanges [fdchangecnt - 1] = fd;
446} 487}
447 488
448static void 489static void
449fd_kill (EV_P_ int fd) 490fd_kill (EV_P_ int fd)
… …
455 ev_io_stop (EV_A_ w); 496 ev_io_stop (EV_A_ w);
456 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);
457 } 498 }
458} 499}
459 500
460static int 501inline int
461fd_valid (int fd) 502fd_valid (int fd)
462{ 503{
463#ifdef _WIN32 504#ifdef _WIN32
464 return _get_osfhandle (fd) != -1; 505 return _get_osfhandle (fd) != -1;
465#else 506#else
… …
607ev_feed_signal_event (EV_P_ int signum) 648ev_feed_signal_event (EV_P_ int signum)
608{ 649{
609 WL w; 650 WL w;
610 651
611#if EV_MULTIPLICITY 652#if EV_MULTIPLICITY
612 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));
613#endif 654#endif
614 655
615 --signum; 656 --signum;
616 657
617 if (signum < 0 || signum >= signalmax) 658 if (signum < 0 || signum >= signalmax)
… …
634 for (signum = signalmax; signum--; ) 675 for (signum = signalmax; signum--; )
635 if (signals [signum].gotsig) 676 if (signals [signum].gotsig)
636 ev_feed_signal_event (EV_A_ signum + 1); 677 ev_feed_signal_event (EV_A_ signum + 1);
637} 678}
638 679
639inline void 680static void
640fd_intern (int fd) 681fd_intern (int fd)
641{ 682{
642#ifdef _WIN32 683#ifdef _WIN32
643 int arg = 1; 684 int arg = 1;
644 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 685 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
703 744
704#endif 745#endif
705 746
706/*****************************************************************************/ 747/*****************************************************************************/
707 748
749#if EV_USE_PORT
750# include "ev_port.c"
751#endif
708#if EV_USE_KQUEUE 752#if EV_USE_KQUEUE
709# include "ev_kqueue.c" 753# include "ev_kqueue.c"
710#endif 754#endif
711#if EV_USE_EPOLL 755#if EV_USE_EPOLL
712# include "ev_epoll.c" 756# include "ev_epoll.c"
… …
740 return getuid () != geteuid () 784 return getuid () != geteuid ()
741 || getgid () != getegid (); 785 || getgid () != getegid ();
742#endif 786#endif
743} 787}
744 788
745int 789unsigned int
746ev_method (EV_P) 790ev_method (EV_P)
747{ 791{
748 return method; 792 return method;
749} 793}
750 794
751static void 795static void
752loop_init (EV_P_ int methods) 796loop_init (EV_P_ unsigned int flags)
753{ 797{
754 if (!method) 798 if (!method)
755 { 799 {
756#if EV_USE_MONOTONIC 800#if EV_USE_MONOTONIC
757 { 801 {
… …
764 ev_rt_now = ev_time (); 808 ev_rt_now = ev_time ();
765 mn_now = get_clock (); 809 mn_now = get_clock ();
766 now_floor = mn_now; 810 now_floor = mn_now;
767 rtmn_diff = ev_rt_now - mn_now; 811 rtmn_diff = ev_rt_now - mn_now;
768 812
769 if (methods == EVMETHOD_AUTO) 813 if (!(flags & EVFLAG_NOENV)
770 if (!enable_secure () && getenv ("LIBEV_METHODS")) 814 && !enable_secure ()
815 && getenv ("LIBEV_FLAGS"))
771 methods = atoi (getenv ("LIBEV_METHODS")); 816 flags = atoi (getenv ("LIBEV_FLAGS"));
817
818 if (!(flags & EVMETHOD_ALL))
772 else 819 {
773 methods = EVMETHOD_ANY; 820 flags |= EVMETHOD_ALL;
821#if EV_USE_KQUEUE && !defined (__NetBSD__)
822 /* kqueue is borked on everything but netbsd apparently */
823 /* it usually doesn't work correctly on anything but sockets and pipes */
824 flags &= ~EVMETHOD_KQUEUE;
825#endif
826 }
774 827
775 method = 0; 828 method = 0;
829#if EV_USE_PORT
830 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags);
831#endif
776#if EV_USE_KQUEUE 832#if EV_USE_KQUEUE
777 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 833 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
778#endif 834#endif
779#if EV_USE_EPOLL 835#if EV_USE_EPOLL
780 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 836 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
781#endif 837#endif
782#if EV_USE_POLL 838#if EV_USE_POLL
783 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 839 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags);
784#endif 840#endif
785#if EV_USE_SELECT 841#if EV_USE_SELECT
786 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 842 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
787#endif 843#endif
788 844
789 ev_init (&sigev, sigcb); 845 ev_init (&sigev, sigcb);
790 ev_set_priority (&sigev, EV_MAXPRI); 846 ev_set_priority (&sigev, EV_MAXPRI);
791 } 847 }
792} 848}
793 849
794void 850static void
795loop_destroy (EV_P) 851loop_destroy (EV_P)
796{ 852{
797 int i; 853 int i;
798 854
855#if EV_USE_PORT
856 if (method == EVMETHOD_PORT ) port_destroy (EV_A);
857#endif
799#if EV_USE_KQUEUE 858#if EV_USE_KQUEUE
800 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 859 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
801#endif 860#endif
802#if EV_USE_EPOLL 861#if EV_USE_EPOLL
803 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 862 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
… …
811 870
812 for (i = NUMPRI; i--; ) 871 for (i = NUMPRI; i--; )
813 array_free (pending, [i]); 872 array_free (pending, [i]);
814 873
815 /* have to use the microsoft-never-gets-it-right macro */ 874 /* have to use the microsoft-never-gets-it-right macro */
816 array_free (fdchange, EMPTY); 875 array_free (fdchange, EMPTY0);
817 array_free (timer, EMPTY); 876 array_free (timer, EMPTY0);
818#if EV_PERIODICS 877#if EV_PERIODICS
819 array_free (periodic, EMPTY); 878 array_free (periodic, EMPTY0);
820#endif 879#endif
821 array_free (idle, EMPTY); 880 array_free (idle, EMPTY0);
822 array_free (prepare, EMPTY); 881 array_free (prepare, EMPTY0);
823 array_free (check, EMPTY); 882 array_free (check, EMPTY0);
824 883
825 method = 0; 884 method = 0;
826} 885}
827 886
828static void 887static void
829loop_fork (EV_P) 888loop_fork (EV_P)
830{ 889{
890#if EV_USE_PORT
891 if (method == EVMETHOD_PORT ) port_fork (EV_A);
892#endif
893#if EV_USE_KQUEUE
894 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
895#endif
831#if EV_USE_EPOLL 896#if EV_USE_EPOLL
832 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 897 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
833#endif
834#if EV_USE_KQUEUE
835 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
836#endif 898#endif
837 899
838 if (ev_is_active (&sigev)) 900 if (ev_is_active (&sigev))
839 { 901 {
840 /* default loop */ 902 /* default loop */
… …
853 postfork = 0; 915 postfork = 0;
854} 916}
855 917
856#if EV_MULTIPLICITY 918#if EV_MULTIPLICITY
857struct ev_loop * 919struct ev_loop *
858ev_loop_new (int methods) 920ev_loop_new (unsigned int flags)
859{ 921{
860 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 922 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
861 923
862 memset (loop, 0, sizeof (struct ev_loop)); 924 memset (loop, 0, sizeof (struct ev_loop));
863 925
864 loop_init (EV_A_ methods); 926 loop_init (EV_A_ flags);
865 927
866 if (ev_method (EV_A)) 928 if (ev_method (EV_A))
867 return loop; 929 return loop;
868 930
869 return 0; 931 return 0;
… …
884 946
885#endif 947#endif
886 948
887#if EV_MULTIPLICITY 949#if EV_MULTIPLICITY
888struct ev_loop * 950struct ev_loop *
951ev_default_loop_init (unsigned int flags)
889#else 952#else
890int 953int
954ev_default_loop (unsigned int flags)
891#endif 955#endif
892ev_default_loop (int methods)
893{ 956{
894 if (sigpipe [0] == sigpipe [1]) 957 if (sigpipe [0] == sigpipe [1])
895 if (pipe (sigpipe)) 958 if (pipe (sigpipe))
896 return 0; 959 return 0;
897 960
898 if (!default_loop) 961 if (!ev_default_loop_ptr)
899 { 962 {
900#if EV_MULTIPLICITY 963#if EV_MULTIPLICITY
901 struct ev_loop *loop = default_loop = &default_loop_struct; 964 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
902#else 965#else
903 default_loop = 1; 966 ev_default_loop_ptr = 1;
904#endif 967#endif
905 968
906 loop_init (EV_A_ methods); 969 loop_init (EV_A_ flags);
907 970
908 if (ev_method (EV_A)) 971 if (ev_method (EV_A))
909 { 972 {
910 siginit (EV_A); 973 siginit (EV_A);
911 974
… …
915 ev_signal_start (EV_A_ &childev); 978 ev_signal_start (EV_A_ &childev);
916 ev_unref (EV_A); /* child watcher should not keep loop alive */ 979 ev_unref (EV_A); /* child watcher should not keep loop alive */
917#endif 980#endif
918 } 981 }
919 else 982 else
920 default_loop = 0; 983 ev_default_loop_ptr = 0;
921 } 984 }
922 985
923 return default_loop; 986 return ev_default_loop_ptr;
924} 987}
925 988
926void 989void
927ev_default_destroy (void) 990ev_default_destroy (void)
928{ 991{
929#if EV_MULTIPLICITY 992#if EV_MULTIPLICITY
930 struct ev_loop *loop = default_loop; 993 struct ev_loop *loop = ev_default_loop_ptr;
931#endif 994#endif
932 995
933#ifndef _WIN32 996#ifndef _WIN32
934 ev_ref (EV_A); /* child watcher */ 997 ev_ref (EV_A); /* child watcher */
935 ev_signal_stop (EV_A_ &childev); 998 ev_signal_stop (EV_A_ &childev);
… …
946 1009
947void 1010void
948ev_default_fork (void) 1011ev_default_fork (void)
949{ 1012{
950#if EV_MULTIPLICITY 1013#if EV_MULTIPLICITY
951 struct ev_loop *loop = default_loop; 1014 struct ev_loop *loop = ev_default_loop_ptr;
952#endif 1015#endif
953 1016
954 if (method) 1017 if (method)
955 postfork = 1; 1018 postfork = 1;
956} 1019}
… …
967 return 1; 1030 return 1;
968 1031
969 return 0; 1032 return 0;
970} 1033}
971 1034
972static void 1035inline void
973call_pending (EV_P) 1036call_pending (EV_P)
974{ 1037{
975 int pri; 1038 int pri;
976 1039
977 for (pri = NUMPRI; pri--; ) 1040 for (pri = NUMPRI; pri--; )
978 while (pendingcnt [pri]) 1041 while (pendingcnt [pri])
979 { 1042 {
980 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1043 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
981 1044
982 if (p->w) 1045 if (expect_true (p->w))
983 { 1046 {
984 p->w->pending = 0; 1047 p->w->pending = 0;
985 EV_CB_INVOKE (p->w, p->events); 1048 EV_CB_INVOKE (p->w, p->events);
986 } 1049 }
987 } 1050 }
988} 1051}
989 1052
990static void 1053inline void
991timers_reify (EV_P) 1054timers_reify (EV_P)
992{ 1055{
993 while (timercnt && ((WT)timers [0])->at <= mn_now) 1056 while (timercnt && ((WT)timers [0])->at <= mn_now)
994 { 1057 {
995 struct ev_timer *w = timers [0]; 1058 struct ev_timer *w = timers [0];
… …
1013 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1076 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1014 } 1077 }
1015} 1078}
1016 1079
1017#if EV_PERIODICS 1080#if EV_PERIODICS
1018static void 1081inline void
1019periodics_reify (EV_P) 1082periodics_reify (EV_P)
1020{ 1083{
1021 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1084 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1022 { 1085 {
1023 struct ev_periodic *w = periodics [0]; 1086 struct ev_periodic *w = periodics [0];
… …
1025 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1088 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
1026 1089
1027 /* first reschedule or stop timer */ 1090 /* first reschedule or stop timer */
1028 if (w->reschedule_cb) 1091 if (w->reschedule_cb)
1029 { 1092 {
1030 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1093 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1031
1032 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1094 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1033 downheap ((WT *)periodics, periodiccnt, 0); 1095 downheap ((WT *)periodics, periodiccnt, 0);
1034 } 1096 }
1035 else if (w->interval) 1097 else if (w->interval)
1036 { 1098 {
… …
1083 ev_rt_now = ev_time (); 1145 ev_rt_now = ev_time ();
1084 return 1; 1146 return 1;
1085 } 1147 }
1086} 1148}
1087 1149
1088static void 1150inline void
1089time_update (EV_P) 1151time_update (EV_P)
1090{ 1152{
1091 int i; 1153 int i;
1092 1154
1093#if EV_USE_MONOTONIC 1155#if EV_USE_MONOTONIC
… …
1154ev_loop (EV_P_ int flags) 1216ev_loop (EV_P_ int flags)
1155{ 1217{
1156 double block; 1218 double block;
1157 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1219 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1158 1220
1159 do 1221 while (activecnt)
1160 { 1222 {
1161 /* queue check watchers (and execute them) */ 1223 /* queue check watchers (and execute them) */
1162 if (expect_false (preparecnt)) 1224 if (expect_false (preparecnt))
1163 { 1225 {
1164 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1226 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
… …
1204 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1266 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1205 if (block > to) block = to; 1267 if (block > to) block = to;
1206 } 1268 }
1207#endif 1269#endif
1208 1270
1209 if (block < 0.) block = 0.; 1271 if (expect_false (block < 0.)) block = 0.;
1210 } 1272 }
1211 1273
1212 method_poll (EV_A_ block); 1274 method_poll (EV_A_ block);
1213 1275
1214 /* update ev_rt_now, do magic */ 1276 /* update ev_rt_now, do magic */
… …
1223 /* queue idle watchers unless io or timers are pending */ 1285 /* queue idle watchers unless io or timers are pending */
1224 if (idlecnt && !any_pending (EV_A)) 1286 if (idlecnt && !any_pending (EV_A))
1225 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1287 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1226 1288
1227 /* queue check watchers, to be executed first */ 1289 /* queue check watchers, to be executed first */
1228 if (checkcnt) 1290 if (expect_false (checkcnt))
1229 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1291 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1230 1292
1231 call_pending (EV_A); 1293 call_pending (EV_A);
1294
1295 if (expect_false (loop_done))
1296 break;
1232 } 1297 }
1233 while (activecnt && !loop_done);
1234 1298
1235 if (loop_done != 2) 1299 if (loop_done != 2)
1236 loop_done = 0; 1300 loop_done = 0;
1237} 1301}
1238 1302
… …
1298void 1362void
1299ev_io_start (EV_P_ struct ev_io *w) 1363ev_io_start (EV_P_ struct ev_io *w)
1300{ 1364{
1301 int fd = w->fd; 1365 int fd = w->fd;
1302 1366
1303 if (ev_is_active (w)) 1367 if (expect_false (ev_is_active (w)))
1304 return; 1368 return;
1305 1369
1306 assert (("ev_io_start called with negative fd", fd >= 0)); 1370 assert (("ev_io_start called with negative fd", fd >= 0));
1307 1371
1308 ev_start (EV_A_ (W)w, 1); 1372 ev_start (EV_A_ (W)w, 1);
… …
1314 1378
1315void 1379void
1316ev_io_stop (EV_P_ struct ev_io *w) 1380ev_io_stop (EV_P_ struct ev_io *w)
1317{ 1381{
1318 ev_clear_pending (EV_A_ (W)w); 1382 ev_clear_pending (EV_A_ (W)w);
1319 if (!ev_is_active (w)) 1383 if (expect_false (!ev_is_active (w)))
1320 return; 1384 return;
1321 1385
1322 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1386 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1323 1387
1324 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1388 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
… …
1328} 1392}
1329 1393
1330void 1394void
1331ev_timer_start (EV_P_ struct ev_timer *w) 1395ev_timer_start (EV_P_ struct ev_timer *w)
1332{ 1396{
1333 if (ev_is_active (w)) 1397 if (expect_false (ev_is_active (w)))
1334 return; 1398 return;
1335 1399
1336 ((WT)w)->at += mn_now; 1400 ((WT)w)->at += mn_now;
1337 1401
1338 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1402 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1339 1403
1340 ev_start (EV_A_ (W)w, ++timercnt); 1404 ev_start (EV_A_ (W)w, ++timercnt);
1341 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1405 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1342 timers [timercnt - 1] = w; 1406 timers [timercnt - 1] = w;
1343 upheap ((WT *)timers, timercnt - 1); 1407 upheap ((WT *)timers, timercnt - 1);
1344 1408
1345 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1409 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1346} 1410}
1347 1411
1348void 1412void
1349ev_timer_stop (EV_P_ struct ev_timer *w) 1413ev_timer_stop (EV_P_ struct ev_timer *w)
1350{ 1414{
1351 ev_clear_pending (EV_A_ (W)w); 1415 ev_clear_pending (EV_A_ (W)w);
1352 if (!ev_is_active (w)) 1416 if (expect_false (!ev_is_active (w)))
1353 return; 1417 return;
1354 1418
1355 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1419 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1356 1420
1357 if (((W)w)->active < timercnt--) 1421 if (expect_true (((W)w)->active < timercnt--))
1358 { 1422 {
1359 timers [((W)w)->active - 1] = timers [timercnt]; 1423 timers [((W)w)->active - 1] = timers [timercnt];
1360 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1424 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1361 } 1425 }
1362 1426
… …
1377 } 1441 }
1378 else 1442 else
1379 ev_timer_stop (EV_A_ w); 1443 ev_timer_stop (EV_A_ w);
1380 } 1444 }
1381 else if (w->repeat) 1445 else if (w->repeat)
1446 {
1447 w->at = w->repeat;
1382 ev_timer_start (EV_A_ w); 1448 ev_timer_start (EV_A_ w);
1449 }
1383} 1450}
1384 1451
1385#if EV_PERIODICS 1452#if EV_PERIODICS
1386void 1453void
1387ev_periodic_start (EV_P_ struct ev_periodic *w) 1454ev_periodic_start (EV_P_ struct ev_periodic *w)
1388{ 1455{
1389 if (ev_is_active (w)) 1456 if (expect_false (ev_is_active (w)))
1390 return; 1457 return;
1391 1458
1392 if (w->reschedule_cb) 1459 if (w->reschedule_cb)
1393 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1460 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1394 else if (w->interval) 1461 else if (w->interval)
… …
1397 /* this formula differs from the one in periodic_reify because we do not always round up */ 1464 /* this formula differs from the one in periodic_reify because we do not always round up */
1398 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1465 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1399 } 1466 }
1400 1467
1401 ev_start (EV_A_ (W)w, ++periodiccnt); 1468 ev_start (EV_A_ (W)w, ++periodiccnt);
1402 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1469 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1403 periodics [periodiccnt - 1] = w; 1470 periodics [periodiccnt - 1] = w;
1404 upheap ((WT *)periodics, periodiccnt - 1); 1471 upheap ((WT *)periodics, periodiccnt - 1);
1405 1472
1406 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1473 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1407} 1474}
1408 1475
1409void 1476void
1410ev_periodic_stop (EV_P_ struct ev_periodic *w) 1477ev_periodic_stop (EV_P_ struct ev_periodic *w)
1411{ 1478{
1412 ev_clear_pending (EV_A_ (W)w); 1479 ev_clear_pending (EV_A_ (W)w);
1413 if (!ev_is_active (w)) 1480 if (expect_false (!ev_is_active (w)))
1414 return; 1481 return;
1415 1482
1416 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1483 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1417 1484
1418 if (((W)w)->active < periodiccnt--) 1485 if (expect_true (((W)w)->active < periodiccnt--))
1419 { 1486 {
1420 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1487 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1421 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1488 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1422 } 1489 }
1423 1490
… …
1434#endif 1501#endif
1435 1502
1436void 1503void
1437ev_idle_start (EV_P_ struct ev_idle *w) 1504ev_idle_start (EV_P_ struct ev_idle *w)
1438{ 1505{
1439 if (ev_is_active (w)) 1506 if (expect_false (ev_is_active (w)))
1440 return; 1507 return;
1441 1508
1442 ev_start (EV_A_ (W)w, ++idlecnt); 1509 ev_start (EV_A_ (W)w, ++idlecnt);
1443 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1510 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1444 idles [idlecnt - 1] = w; 1511 idles [idlecnt - 1] = w;
1445} 1512}
1446 1513
1447void 1514void
1448ev_idle_stop (EV_P_ struct ev_idle *w) 1515ev_idle_stop (EV_P_ struct ev_idle *w)
1449{ 1516{
1450 ev_clear_pending (EV_A_ (W)w); 1517 ev_clear_pending (EV_A_ (W)w);
1451 if (!ev_is_active (w)) 1518 if (expect_false (!ev_is_active (w)))
1452 return; 1519 return;
1453 1520
1454 idles [((W)w)->active - 1] = idles [--idlecnt]; 1521 idles [((W)w)->active - 1] = idles [--idlecnt];
1455 ev_stop (EV_A_ (W)w); 1522 ev_stop (EV_A_ (W)w);
1456} 1523}
1457 1524
1458void 1525void
1459ev_prepare_start (EV_P_ struct ev_prepare *w) 1526ev_prepare_start (EV_P_ struct ev_prepare *w)
1460{ 1527{
1461 if (ev_is_active (w)) 1528 if (expect_false (ev_is_active (w)))
1462 return; 1529 return;
1463 1530
1464 ev_start (EV_A_ (W)w, ++preparecnt); 1531 ev_start (EV_A_ (W)w, ++preparecnt);
1465 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1532 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1466 prepares [preparecnt - 1] = w; 1533 prepares [preparecnt - 1] = w;
1467} 1534}
1468 1535
1469void 1536void
1470ev_prepare_stop (EV_P_ struct ev_prepare *w) 1537ev_prepare_stop (EV_P_ struct ev_prepare *w)
1471{ 1538{
1472 ev_clear_pending (EV_A_ (W)w); 1539 ev_clear_pending (EV_A_ (W)w);
1473 if (!ev_is_active (w)) 1540 if (expect_false (!ev_is_active (w)))
1474 return; 1541 return;
1475 1542
1476 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1543 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1477 ev_stop (EV_A_ (W)w); 1544 ev_stop (EV_A_ (W)w);
1478} 1545}
1479 1546
1480void 1547void
1481ev_check_start (EV_P_ struct ev_check *w) 1548ev_check_start (EV_P_ struct ev_check *w)
1482{ 1549{
1483 if (ev_is_active (w)) 1550 if (expect_false (ev_is_active (w)))
1484 return; 1551 return;
1485 1552
1486 ev_start (EV_A_ (W)w, ++checkcnt); 1553 ev_start (EV_A_ (W)w, ++checkcnt);
1487 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1554 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1488 checks [checkcnt - 1] = w; 1555 checks [checkcnt - 1] = w;
1489} 1556}
1490 1557
1491void 1558void
1492ev_check_stop (EV_P_ struct ev_check *w) 1559ev_check_stop (EV_P_ struct ev_check *w)
1493{ 1560{
1494 ev_clear_pending (EV_A_ (W)w); 1561 ev_clear_pending (EV_A_ (W)w);
1495 if (!ev_is_active (w)) 1562 if (expect_false (!ev_is_active (w)))
1496 return; 1563 return;
1497 1564
1498 checks [((W)w)->active - 1] = checks [--checkcnt]; 1565 checks [((W)w)->active - 1] = checks [--checkcnt];
1499 ev_stop (EV_A_ (W)w); 1566 ev_stop (EV_A_ (W)w);
1500} 1567}
… …
1505 1572
1506void 1573void
1507ev_signal_start (EV_P_ struct ev_signal *w) 1574ev_signal_start (EV_P_ struct ev_signal *w)
1508{ 1575{
1509#if EV_MULTIPLICITY 1576#if EV_MULTIPLICITY
1510 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1577 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1511#endif 1578#endif
1512 if (ev_is_active (w)) 1579 if (expect_false (ev_is_active (w)))
1513 return; 1580 return;
1514 1581
1515 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1582 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1516 1583
1517 ev_start (EV_A_ (W)w, 1); 1584 ev_start (EV_A_ (W)w, 1);
… …
1534 1601
1535void 1602void
1536ev_signal_stop (EV_P_ struct ev_signal *w) 1603ev_signal_stop (EV_P_ struct ev_signal *w)
1537{ 1604{
1538 ev_clear_pending (EV_A_ (W)w); 1605 ev_clear_pending (EV_A_ (W)w);
1539 if (!ev_is_active (w)) 1606 if (expect_false (!ev_is_active (w)))
1540 return; 1607 return;
1541 1608
1542 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1609 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1543 ev_stop (EV_A_ (W)w); 1610 ev_stop (EV_A_ (W)w);
1544 1611
… …
1548 1615
1549void 1616void
1550ev_child_start (EV_P_ struct ev_child *w) 1617ev_child_start (EV_P_ struct ev_child *w)
1551{ 1618{
1552#if EV_MULTIPLICITY 1619#if EV_MULTIPLICITY
1553 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1620 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1554#endif 1621#endif
1555 if (ev_is_active (w)) 1622 if (expect_false (ev_is_active (w)))
1556 return; 1623 return;
1557 1624
1558 ev_start (EV_A_ (W)w, 1); 1625 ev_start (EV_A_ (W)w, 1);
1559 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1626 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1560} 1627}
1561 1628
1562void 1629void
1563ev_child_stop (EV_P_ struct ev_child *w) 1630ev_child_stop (EV_P_ struct ev_child *w)
1564{ 1631{
1565 ev_clear_pending (EV_A_ (W)w); 1632 ev_clear_pending (EV_A_ (W)w);
1566 if (!ev_is_active (w)) 1633 if (expect_false (!ev_is_active (w)))
1567 return; 1634 return;
1568 1635
1569 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1636 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1570 ev_stop (EV_A_ (W)w); 1637 ev_stop (EV_A_ (W)w);
1571} 1638}
… …
1608void 1675void
1609ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1676ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1610{ 1677{
1611 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 1678 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1612 1679
1613 if (!once) 1680 if (expect_false (!once))
1681 {
1614 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1682 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1615 else 1683 return;
1616 { 1684 }
1685
1617 once->cb = cb; 1686 once->cb = cb;
1618 once->arg = arg; 1687 once->arg = arg;
1619 1688
1620 ev_init (&once->io, once_cb_io); 1689 ev_init (&once->io, once_cb_io);
1621 if (fd >= 0) 1690 if (fd >= 0)
1622 { 1691 {
1623 ev_io_set (&once->io, fd, events); 1692 ev_io_set (&once->io, fd, events);
1624 ev_io_start (EV_A_ &once->io); 1693 ev_io_start (EV_A_ &once->io);
1625 } 1694 }
1626 1695
1627 ev_init (&once->to, once_cb_to); 1696 ev_init (&once->to, once_cb_to);
1628 if (timeout >= 0.) 1697 if (timeout >= 0.)
1629 { 1698 {
1630 ev_timer_set (&once->to, timeout, 0.); 1699 ev_timer_set (&once->to, timeout, 0.);
1631 ev_timer_start (EV_A_ &once->to); 1700 ev_timer_start (EV_A_ &once->to);
1632 }
1633 } 1701 }
1634} 1702}
1635 1703
1636#ifdef __cplusplus 1704#ifdef __cplusplus
1637} 1705}

Diff Legend

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