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.125 by root, Sat Nov 17 02:28:43 2007 UTC

… …
59 59
60# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE) 60# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE)
61# define EV_USE_KQUEUE 1 61# define EV_USE_KQUEUE 1
62# endif 62# endif
63 63
64# if HAVE_PORT_H && HAVE_PORT_CREATE && !defined (EV_USE_PORT)
65# define EV_USE_PORT 1
66# endif
67
64#endif 68#endif
65 69
66#include <math.h> 70#include <math.h>
67#include <stdlib.h> 71#include <stdlib.h>
68#include <fcntl.h> 72#include <fcntl.h>
… …
90#endif 94#endif
91 95
92/**/ 96/**/
93 97
94#ifndef EV_USE_MONOTONIC 98#ifndef EV_USE_MONOTONIC
95# define EV_USE_MONOTONIC 1 99# define EV_USE_MONOTONIC 0
100#endif
101
102#ifndef EV_USE_REALTIME
103# define EV_USE_REALTIME 0
96#endif 104#endif
97 105
98#ifndef EV_USE_SELECT 106#ifndef EV_USE_SELECT
99# define EV_USE_SELECT 1 107# define EV_USE_SELECT 1
100#endif 108#endif
101 109
102#ifndef EV_USE_POLL 110#ifndef EV_USE_POLL
103# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */ 111# ifdef _WIN32
112# define EV_USE_POLL 0
113# else
114# define EV_USE_POLL 1
115# endif
104#endif 116#endif
105 117
106#ifndef EV_USE_EPOLL 118#ifndef EV_USE_EPOLL
107# define EV_USE_EPOLL 0 119# define EV_USE_EPOLL 0
108#endif 120#endif
109 121
110#ifndef EV_USE_KQUEUE 122#ifndef EV_USE_KQUEUE
111# define EV_USE_KQUEUE 0 123# define EV_USE_KQUEUE 0
112#endif 124#endif
113 125
114#ifndef EV_USE_REALTIME 126#ifndef EV_USE_PORT
115# define EV_USE_REALTIME 1 127# define EV_USE_PORT 0
116#endif 128#endif
117 129
118/**/ 130/**/
131
132/* darwin simply cannot be helped */
133#ifdef __APPLE__
134# undef EV_USE_POLL
135# undef EV_USE_KQUEUE
136#endif
119 137
120#ifndef CLOCK_MONOTONIC 138#ifndef CLOCK_MONOTONIC
121# undef EV_USE_MONOTONIC 139# undef EV_USE_MONOTONIC
122# define EV_USE_MONOTONIC 0 140# define EV_USE_MONOTONIC 0
123#endif 141#endif
… …
132#endif 150#endif
133 151
134/**/ 152/**/
135 153
136#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 154#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) */ 155#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 */ 156#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 */ 157/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
140 158
141#ifdef EV_H 159#ifdef EV_H
142# include EV_H 160# include EV_H
143#else 161#else
144# include "ev.h" 162# include "ev.h"
145#endif 163#endif
146 164
147#if __GNUC__ >= 3 165#if __GNUC__ >= 3
148# define expect(expr,value) __builtin_expect ((expr),(value)) 166# define expect(expr,value) __builtin_expect ((expr),(value))
149# define inline inline 167# define inline static inline
150#else 168#else
151# define expect(expr,value) (expr) 169# define expect(expr,value) (expr)
152# define inline static 170# define inline static
153#endif 171#endif
154 172
… …
156#define expect_true(expr) expect ((expr) != 0, 1) 174#define expect_true(expr) expect ((expr) != 0, 1)
157 175
158#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 176#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
159#define ABSPRI(w) ((w)->priority - EV_MINPRI) 177#define ABSPRI(w) ((w)->priority - EV_MINPRI)
160 178
161#define EMPTY /* required for microsofts broken pseudo-c compiler */ 179#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
180#define EMPTY2(a,b) /* used to suppress some warnings */
162 181
163typedef struct ev_watcher *W; 182typedef struct ev_watcher *W;
164typedef struct ev_watcher_list *WL; 183typedef struct ev_watcher_list *WL;
165typedef struct ev_watcher_time *WT; 184typedef struct ev_watcher_time *WT;
166 185
… …
246 #include "ev_vars.h" 265 #include "ev_vars.h"
247 #undef VAR 266 #undef VAR
248 }; 267 };
249 #include "ev_wrap.h" 268 #include "ev_wrap.h"
250 269
251 struct ev_loop default_loop_struct; 270 static struct ev_loop default_loop_struct;
252 static struct ev_loop *default_loop; 271 struct ev_loop *ev_default_loop_ptr;
253 272
254#else 273#else
255 274
256 ev_tstamp ev_rt_now; 275 ev_tstamp ev_rt_now;
257 #define VAR(name,decl) static decl; 276 #define VAR(name,decl) static decl;
258 #include "ev_vars.h" 277 #include "ev_vars.h"
259 #undef VAR 278 #undef VAR
260 279
261 static int default_loop; 280 static int ev_default_loop_ptr;
262 281
263#endif 282#endif
264 283
265/*****************************************************************************/ 284/*****************************************************************************/
266 285
… …
299{ 318{
300 return ev_rt_now; 319 return ev_rt_now;
301} 320}
302#endif 321#endif
303 322
304#define array_roundsize(type,n) ((n) | 4 & ~3) 323#define array_roundsize(type,n) (((n) | 4) & ~3)
305 324
306#define array_needsize(type,base,cur,cnt,init) \ 325#define array_needsize(type,base,cur,cnt,init) \
307 if (expect_false ((cnt) > cur)) \ 326 if (expect_false ((cnt) > cur)) \
308 { \ 327 { \
309 int newcnt = cur; \ 328 int newcnt = cur; \
… …
347void 366void
348ev_feed_event (EV_P_ void *w, int revents) 367ev_feed_event (EV_P_ void *w, int revents)
349{ 368{
350 W w_ = (W)w; 369 W w_ = (W)w;
351 370
352 if (w_->pending) 371 if (expect_false (w_->pending))
353 { 372 {
354 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 373 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
355 return; 374 return;
356 } 375 }
357 376
358 w_->pending = ++pendingcnt [ABSPRI (w_)]; 377 w_->pending = ++pendingcnt [ABSPRI (w_)];
359 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void)); 378 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
360 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 379 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
361 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 380 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
362} 381}
363 382
364static void 383static void
… …
391 fd_event (EV_A_ fd, revents); 410 fd_event (EV_A_ fd, revents);
392} 411}
393 412
394/*****************************************************************************/ 413/*****************************************************************************/
395 414
396static void 415inline void
397fd_reify (EV_P) 416fd_reify (EV_P)
398{ 417{
399 int i; 418 int i;
400 419
401 for (i = 0; i < fdchangecnt; ++i) 420 for (i = 0; i < fdchangecnt; ++i)
… …
428} 447}
429 448
430static void 449static void
431fd_change (EV_P_ int fd) 450fd_change (EV_P_ int fd)
432{ 451{
433 if (anfds [fd].reify) 452 if (expect_false (anfds [fd].reify))
434 return; 453 return;
435 454
436 anfds [fd].reify = 1; 455 anfds [fd].reify = 1;
437 456
438 ++fdchangecnt; 457 ++fdchangecnt;
439 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 458 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
440 fdchanges [fdchangecnt - 1] = fd; 459 fdchanges [fdchangecnt - 1] = fd;
441} 460}
442 461
443static void 462static void
444fd_kill (EV_P_ int fd) 463fd_kill (EV_P_ int fd)
… …
450 ev_io_stop (EV_A_ w); 469 ev_io_stop (EV_A_ w);
451 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 470 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
452 } 471 }
453} 472}
454 473
455static int 474inline int
456fd_valid (int fd) 475fd_valid (int fd)
457{ 476{
458#ifdef _WIN32 477#ifdef _WIN32
459 return _get_osfhandle (fd) != -1; 478 return _get_osfhandle (fd) != -1;
460#else 479#else
… …
602ev_feed_signal_event (EV_P_ int signum) 621ev_feed_signal_event (EV_P_ int signum)
603{ 622{
604 WL w; 623 WL w;
605 624
606#if EV_MULTIPLICITY 625#if EV_MULTIPLICITY
607 assert (("feeding signal events is only supported in the default loop", loop == default_loop)); 626 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
608#endif 627#endif
609 628
610 --signum; 629 --signum;
611 630
612 if (signum < 0 || signum >= signalmax) 631 if (signum < 0 || signum >= signalmax)
… …
629 for (signum = signalmax; signum--; ) 648 for (signum = signalmax; signum--; )
630 if (signals [signum].gotsig) 649 if (signals [signum].gotsig)
631 ev_feed_signal_event (EV_A_ signum + 1); 650 ev_feed_signal_event (EV_A_ signum + 1);
632} 651}
633 652
634inline void 653static void
635fd_intern (int fd) 654fd_intern (int fd)
636{ 655{
637#ifdef _WIN32 656#ifdef _WIN32
638 int arg = 1; 657 int arg = 1;
639 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 658 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
698 717
699#endif 718#endif
700 719
701/*****************************************************************************/ 720/*****************************************************************************/
702 721
722#if EV_USE_PORT
723# include "ev_port.c"
724#endif
703#if EV_USE_KQUEUE 725#if EV_USE_KQUEUE
704# include "ev_kqueue.c" 726# include "ev_kqueue.c"
705#endif 727#endif
706#if EV_USE_EPOLL 728#if EV_USE_EPOLL
707# include "ev_epoll.c" 729# include "ev_epoll.c"
… …
735 return getuid () != geteuid () 757 return getuid () != geteuid ()
736 || getgid () != getegid (); 758 || getgid () != getegid ();
737#endif 759#endif
738} 760}
739 761
740int 762unsigned int
741ev_method (EV_P) 763ev_method (EV_P)
742{ 764{
743 return method; 765 return method;
744} 766}
745 767
746static void 768static void
747loop_init (EV_P_ int methods) 769loop_init (EV_P_ unsigned int flags)
748{ 770{
749 if (!method) 771 if (!method)
750 { 772 {
751#if EV_USE_MONOTONIC 773#if EV_USE_MONOTONIC
752 { 774 {
… …
759 ev_rt_now = ev_time (); 781 ev_rt_now = ev_time ();
760 mn_now = get_clock (); 782 mn_now = get_clock ();
761 now_floor = mn_now; 783 now_floor = mn_now;
762 rtmn_diff = ev_rt_now - mn_now; 784 rtmn_diff = ev_rt_now - mn_now;
763 785
764 if (methods == EVMETHOD_AUTO) 786 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS"))
765 if (!enable_secure () && getenv ("LIBEV_METHODS"))
766 methods = atoi (getenv ("LIBEV_METHODS")); 787 flags = atoi (getenv ("LIBEV_FLAGS"));
767 else 788
768 methods = EVMETHOD_ANY; 789 if (!(flags & 0x0000ffff))
790 flags |= 0x0000ffff;
769 791
770 method = 0; 792 method = 0;
793#if EV_USE_PORT
794 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags);
795#endif
771#if EV_USE_KQUEUE 796#if EV_USE_KQUEUE
772 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 797 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
773#endif 798#endif
774#if EV_USE_EPOLL 799#if EV_USE_EPOLL
775 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 800 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
776#endif 801#endif
777#if EV_USE_POLL 802#if EV_USE_POLL
778 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 803 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags);
779#endif 804#endif
780#if EV_USE_SELECT 805#if EV_USE_SELECT
781 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 806 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
782#endif 807#endif
783 808
784 ev_init (&sigev, sigcb); 809 ev_init (&sigev, sigcb);
785 ev_set_priority (&sigev, EV_MAXPRI); 810 ev_set_priority (&sigev, EV_MAXPRI);
786 } 811 }
787} 812}
788 813
789void 814static void
790loop_destroy (EV_P) 815loop_destroy (EV_P)
791{ 816{
792 int i; 817 int i;
793 818
819#if EV_USE_PORT
820 if (method == EVMETHOD_PORT ) port_destroy (EV_A);
821#endif
794#if EV_USE_KQUEUE 822#if EV_USE_KQUEUE
795 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 823 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
796#endif 824#endif
797#if EV_USE_EPOLL 825#if EV_USE_EPOLL
798 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 826 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
… …
806 834
807 for (i = NUMPRI; i--; ) 835 for (i = NUMPRI; i--; )
808 array_free (pending, [i]); 836 array_free (pending, [i]);
809 837
810 /* have to use the microsoft-never-gets-it-right macro */ 838 /* have to use the microsoft-never-gets-it-right macro */
811 array_free (fdchange, EMPTY); 839 array_free (fdchange, EMPTY0);
812 array_free (timer, EMPTY); 840 array_free (timer, EMPTY0);
813#if EV_PERIODICS 841#if EV_PERIODICS
814 array_free (periodic, EMPTY); 842 array_free (periodic, EMPTY0);
815#endif 843#endif
816 array_free (idle, EMPTY); 844 array_free (idle, EMPTY0);
817 array_free (prepare, EMPTY); 845 array_free (prepare, EMPTY0);
818 array_free (check, EMPTY); 846 array_free (check, EMPTY0);
819 847
820 method = 0; 848 method = 0;
821} 849}
822 850
823static void 851static void
824loop_fork (EV_P) 852loop_fork (EV_P)
825{ 853{
854#if EV_USE_PORT
855 if (method == EVMETHOD_PORT ) port_fork (EV_A);
856#endif
857#if EV_USE_KQUEUE
858 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
859#endif
826#if EV_USE_EPOLL 860#if EV_USE_EPOLL
827 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 861 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 862#endif
832 863
833 if (ev_is_active (&sigev)) 864 if (ev_is_active (&sigev))
834 { 865 {
835 /* default loop */ 866 /* default loop */
… …
848 postfork = 0; 879 postfork = 0;
849} 880}
850 881
851#if EV_MULTIPLICITY 882#if EV_MULTIPLICITY
852struct ev_loop * 883struct ev_loop *
853ev_loop_new (int methods) 884ev_loop_new (unsigned int flags)
854{ 885{
855 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 886 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
856 887
857 memset (loop, 0, sizeof (struct ev_loop)); 888 memset (loop, 0, sizeof (struct ev_loop));
858 889
859 loop_init (EV_A_ methods); 890 loop_init (EV_A_ flags);
860 891
861 if (ev_method (EV_A)) 892 if (ev_method (EV_A))
862 return loop; 893 return loop;
863 894
864 return 0; 895 return 0;
… …
879 910
880#endif 911#endif
881 912
882#if EV_MULTIPLICITY 913#if EV_MULTIPLICITY
883struct ev_loop * 914struct ev_loop *
915ev_default_loop_init (unsigned int flags)
884#else 916#else
885int 917int
918ev_default_loop (unsigned int flags)
886#endif 919#endif
887ev_default_loop (int methods)
888{ 920{
889 if (sigpipe [0] == sigpipe [1]) 921 if (sigpipe [0] == sigpipe [1])
890 if (pipe (sigpipe)) 922 if (pipe (sigpipe))
891 return 0; 923 return 0;
892 924
893 if (!default_loop) 925 if (!ev_default_loop_ptr)
894 { 926 {
895#if EV_MULTIPLICITY 927#if EV_MULTIPLICITY
896 struct ev_loop *loop = default_loop = &default_loop_struct; 928 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
897#else 929#else
898 default_loop = 1; 930 ev_default_loop_ptr = 1;
899#endif 931#endif
900 932
901 loop_init (EV_A_ methods); 933 loop_init (EV_A_ flags);
902 934
903 if (ev_method (EV_A)) 935 if (ev_method (EV_A))
904 { 936 {
905 siginit (EV_A); 937 siginit (EV_A);
906 938
… …
910 ev_signal_start (EV_A_ &childev); 942 ev_signal_start (EV_A_ &childev);
911 ev_unref (EV_A); /* child watcher should not keep loop alive */ 943 ev_unref (EV_A); /* child watcher should not keep loop alive */
912#endif 944#endif
913 } 945 }
914 else 946 else
915 default_loop = 0; 947 ev_default_loop_ptr = 0;
916 } 948 }
917 949
918 return default_loop; 950 return ev_default_loop_ptr;
919} 951}
920 952
921void 953void
922ev_default_destroy (void) 954ev_default_destroy (void)
923{ 955{
924#if EV_MULTIPLICITY 956#if EV_MULTIPLICITY
925 struct ev_loop *loop = default_loop; 957 struct ev_loop *loop = ev_default_loop_ptr;
926#endif 958#endif
927 959
928#ifndef _WIN32 960#ifndef _WIN32
929 ev_ref (EV_A); /* child watcher */ 961 ev_ref (EV_A); /* child watcher */
930 ev_signal_stop (EV_A_ &childev); 962 ev_signal_stop (EV_A_ &childev);
… …
941 973
942void 974void
943ev_default_fork (void) 975ev_default_fork (void)
944{ 976{
945#if EV_MULTIPLICITY 977#if EV_MULTIPLICITY
946 struct ev_loop *loop = default_loop; 978 struct ev_loop *loop = ev_default_loop_ptr;
947#endif 979#endif
948 980
949 if (method) 981 if (method)
950 postfork = 1; 982 postfork = 1;
951} 983}
… …
962 return 1; 994 return 1;
963 995
964 return 0; 996 return 0;
965} 997}
966 998
967static void 999inline void
968call_pending (EV_P) 1000call_pending (EV_P)
969{ 1001{
970 int pri; 1002 int pri;
971 1003
972 for (pri = NUMPRI; pri--; ) 1004 for (pri = NUMPRI; pri--; )
973 while (pendingcnt [pri]) 1005 while (pendingcnt [pri])
974 { 1006 {
975 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1007 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
976 1008
977 if (p->w) 1009 if (expect_true (p->w))
978 { 1010 {
979 p->w->pending = 0; 1011 p->w->pending = 0;
980 EV_CB_INVOKE (p->w, p->events); 1012 EV_CB_INVOKE (p->w, p->events);
981 } 1013 }
982 } 1014 }
983} 1015}
984 1016
985static void 1017inline void
986timers_reify (EV_P) 1018timers_reify (EV_P)
987{ 1019{
988 while (timercnt && ((WT)timers [0])->at <= mn_now) 1020 while (timercnt && ((WT)timers [0])->at <= mn_now)
989 { 1021 {
990 struct ev_timer *w = timers [0]; 1022 struct ev_timer *w = timers [0];
… …
1008 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1040 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1009 } 1041 }
1010} 1042}
1011 1043
1012#if EV_PERIODICS 1044#if EV_PERIODICS
1013static void 1045inline void
1014periodics_reify (EV_P) 1046periodics_reify (EV_P)
1015{ 1047{
1016 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1048 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1017 { 1049 {
1018 struct ev_periodic *w = periodics [0]; 1050 struct ev_periodic *w = periodics [0];
… …
1020 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1052 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
1021 1053
1022 /* first reschedule or stop timer */ 1054 /* first reschedule or stop timer */
1023 if (w->reschedule_cb) 1055 if (w->reschedule_cb)
1024 { 1056 {
1025 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1057 ((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)); 1058 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1028 downheap ((WT *)periodics, periodiccnt, 0); 1059 downheap ((WT *)periodics, periodiccnt, 0);
1029 } 1060 }
1030 else if (w->interval) 1061 else if (w->interval)
1031 { 1062 {
… …
1078 ev_rt_now = ev_time (); 1109 ev_rt_now = ev_time ();
1079 return 1; 1110 return 1;
1080 } 1111 }
1081} 1112}
1082 1113
1083static void 1114inline void
1084time_update (EV_P) 1115time_update (EV_P)
1085{ 1116{
1086 int i; 1117 int i;
1087 1118
1088#if EV_USE_MONOTONIC 1119#if EV_USE_MONOTONIC
… …
1149ev_loop (EV_P_ int flags) 1180ev_loop (EV_P_ int flags)
1150{ 1181{
1151 double block; 1182 double block;
1152 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1183 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1153 1184
1154 do 1185 while (activecnt)
1155 { 1186 {
1156 /* queue check watchers (and execute them) */ 1187 /* queue check watchers (and execute them) */
1157 if (expect_false (preparecnt)) 1188 if (expect_false (preparecnt))
1158 { 1189 {
1159 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1190 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
… …
1199 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1230 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1200 if (block > to) block = to; 1231 if (block > to) block = to;
1201 } 1232 }
1202#endif 1233#endif
1203 1234
1204 if (block < 0.) block = 0.; 1235 if (expect_false (block < 0.)) block = 0.;
1205 } 1236 }
1206 1237
1207 method_poll (EV_A_ block); 1238 method_poll (EV_A_ block);
1208 1239
1209 /* update ev_rt_now, do magic */ 1240 /* update ev_rt_now, do magic */
… …
1218 /* queue idle watchers unless io or timers are pending */ 1249 /* queue idle watchers unless io or timers are pending */
1219 if (idlecnt && !any_pending (EV_A)) 1250 if (idlecnt && !any_pending (EV_A))
1220 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1251 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1221 1252
1222 /* queue check watchers, to be executed first */ 1253 /* queue check watchers, to be executed first */
1223 if (checkcnt) 1254 if (expect_false (checkcnt))
1224 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1255 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1225 1256
1226 call_pending (EV_A); 1257 call_pending (EV_A);
1258
1259 if (expect_false (loop_done))
1260 break;
1227 } 1261 }
1228 while (activecnt && !loop_done);
1229 1262
1230 if (loop_done != 2) 1263 if (loop_done != 2)
1231 loop_done = 0; 1264 loop_done = 0;
1232} 1265}
1233 1266
… …
1293void 1326void
1294ev_io_start (EV_P_ struct ev_io *w) 1327ev_io_start (EV_P_ struct ev_io *w)
1295{ 1328{
1296 int fd = w->fd; 1329 int fd = w->fd;
1297 1330
1298 if (ev_is_active (w)) 1331 if (expect_false (ev_is_active (w)))
1299 return; 1332 return;
1300 1333
1301 assert (("ev_io_start called with negative fd", fd >= 0)); 1334 assert (("ev_io_start called with negative fd", fd >= 0));
1302 1335
1303 ev_start (EV_A_ (W)w, 1); 1336 ev_start (EV_A_ (W)w, 1);
… …
1309 1342
1310void 1343void
1311ev_io_stop (EV_P_ struct ev_io *w) 1344ev_io_stop (EV_P_ struct ev_io *w)
1312{ 1345{
1313 ev_clear_pending (EV_A_ (W)w); 1346 ev_clear_pending (EV_A_ (W)w);
1314 if (!ev_is_active (w)) 1347 if (expect_false (!ev_is_active (w)))
1315 return; 1348 return;
1316 1349
1317 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1350 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1318 1351
1319 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1352 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
… …
1323} 1356}
1324 1357
1325void 1358void
1326ev_timer_start (EV_P_ struct ev_timer *w) 1359ev_timer_start (EV_P_ struct ev_timer *w)
1327{ 1360{
1328 if (ev_is_active (w)) 1361 if (expect_false (ev_is_active (w)))
1329 return; 1362 return;
1330 1363
1331 ((WT)w)->at += mn_now; 1364 ((WT)w)->at += mn_now;
1332 1365
1333 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1366 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1334 1367
1335 ev_start (EV_A_ (W)w, ++timercnt); 1368 ev_start (EV_A_ (W)w, ++timercnt);
1336 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1369 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1337 timers [timercnt - 1] = w; 1370 timers [timercnt - 1] = w;
1338 upheap ((WT *)timers, timercnt - 1); 1371 upheap ((WT *)timers, timercnt - 1);
1339 1372
1340 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1373 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1341} 1374}
1342 1375
1343void 1376void
1344ev_timer_stop (EV_P_ struct ev_timer *w) 1377ev_timer_stop (EV_P_ struct ev_timer *w)
1345{ 1378{
1346 ev_clear_pending (EV_A_ (W)w); 1379 ev_clear_pending (EV_A_ (W)w);
1347 if (!ev_is_active (w)) 1380 if (expect_false (!ev_is_active (w)))
1348 return; 1381 return;
1349 1382
1350 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1383 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1351 1384
1352 if (((W)w)->active < timercnt--) 1385 if (expect_true (((W)w)->active < timercnt--))
1353 { 1386 {
1354 timers [((W)w)->active - 1] = timers [timercnt]; 1387 timers [((W)w)->active - 1] = timers [timercnt];
1355 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1388 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1356 } 1389 }
1357 1390
… …
1372 } 1405 }
1373 else 1406 else
1374 ev_timer_stop (EV_A_ w); 1407 ev_timer_stop (EV_A_ w);
1375 } 1408 }
1376 else if (w->repeat) 1409 else if (w->repeat)
1410 {
1411 w->at = w->repeat;
1377 ev_timer_start (EV_A_ w); 1412 ev_timer_start (EV_A_ w);
1413 }
1378} 1414}
1379 1415
1380#if EV_PERIODICS 1416#if EV_PERIODICS
1381void 1417void
1382ev_periodic_start (EV_P_ struct ev_periodic *w) 1418ev_periodic_start (EV_P_ struct ev_periodic *w)
1383{ 1419{
1384 if (ev_is_active (w)) 1420 if (expect_false (ev_is_active (w)))
1385 return; 1421 return;
1386 1422
1387 if (w->reschedule_cb) 1423 if (w->reschedule_cb)
1388 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1424 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1389 else if (w->interval) 1425 else if (w->interval)
… …
1392 /* this formula differs from the one in periodic_reify because we do not always round up */ 1428 /* 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; 1429 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1394 } 1430 }
1395 1431
1396 ev_start (EV_A_ (W)w, ++periodiccnt); 1432 ev_start (EV_A_ (W)w, ++periodiccnt);
1397 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1433 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1398 periodics [periodiccnt - 1] = w; 1434 periodics [periodiccnt - 1] = w;
1399 upheap ((WT *)periodics, periodiccnt - 1); 1435 upheap ((WT *)periodics, periodiccnt - 1);
1400 1436
1401 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1437 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1402} 1438}
1403 1439
1404void 1440void
1405ev_periodic_stop (EV_P_ struct ev_periodic *w) 1441ev_periodic_stop (EV_P_ struct ev_periodic *w)
1406{ 1442{
1407 ev_clear_pending (EV_A_ (W)w); 1443 ev_clear_pending (EV_A_ (W)w);
1408 if (!ev_is_active (w)) 1444 if (expect_false (!ev_is_active (w)))
1409 return; 1445 return;
1410 1446
1411 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1447 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1412 1448
1413 if (((W)w)->active < periodiccnt--) 1449 if (expect_true (((W)w)->active < periodiccnt--))
1414 { 1450 {
1415 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1451 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1416 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1452 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1417 } 1453 }
1418 1454
… …
1429#endif 1465#endif
1430 1466
1431void 1467void
1432ev_idle_start (EV_P_ struct ev_idle *w) 1468ev_idle_start (EV_P_ struct ev_idle *w)
1433{ 1469{
1434 if (ev_is_active (w)) 1470 if (expect_false (ev_is_active (w)))
1435 return; 1471 return;
1436 1472
1437 ev_start (EV_A_ (W)w, ++idlecnt); 1473 ev_start (EV_A_ (W)w, ++idlecnt);
1438 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1474 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1439 idles [idlecnt - 1] = w; 1475 idles [idlecnt - 1] = w;
1440} 1476}
1441 1477
1442void 1478void
1443ev_idle_stop (EV_P_ struct ev_idle *w) 1479ev_idle_stop (EV_P_ struct ev_idle *w)
1444{ 1480{
1445 ev_clear_pending (EV_A_ (W)w); 1481 ev_clear_pending (EV_A_ (W)w);
1446 if (!ev_is_active (w)) 1482 if (expect_false (!ev_is_active (w)))
1447 return; 1483 return;
1448 1484
1449 idles [((W)w)->active - 1] = idles [--idlecnt]; 1485 idles [((W)w)->active - 1] = idles [--idlecnt];
1450 ev_stop (EV_A_ (W)w); 1486 ev_stop (EV_A_ (W)w);
1451} 1487}
1452 1488
1453void 1489void
1454ev_prepare_start (EV_P_ struct ev_prepare *w) 1490ev_prepare_start (EV_P_ struct ev_prepare *w)
1455{ 1491{
1456 if (ev_is_active (w)) 1492 if (expect_false (ev_is_active (w)))
1457 return; 1493 return;
1458 1494
1459 ev_start (EV_A_ (W)w, ++preparecnt); 1495 ev_start (EV_A_ (W)w, ++preparecnt);
1460 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1496 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1461 prepares [preparecnt - 1] = w; 1497 prepares [preparecnt - 1] = w;
1462} 1498}
1463 1499
1464void 1500void
1465ev_prepare_stop (EV_P_ struct ev_prepare *w) 1501ev_prepare_stop (EV_P_ struct ev_prepare *w)
1466{ 1502{
1467 ev_clear_pending (EV_A_ (W)w); 1503 ev_clear_pending (EV_A_ (W)w);
1468 if (!ev_is_active (w)) 1504 if (expect_false (!ev_is_active (w)))
1469 return; 1505 return;
1470 1506
1471 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1507 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1472 ev_stop (EV_A_ (W)w); 1508 ev_stop (EV_A_ (W)w);
1473} 1509}
1474 1510
1475void 1511void
1476ev_check_start (EV_P_ struct ev_check *w) 1512ev_check_start (EV_P_ struct ev_check *w)
1477{ 1513{
1478 if (ev_is_active (w)) 1514 if (expect_false (ev_is_active (w)))
1479 return; 1515 return;
1480 1516
1481 ev_start (EV_A_ (W)w, ++checkcnt); 1517 ev_start (EV_A_ (W)w, ++checkcnt);
1482 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1518 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1483 checks [checkcnt - 1] = w; 1519 checks [checkcnt - 1] = w;
1484} 1520}
1485 1521
1486void 1522void
1487ev_check_stop (EV_P_ struct ev_check *w) 1523ev_check_stop (EV_P_ struct ev_check *w)
1488{ 1524{
1489 ev_clear_pending (EV_A_ (W)w); 1525 ev_clear_pending (EV_A_ (W)w);
1490 if (!ev_is_active (w)) 1526 if (expect_false (!ev_is_active (w)))
1491 return; 1527 return;
1492 1528
1493 checks [((W)w)->active - 1] = checks [--checkcnt]; 1529 checks [((W)w)->active - 1] = checks [--checkcnt];
1494 ev_stop (EV_A_ (W)w); 1530 ev_stop (EV_A_ (W)w);
1495} 1531}
… …
1500 1536
1501void 1537void
1502ev_signal_start (EV_P_ struct ev_signal *w) 1538ev_signal_start (EV_P_ struct ev_signal *w)
1503{ 1539{
1504#if EV_MULTIPLICITY 1540#if EV_MULTIPLICITY
1505 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1541 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1506#endif 1542#endif
1507 if (ev_is_active (w)) 1543 if (expect_false (ev_is_active (w)))
1508 return; 1544 return;
1509 1545
1510 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1546 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1511 1547
1512 ev_start (EV_A_ (W)w, 1); 1548 ev_start (EV_A_ (W)w, 1);
… …
1529 1565
1530void 1566void
1531ev_signal_stop (EV_P_ struct ev_signal *w) 1567ev_signal_stop (EV_P_ struct ev_signal *w)
1532{ 1568{
1533 ev_clear_pending (EV_A_ (W)w); 1569 ev_clear_pending (EV_A_ (W)w);
1534 if (!ev_is_active (w)) 1570 if (expect_false (!ev_is_active (w)))
1535 return; 1571 return;
1536 1572
1537 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1573 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1538 ev_stop (EV_A_ (W)w); 1574 ev_stop (EV_A_ (W)w);
1539 1575
… …
1543 1579
1544void 1580void
1545ev_child_start (EV_P_ struct ev_child *w) 1581ev_child_start (EV_P_ struct ev_child *w)
1546{ 1582{
1547#if EV_MULTIPLICITY 1583#if EV_MULTIPLICITY
1548 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1584 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1549#endif 1585#endif
1550 if (ev_is_active (w)) 1586 if (expect_false (ev_is_active (w)))
1551 return; 1587 return;
1552 1588
1553 ev_start (EV_A_ (W)w, 1); 1589 ev_start (EV_A_ (W)w, 1);
1554 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1590 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1555} 1591}
1556 1592
1557void 1593void
1558ev_child_stop (EV_P_ struct ev_child *w) 1594ev_child_stop (EV_P_ struct ev_child *w)
1559{ 1595{
1560 ev_clear_pending (EV_A_ (W)w); 1596 ev_clear_pending (EV_A_ (W)w);
1561 if (!ev_is_active (w)) 1597 if (expect_false (!ev_is_active (w)))
1562 return; 1598 return;
1563 1599
1564 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1600 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1565 ev_stop (EV_A_ (W)w); 1601 ev_stop (EV_A_ (W)w);
1566} 1602}
… …
1603void 1639void
1604ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1640ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1605{ 1641{
1606 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 1642 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1607 1643
1608 if (!once) 1644 if (expect_false (!once))
1645 {
1609 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1646 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1610 else 1647 return;
1611 { 1648 }
1649
1612 once->cb = cb; 1650 once->cb = cb;
1613 once->arg = arg; 1651 once->arg = arg;
1614 1652
1615 ev_init (&once->io, once_cb_io); 1653 ev_init (&once->io, once_cb_io);
1616 if (fd >= 0) 1654 if (fd >= 0)
1617 { 1655 {
1618 ev_io_set (&once->io, fd, events); 1656 ev_io_set (&once->io, fd, events);
1619 ev_io_start (EV_A_ &once->io); 1657 ev_io_start (EV_A_ &once->io);
1620 } 1658 }
1621 1659
1622 ev_init (&once->to, once_cb_to); 1660 ev_init (&once->to, once_cb_to);
1623 if (timeout >= 0.) 1661 if (timeout >= 0.)
1624 { 1662 {
1625 ev_timer_set (&once->to, timeout, 0.); 1663 ev_timer_set (&once->to, timeout, 0.);
1626 ev_timer_start (EV_A_ &once->to); 1664 ev_timer_start (EV_A_ &once->to);
1627 }
1628 } 1665 }
1629} 1666}
1630 1667
1631#ifdef __cplusplus 1668#ifdef __cplusplus
1632} 1669}

Diff Legend

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