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

Comparing libev/ev.c (file contents):
Revision 1.80 by root, Fri Nov 9 15:30:59 2007 UTC vs.
Revision 1.104 by root, Mon Nov 12 00:39:45 2007 UTC

… …
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31
32#ifdef __cplusplus
33extern "C" {
34#endif
35
31#ifndef EV_STANDALONE 36#ifndef EV_STANDALONE
32# include "config.h" 37# include "config.h"
33 38
34# if HAVE_CLOCK_GETTIME 39# if HAVE_CLOCK_GETTIME
40# ifndef EV_USE_MONOTONIC
35# define EV_USE_MONOTONIC 1 41# define EV_USE_MONOTONIC 1
42# endif
43# ifndef EV_USE_REALTIME
36# define EV_USE_REALTIME 1 44# define EV_USE_REALTIME 1
45# endif
37# endif 46# endif
38 47
39# if HAVE_SELECT && HAVE_SYS_SELECT_H 48# if HAVE_SELECT && HAVE_SYS_SELECT_H && !defined (EV_USE_SELECT)
40# define EV_USE_SELECT 1 49# define EV_USE_SELECT 1
41# endif 50# endif
42 51
43# if HAVE_POLL && HAVE_POLL_H 52# if HAVE_POLL && HAVE_POLL_H && !defined (EV_USE_POLL)
44# define EV_USE_POLL 1 53# define EV_USE_POLL 1
45# endif 54# endif
46 55
47# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 56# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H && !defined (EV_USE_EPOLL)
48# define EV_USE_EPOLL 1 57# define EV_USE_EPOLL 1
49# endif 58# endif
50 59
51# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 60# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE)
52# define EV_USE_KQUEUE 1 61# define EV_USE_KQUEUE 1
53# endif 62# endif
54 63
55#endif 64#endif
56 65
… …
66#include <sys/types.h> 75#include <sys/types.h>
67#include <time.h> 76#include <time.h>
68 77
69#include <signal.h> 78#include <signal.h>
70 79
71#ifndef WIN32 80#ifndef _WIN32
72# include <unistd.h> 81# include <unistd.h>
73# include <sys/time.h> 82# include <sys/time.h>
74# include <sys/wait.h> 83# include <sys/wait.h>
84#else
85# define WIN32_LEAN_AND_MEAN
86# include <windows.h>
87# ifndef EV_SELECT_IS_WINSOCKET
88# define EV_SELECT_IS_WINSOCKET 1
75#endif 89# endif
90#endif
91
76/**/ 92/**/
77 93
78#ifndef EV_USE_MONOTONIC 94#ifndef EV_USE_MONOTONIC
79# define EV_USE_MONOTONIC 1 95# define EV_USE_MONOTONIC 1
80#endif 96#endif
81 97
82#ifndef EV_USE_SELECT 98#ifndef EV_USE_SELECT
83# define EV_USE_SELECT 1 99# define EV_USE_SELECT 1
100# define EV_SELECT_USE_FD_SET 1
84#endif 101#endif
85 102
86#ifndef EV_USE_POLL 103#ifndef EV_USE_POLL
87# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */ 104# ifdef _WIN32
105# define EV_USE_POLL 0
106# else
107# define EV_USE_POLL 1
108# endif
88#endif 109#endif
89 110
90#ifndef EV_USE_EPOLL 111#ifndef EV_USE_EPOLL
91# define EV_USE_EPOLL 0 112# define EV_USE_EPOLL 0
92#endif 113#endif
93 114
94#ifndef EV_USE_KQUEUE 115#ifndef EV_USE_KQUEUE
95# define EV_USE_KQUEUE 0 116# define EV_USE_KQUEUE 0
96#endif
97
98#ifndef EV_USE_WIN32
99# ifdef WIN32
100# define EV_USE_WIN32 0 /* it does not exist, use select */
101# undef EV_USE_SELECT
102# define EV_USE_SELECT 1
103# else
104# define EV_USE_WIN32 0
105# endif
106#endif 117#endif
107 118
108#ifndef EV_USE_REALTIME 119#ifndef EV_USE_REALTIME
109# define EV_USE_REALTIME 1 120# define EV_USE_REALTIME 1
110#endif 121#endif
… …
117#endif 128#endif
118 129
119#ifndef CLOCK_REALTIME 130#ifndef CLOCK_REALTIME
120# undef EV_USE_REALTIME 131# undef EV_USE_REALTIME
121# define EV_USE_REALTIME 0 132# define EV_USE_REALTIME 0
133#endif
134
135#if EV_SELECT_IS_WINSOCKET
136# include <winsock.h>
122#endif 137#endif
123 138
124/**/ 139/**/
125 140
126#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 141#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
127#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */ 142#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */
128#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */ 143#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
129/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */ 144/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */
130 145
146#ifdef EV_H
147# include EV_H
148#else
131#include "ev.h" 149# include "ev.h"
150#endif
132 151
133#if __GNUC__ >= 3 152#if __GNUC__ >= 3
134# define expect(expr,value) __builtin_expect ((expr),(value)) 153# define expect(expr,value) __builtin_expect ((expr),(value))
135# define inline inline 154# define inline inline
136#else 155#else
… …
142#define expect_true(expr) expect ((expr) != 0, 1) 161#define expect_true(expr) expect ((expr) != 0, 1)
143 162
144#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 163#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
145#define ABSPRI(w) ((w)->priority - EV_MINPRI) 164#define ABSPRI(w) ((w)->priority - EV_MINPRI)
146 165
166#define EMPTY /* required for microsofts broken pseudo-c compiler */
167
147typedef struct ev_watcher *W; 168typedef struct ev_watcher *W;
148typedef struct ev_watcher_list *WL; 169typedef struct ev_watcher_list *WL;
149typedef struct ev_watcher_time *WT; 170typedef struct ev_watcher_time *WT;
150 171
151static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 172static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
152 173
174#ifdef _WIN32
153#include "ev_win32.c" 175# include "ev_win32.c"
176#endif
154 177
155/*****************************************************************************/ 178/*****************************************************************************/
156 179
157static void (*syserr_cb)(const char *msg); 180static void (*syserr_cb)(const char *msg);
158 181
… …
205typedef struct 228typedef struct
206{ 229{
207 WL head; 230 WL head;
208 unsigned char events; 231 unsigned char events;
209 unsigned char reify; 232 unsigned char reify;
233#if EV_SELECT_IS_WINSOCKET
234 SOCKET handle;
235#endif
210} ANFD; 236} ANFD;
211 237
212typedef struct 238typedef struct
213{ 239{
214 W w; 240 W w;
… …
217 243
218#if EV_MULTIPLICITY 244#if EV_MULTIPLICITY
219 245
220 struct ev_loop 246 struct ev_loop
221 { 247 {
248 ev_tstamp ev_rt_now;
249 #define ev_rt_now ((loop)->ev_rt_now)
222 #define VAR(name,decl) decl; 250 #define VAR(name,decl) decl;
223 #include "ev_vars.h" 251 #include "ev_vars.h"
224 #undef VAR 252 #undef VAR
225 }; 253 };
226 #include "ev_wrap.h" 254 #include "ev_wrap.h"
… …
228 struct ev_loop default_loop_struct; 256 struct ev_loop default_loop_struct;
229 static struct ev_loop *default_loop; 257 static struct ev_loop *default_loop;
230 258
231#else 259#else
232 260
261 ev_tstamp ev_rt_now;
233 #define VAR(name,decl) static decl; 262 #define VAR(name,decl) static decl;
234 #include "ev_vars.h" 263 #include "ev_vars.h"
235 #undef VAR 264 #undef VAR
236 265
237 static int default_loop; 266 static int default_loop;
238 267
239#endif 268#endif
240 269
241/*****************************************************************************/ 270/*****************************************************************************/
242 271
243inline ev_tstamp 272ev_tstamp
244ev_time (void) 273ev_time (void)
245{ 274{
246#if EV_USE_REALTIME 275#if EV_USE_REALTIME
247 struct timespec ts; 276 struct timespec ts;
248 clock_gettime (CLOCK_REALTIME, &ts); 277 clock_gettime (CLOCK_REALTIME, &ts);
… …
267#endif 296#endif
268 297
269 return ev_time (); 298 return ev_time ();
270} 299}
271 300
301#if EV_MULTIPLICITY
272ev_tstamp 302ev_tstamp
273ev_now (EV_P) 303ev_now (EV_P)
274{ 304{
275 return rt_now; 305 return ev_rt_now;
276} 306}
307#endif
277 308
278#define array_roundsize(type,n) ((n) | 4 & ~3) 309#define array_roundsize(type,n) ((n) | 4 & ~3)
279 310
280#define array_needsize(type,base,cur,cnt,init) \ 311#define array_needsize(type,base,cur,cnt,init) \
281 if (expect_false ((cnt) > cur)) \ 312 if (expect_false ((cnt) > cur)) \
… …
298 stem ## max = array_roundsize (stem ## cnt >> 1); \ 329 stem ## max = array_roundsize (stem ## cnt >> 1); \
299 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 330 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
300 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 331 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
301 } 332 }
302 333
303/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
304/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
305#define array_free_microshit(stem) \
306 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
307
308#define array_free(stem, idx) \ 334#define array_free(stem, idx) \
309 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 335 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
310 336
311/*****************************************************************************/ 337/*****************************************************************************/
312 338
… …
386 int events = 0; 412 int events = 0;
387 413
388 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 414 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
389 events |= w->events; 415 events |= w->events;
390 416
417#if EV_SELECT_IS_WINSOCKET
418 if (events)
419 {
420 unsigned long argp;
421 anfd->handle = _get_osfhandle (fd);
422 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
423 }
424#endif
425
391 anfd->reify = 0; 426 anfd->reify = 0;
392 427
393 method_modify (EV_A_ fd, anfd->events, events); 428 method_modify (EV_A_ fd, anfd->events, events);
394 anfd->events = events; 429 anfd->events = events;
395 } 430 }
… …
423} 458}
424 459
425static int 460static int
426fd_valid (int fd) 461fd_valid (int fd)
427{ 462{
428#ifdef WIN32 463#ifdef _WIN32
429 return !!win32_get_osfhandle (fd); 464 return _get_osfhandle (fd) != -1;
430#else 465#else
431 return fcntl (fd, F_GETFD) != -1; 466 return fcntl (fd, F_GETFD) != -1;
432#endif 467#endif
433} 468}
434 469
… …
514 549
515 heap [k] = w; 550 heap [k] = w;
516 ((W)heap [k])->active = k + 1; 551 ((W)heap [k])->active = k + 1;
517} 552}
518 553
554inline void
555adjustheap (WT *heap, int N, int k)
556{
557 upheap (heap, k);
558 downheap (heap, N, k);
559}
560
519/*****************************************************************************/ 561/*****************************************************************************/
520 562
521typedef struct 563typedef struct
522{ 564{
523 WL head; 565 WL head;
… …
544} 586}
545 587
546static void 588static void
547sighandler (int signum) 589sighandler (int signum)
548{ 590{
549#if WIN32 591#if _WIN32
550 signal (signum, sighandler); 592 signal (signum, sighandler);
551#endif 593#endif
552 594
553 signals [signum - 1].gotsig = 1; 595 signals [signum - 1].gotsig = 1;
554 596
555 if (!gotsig) 597 if (!gotsig)
556 { 598 {
557 int old_errno = errno; 599 int old_errno = errno;
558 gotsig = 1; 600 gotsig = 1;
559#ifdef WIN32
560 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
561#else
562 write (sigpipe [1], &signum, 1); 601 write (sigpipe [1], &signum, 1);
563#endif
564 errno = old_errno; 602 errno = old_errno;
565 } 603 }
566} 604}
567 605
568void 606void
… …
588static void 626static void
589sigcb (EV_P_ struct ev_io *iow, int revents) 627sigcb (EV_P_ struct ev_io *iow, int revents)
590{ 628{
591 int signum; 629 int signum;
592 630
593#ifdef WIN32
594 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
595#else
596 read (sigpipe [0], &revents, 1); 631 read (sigpipe [0], &revents, 1);
597#endif
598 gotsig = 0; 632 gotsig = 0;
599 633
600 for (signum = signalmax; signum--; ) 634 for (signum = signalmax; signum--; )
601 if (signals [signum].gotsig) 635 if (signals [signum].gotsig)
602 ev_feed_signal_event (EV_A_ signum + 1); 636 ev_feed_signal_event (EV_A_ signum + 1);
603} 637}
604 638
639inline void
640fd_intern (int fd)
641{
642#ifdef _WIN32
643 int arg = 1;
644 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
645#else
646 fcntl (fd, F_SETFD, FD_CLOEXEC);
647 fcntl (fd, F_SETFL, O_NONBLOCK);
648#endif
649}
650
605static void 651static void
606siginit (EV_P) 652siginit (EV_P)
607{ 653{
608#ifndef WIN32 654 fd_intern (sigpipe [0]);
609 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 655 fd_intern (sigpipe [1]);
610 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
611
612 /* rather than sort out wether we really need nb, set it */
613 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
614 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
615#endif
616 656
617 ev_io_set (&sigev, sigpipe [0], EV_READ); 657 ev_io_set (&sigev, sigpipe [0], EV_READ);
618 ev_io_start (EV_A_ &sigev); 658 ev_io_start (EV_A_ &sigev);
619 ev_unref (EV_A); /* child watcher should not keep loop alive */ 659 ev_unref (EV_A); /* child watcher should not keep loop alive */
620} 660}
621 661
622/*****************************************************************************/ 662/*****************************************************************************/
623 663
624static struct ev_child *childs [PID_HASHSIZE]; 664static struct ev_child *childs [PID_HASHSIZE];
625 665
626#ifndef WIN32 666#ifndef _WIN32
627 667
628static struct ev_signal childev; 668static struct ev_signal childev;
629 669
630#ifndef WCONTINUED 670#ifndef WCONTINUED
631# define WCONTINUED 0 671# define WCONTINUED 0
… …
692 732
693/* return true if we are running with elevated privileges and should ignore env variables */ 733/* return true if we are running with elevated privileges and should ignore env variables */
694static int 734static int
695enable_secure (void) 735enable_secure (void)
696{ 736{
697#ifdef WIN32 737#ifdef _WIN32
698 return 0; 738 return 0;
699#else 739#else
700 return getuid () != geteuid () 740 return getuid () != geteuid ()
701 || getgid () != getegid (); 741 || getgid () != getegid ();
702#endif 742#endif
… …
719 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 759 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
720 have_monotonic = 1; 760 have_monotonic = 1;
721 } 761 }
722#endif 762#endif
723 763
724 rt_now = ev_time (); 764 ev_rt_now = ev_time ();
725 mn_now = get_clock (); 765 mn_now = get_clock ();
726 now_floor = mn_now; 766 now_floor = mn_now;
727 rtmn_diff = rt_now - mn_now; 767 rtmn_diff = ev_rt_now - mn_now;
728 768
729 if (methods == EVMETHOD_AUTO) 769 if (methods == EVMETHOD_AUTO)
730 if (!enable_secure () && getenv ("LIBEV_METHODS")) 770 if (!enable_secure () && getenv ("LIBEV_METHODS"))
731 methods = atoi (getenv ("LIBEV_METHODS")); 771 methods = atoi (getenv ("LIBEV_METHODS"));
732 else 772 else
733 methods = EVMETHOD_ANY; 773 methods = EVMETHOD_ANY;
734 774
735 method = 0; 775 method = 0;
736#if EV_USE_WIN32
737 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods);
738#endif
739#if EV_USE_KQUEUE 776#if EV_USE_KQUEUE
740 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 777 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);
741#endif 778#endif
742#if EV_USE_EPOLL 779#if EV_USE_EPOLL
743 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 780 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods);
… …
747#endif 784#endif
748#if EV_USE_SELECT 785#if EV_USE_SELECT
749 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 786 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
750#endif 787#endif
751 788
752 ev_watcher_init (&sigev, sigcb); 789 ev_init (&sigev, sigcb);
753 ev_set_priority (&sigev, EV_MAXPRI); 790 ev_set_priority (&sigev, EV_MAXPRI);
754 } 791 }
755} 792}
756 793
757void 794void
758loop_destroy (EV_P) 795loop_destroy (EV_P)
759{ 796{
760 int i; 797 int i;
761 798
762#if EV_USE_WIN32
763 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
764#endif
765#if EV_USE_KQUEUE 799#if EV_USE_KQUEUE
766 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 800 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
767#endif 801#endif
768#if EV_USE_EPOLL 802#if EV_USE_EPOLL
769 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 803 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
… …
777 811
778 for (i = NUMPRI; i--; ) 812 for (i = NUMPRI; i--; )
779 array_free (pending, [i]); 813 array_free (pending, [i]);
780 814
781 /* have to use the microsoft-never-gets-it-right macro */ 815 /* have to use the microsoft-never-gets-it-right macro */
782 array_free_microshit (fdchange); 816 array_free (fdchange, EMPTY);
783 array_free_microshit (timer); 817 array_free (timer, EMPTY);
784 array_free_microshit (periodic); 818#if EV_PERIODICS
785 array_free_microshit (idle); 819 array_free (periodic, EMPTY);
786 array_free_microshit (prepare); 820#endif
787 array_free_microshit (check); 821 array_free (idle, EMPTY);
822 array_free (prepare, EMPTY);
823 array_free (check, EMPTY);
788 824
789 method = 0; 825 method = 0;
790} 826}
791 827
792static void 828static void
… …
871 907
872 if (ev_method (EV_A)) 908 if (ev_method (EV_A))
873 { 909 {
874 siginit (EV_A); 910 siginit (EV_A);
875 911
876#ifndef WIN32 912#ifndef _WIN32
877 ev_signal_init (&childev, childcb, SIGCHLD); 913 ev_signal_init (&childev, childcb, SIGCHLD);
878 ev_set_priority (&childev, EV_MAXPRI); 914 ev_set_priority (&childev, EV_MAXPRI);
879 ev_signal_start (EV_A_ &childev); 915 ev_signal_start (EV_A_ &childev);
880 ev_unref (EV_A); /* child watcher should not keep loop alive */ 916 ev_unref (EV_A); /* child watcher should not keep loop alive */
881#endif 917#endif
… …
892{ 928{
893#if EV_MULTIPLICITY 929#if EV_MULTIPLICITY
894 struct ev_loop *loop = default_loop; 930 struct ev_loop *loop = default_loop;
895#endif 931#endif
896 932
897#ifndef WIN32 933#ifndef _WIN32
898 ev_ref (EV_A); /* child watcher */ 934 ev_ref (EV_A); /* child watcher */
899 ev_signal_stop (EV_A_ &childev); 935 ev_signal_stop (EV_A_ &childev);
900#endif 936#endif
901 937
902 ev_ref (EV_A); /* signal watcher */ 938 ev_ref (EV_A); /* signal watcher */
… …
944 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 980 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
945 981
946 if (p->w) 982 if (p->w)
947 { 983 {
948 p->w->pending = 0; 984 p->w->pending = 0;
949 p->w->cb (EV_A_ p->w, p->events); 985 EV_CB_INVOKE (p->w, p->events);
950 } 986 }
951 } 987 }
952} 988}
953 989
954static void 990static void
… …
962 998
963 /* first reschedule or stop timer */ 999 /* first reschedule or stop timer */
964 if (w->repeat) 1000 if (w->repeat)
965 { 1001 {
966 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1002 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1003
967 ((WT)w)->at = mn_now + w->repeat; 1004 ((WT)w)->at += w->repeat;
1005 if (((WT)w)->at < mn_now)
1006 ((WT)w)->at = mn_now;
1007
968 downheap ((WT *)timers, timercnt, 0); 1008 downheap ((WT *)timers, timercnt, 0);
969 } 1009 }
970 else 1010 else
971 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1011 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
972 1012
973 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1013 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
974 } 1014 }
975} 1015}
976 1016
1017#if EV_PERIODICS
977static void 1018static void
978periodics_reify (EV_P) 1019periodics_reify (EV_P)
979{ 1020{
980 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1021 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
981 { 1022 {
982 struct ev_periodic *w = periodics [0]; 1023 struct ev_periodic *w = periodics [0];
983 1024
984 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1025 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
985 1026
986 /* first reschedule or stop timer */ 1027 /* first reschedule or stop timer */
987 if (w->reschedule_cb) 1028 if (w->reschedule_cb)
988 { 1029 {
989 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, rt_now + 0.0001); 1030 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
990 1031
991 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > rt_now)); 1032 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
992 downheap ((WT *)periodics, periodiccnt, 0); 1033 downheap ((WT *)periodics, periodiccnt, 0);
993 } 1034 }
994 else if (w->interval) 1035 else if (w->interval)
995 { 1036 {
996 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1037 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
997 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 1038 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
998 downheap ((WT *)periodics, periodiccnt, 0); 1039 downheap ((WT *)periodics, periodiccnt, 0);
999 } 1040 }
1000 else 1041 else
1001 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1042 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1002 1043
… …
1013 for (i = 0; i < periodiccnt; ++i) 1054 for (i = 0; i < periodiccnt; ++i)
1014 { 1055 {
1015 struct ev_periodic *w = periodics [i]; 1056 struct ev_periodic *w = periodics [i];
1016 1057
1017 if (w->reschedule_cb) 1058 if (w->reschedule_cb)
1018 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1059 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1019 else if (w->interval) 1060 else if (w->interval)
1020 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1061 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1021 } 1062 }
1022 1063
1023 /* now rebuild the heap */ 1064 /* now rebuild the heap */
1024 for (i = periodiccnt >> 1; i--; ) 1065 for (i = periodiccnt >> 1; i--; )
1025 downheap ((WT *)periodics, periodiccnt, i); 1066 downheap ((WT *)periodics, periodiccnt, i);
1026} 1067}
1068#endif
1027 1069
1028inline int 1070inline int
1029time_update_monotonic (EV_P) 1071time_update_monotonic (EV_P)
1030{ 1072{
1031 mn_now = get_clock (); 1073 mn_now = get_clock ();
1032 1074
1033 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1075 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1034 { 1076 {
1035 rt_now = rtmn_diff + mn_now; 1077 ev_rt_now = rtmn_diff + mn_now;
1036 return 0; 1078 return 0;
1037 } 1079 }
1038 else 1080 else
1039 { 1081 {
1040 now_floor = mn_now; 1082 now_floor = mn_now;
1041 rt_now = ev_time (); 1083 ev_rt_now = ev_time ();
1042 return 1; 1084 return 1;
1043 } 1085 }
1044} 1086}
1045 1087
1046static void 1088static void
… …
1055 { 1097 {
1056 ev_tstamp odiff = rtmn_diff; 1098 ev_tstamp odiff = rtmn_diff;
1057 1099
1058 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1100 for (i = 4; --i; ) /* loop a few times, before making important decisions */
1059 { 1101 {
1060 rtmn_diff = rt_now - mn_now; 1102 rtmn_diff = ev_rt_now - mn_now;
1061 1103
1062 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1104 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1063 return; /* all is well */ 1105 return; /* all is well */
1064 1106
1065 rt_now = ev_time (); 1107 ev_rt_now = ev_time ();
1066 mn_now = get_clock (); 1108 mn_now = get_clock ();
1067 now_floor = mn_now; 1109 now_floor = mn_now;
1068 } 1110 }
1069 1111
1112# if EV_PERIODICS
1070 periodics_reschedule (EV_A); 1113 periodics_reschedule (EV_A);
1114# endif
1071 /* no timer adjustment, as the monotonic clock doesn't jump */ 1115 /* no timer adjustment, as the monotonic clock doesn't jump */
1072 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1116 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1073 } 1117 }
1074 } 1118 }
1075 else 1119 else
1076#endif 1120#endif
1077 { 1121 {
1078 rt_now = ev_time (); 1122 ev_rt_now = ev_time ();
1079 1123
1080 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1124 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1081 { 1125 {
1126#if EV_PERIODICS
1082 periodics_reschedule (EV_A); 1127 periodics_reschedule (EV_A);
1128#endif
1083 1129
1084 /* adjust timers. this is easy, as the offset is the same for all */ 1130 /* adjust timers. this is easy, as the offset is the same for all */
1085 for (i = 0; i < timercnt; ++i) 1131 for (i = 0; i < timercnt; ++i)
1086 ((WT)timers [i])->at += rt_now - mn_now; 1132 ((WT)timers [i])->at += ev_rt_now - mn_now;
1087 } 1133 }
1088 1134
1089 mn_now = rt_now; 1135 mn_now = ev_rt_now;
1090 } 1136 }
1091} 1137}
1092 1138
1093void 1139void
1094ev_ref (EV_P) 1140ev_ref (EV_P)
… …
1134 if (expect_true (have_monotonic)) 1180 if (expect_true (have_monotonic))
1135 time_update_monotonic (EV_A); 1181 time_update_monotonic (EV_A);
1136 else 1182 else
1137#endif 1183#endif
1138 { 1184 {
1139 rt_now = ev_time (); 1185 ev_rt_now = ev_time ();
1140 mn_now = rt_now; 1186 mn_now = ev_rt_now;
1141 } 1187 }
1142 1188
1143 if (flags & EVLOOP_NONBLOCK || idlecnt) 1189 if (flags & EVLOOP_NONBLOCK || idlecnt)
1144 block = 0.; 1190 block = 0.;
1145 else 1191 else
… …
1150 { 1196 {
1151 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1197 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1152 if (block > to) block = to; 1198 if (block > to) block = to;
1153 } 1199 }
1154 1200
1201#if EV_PERIODICS
1155 if (periodiccnt) 1202 if (periodiccnt)
1156 { 1203 {
1157 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1204 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1158 if (block > to) block = to; 1205 if (block > to) block = to;
1159 } 1206 }
1207#endif
1160 1208
1161 if (block < 0.) block = 0.; 1209 if (block < 0.) block = 0.;
1162 } 1210 }
1163 1211
1164 method_poll (EV_A_ block); 1212 method_poll (EV_A_ block);
1165 1213
1166 /* update rt_now, do magic */ 1214 /* update ev_rt_now, do magic */
1167 time_update (EV_A); 1215 time_update (EV_A);
1168 1216
1169 /* queue pending timers and reschedule them */ 1217 /* queue pending timers and reschedule them */
1170 timers_reify (EV_A); /* relative timers called last */ 1218 timers_reify (EV_A); /* relative timers called last */
1219#if EV_PERIODICS
1171 periodics_reify (EV_A); /* absolute timers called first */ 1220 periodics_reify (EV_A); /* absolute timers called first */
1221#endif
1172 1222
1173 /* queue idle watchers unless io or timers are pending */ 1223 /* queue idle watchers unless io or timers are pending */
1174 if (idlecnt && !any_pending (EV_A)) 1224 if (idlecnt && !any_pending (EV_A))
1175 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1225 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1176 1226
… …
1267{ 1317{
1268 ev_clear_pending (EV_A_ (W)w); 1318 ev_clear_pending (EV_A_ (W)w);
1269 if (!ev_is_active (w)) 1319 if (!ev_is_active (w))
1270 return; 1320 return;
1271 1321
1322 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1323
1272 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1324 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1273 ev_stop (EV_A_ (W)w); 1325 ev_stop (EV_A_ (W)w);
1274 1326
1275 fd_change (EV_A_ w->fd); 1327 fd_change (EV_A_ w->fd);
1276} 1328}
… …
1303 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1355 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1304 1356
1305 if (((W)w)->active < timercnt--) 1357 if (((W)w)->active < timercnt--)
1306 { 1358 {
1307 timers [((W)w)->active - 1] = timers [timercnt]; 1359 timers [((W)w)->active - 1] = timers [timercnt];
1308 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1360 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1309 } 1361 }
1310 1362
1311 ((WT)w)->at = w->repeat; 1363 ((WT)w)->at -= mn_now;
1312 1364
1313 ev_stop (EV_A_ (W)w); 1365 ev_stop (EV_A_ (W)w);
1314} 1366}
1315 1367
1316void 1368void
… …
1319 if (ev_is_active (w)) 1371 if (ev_is_active (w))
1320 { 1372 {
1321 if (w->repeat) 1373 if (w->repeat)
1322 { 1374 {
1323 ((WT)w)->at = mn_now + w->repeat; 1375 ((WT)w)->at = mn_now + w->repeat;
1324 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1376 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1325 } 1377 }
1326 else 1378 else
1327 ev_timer_stop (EV_A_ w); 1379 ev_timer_stop (EV_A_ w);
1328 } 1380 }
1329 else if (w->repeat) 1381 else if (w->repeat)
1330 ev_timer_start (EV_A_ w); 1382 ev_timer_start (EV_A_ w);
1331} 1383}
1332 1384
1385#if EV_PERIODICS
1333void 1386void
1334ev_periodic_start (EV_P_ struct ev_periodic *w) 1387ev_periodic_start (EV_P_ struct ev_periodic *w)
1335{ 1388{
1336 if (ev_is_active (w)) 1389 if (ev_is_active (w))
1337 return; 1390 return;
1338 1391
1339 if (w->reschedule_cb) 1392 if (w->reschedule_cb)
1340 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1393 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1341 else if (w->interval) 1394 else if (w->interval)
1342 { 1395 {
1343 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1396 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1344 /* this formula differs from the one in periodic_reify because we do not always round up */ 1397 /* this formula differs from the one in periodic_reify because we do not always round up */
1345 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1398 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1346 } 1399 }
1347 1400
1348 ev_start (EV_A_ (W)w, ++periodiccnt); 1401 ev_start (EV_A_ (W)w, ++periodiccnt);
1349 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1402 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1350 periodics [periodiccnt - 1] = w; 1403 periodics [periodiccnt - 1] = w;
… …
1363 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1416 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1364 1417
1365 if (((W)w)->active < periodiccnt--) 1418 if (((W)w)->active < periodiccnt--)
1366 { 1419 {
1367 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1420 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1368 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1421 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1369 } 1422 }
1370 1423
1371 ev_stop (EV_A_ (W)w); 1424 ev_stop (EV_A_ (W)w);
1372} 1425}
1373 1426
1374void 1427void
1375ev_periodic_again (EV_P_ struct ev_periodic *w) 1428ev_periodic_again (EV_P_ struct ev_periodic *w)
1376{ 1429{
1430 /* TODO: use adjustheap and recalculation */
1377 ev_periodic_stop (EV_A_ w); 1431 ev_periodic_stop (EV_A_ w);
1378 ev_periodic_start (EV_A_ w); 1432 ev_periodic_start (EV_A_ w);
1379} 1433}
1434#endif
1380 1435
1381void 1436void
1382ev_idle_start (EV_P_ struct ev_idle *w) 1437ev_idle_start (EV_P_ struct ev_idle *w)
1383{ 1438{
1384 if (ev_is_active (w)) 1439 if (ev_is_active (w))
… …
1391 1446
1392void 1447void
1393ev_idle_stop (EV_P_ struct ev_idle *w) 1448ev_idle_stop (EV_P_ struct ev_idle *w)
1394{ 1449{
1395 ev_clear_pending (EV_A_ (W)w); 1450 ev_clear_pending (EV_A_ (W)w);
1396 if (ev_is_active (w)) 1451 if (!ev_is_active (w))
1397 return; 1452 return;
1398 1453
1399 idles [((W)w)->active - 1] = idles [--idlecnt]; 1454 idles [((W)w)->active - 1] = idles [--idlecnt];
1400 ev_stop (EV_A_ (W)w); 1455 ev_stop (EV_A_ (W)w);
1401} 1456}
… …
1413 1468
1414void 1469void
1415ev_prepare_stop (EV_P_ struct ev_prepare *w) 1470ev_prepare_stop (EV_P_ struct ev_prepare *w)
1416{ 1471{
1417 ev_clear_pending (EV_A_ (W)w); 1472 ev_clear_pending (EV_A_ (W)w);
1418 if (ev_is_active (w)) 1473 if (!ev_is_active (w))
1419 return; 1474 return;
1420 1475
1421 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1476 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1422 ev_stop (EV_A_ (W)w); 1477 ev_stop (EV_A_ (W)w);
1423} 1478}
… …
1435 1490
1436void 1491void
1437ev_check_stop (EV_P_ struct ev_check *w) 1492ev_check_stop (EV_P_ struct ev_check *w)
1438{ 1493{
1439 ev_clear_pending (EV_A_ (W)w); 1494 ev_clear_pending (EV_A_ (W)w);
1440 if (ev_is_active (w)) 1495 if (!ev_is_active (w))
1441 return; 1496 return;
1442 1497
1443 checks [((W)w)->active - 1] = checks [--checkcnt]; 1498 checks [((W)w)->active - 1] = checks [--checkcnt];
1444 ev_stop (EV_A_ (W)w); 1499 ev_stop (EV_A_ (W)w);
1445} 1500}
… …
1463 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1518 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1464 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1519 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1465 1520
1466 if (!((WL)w)->next) 1521 if (!((WL)w)->next)
1467 { 1522 {
1468#if WIN32 1523#if _WIN32
1469 signal (w->signum, sighandler); 1524 signal (w->signum, sighandler);
1470#else 1525#else
1471 struct sigaction sa; 1526 struct sigaction sa;
1472 sa.sa_handler = sighandler; 1527 sa.sa_handler = sighandler;
1473 sigfillset (&sa.sa_mask); 1528 sigfillset (&sa.sa_mask);
… …
1506 1561
1507void 1562void
1508ev_child_stop (EV_P_ struct ev_child *w) 1563ev_child_stop (EV_P_ struct ev_child *w)
1509{ 1564{
1510 ev_clear_pending (EV_A_ (W)w); 1565 ev_clear_pending (EV_A_ (W)w);
1511 if (ev_is_active (w)) 1566 if (!ev_is_active (w))
1512 return; 1567 return;
1513 1568
1514 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1569 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1515 ev_stop (EV_A_ (W)w); 1570 ev_stop (EV_A_ (W)w);
1516} 1571}
… …
1560 else 1615 else
1561 { 1616 {
1562 once->cb = cb; 1617 once->cb = cb;
1563 once->arg = arg; 1618 once->arg = arg;
1564 1619
1565 ev_watcher_init (&once->io, once_cb_io); 1620 ev_init (&once->io, once_cb_io);
1566 if (fd >= 0) 1621 if (fd >= 0)
1567 { 1622 {
1568 ev_io_set (&once->io, fd, events); 1623 ev_io_set (&once->io, fd, events);
1569 ev_io_start (EV_A_ &once->io); 1624 ev_io_start (EV_A_ &once->io);
1570 } 1625 }
1571 1626
1572 ev_watcher_init (&once->to, once_cb_to); 1627 ev_init (&once->to, once_cb_to);
1573 if (timeout >= 0.) 1628 if (timeout >= 0.)
1574 { 1629 {
1575 ev_timer_set (&once->to, timeout, 0.); 1630 ev_timer_set (&once->to, timeout, 0.);
1576 ev_timer_start (EV_A_ &once->to); 1631 ev_timer_start (EV_A_ &once->to);
1577 } 1632 }
1578 } 1633 }
1579} 1634}
1580 1635
1636#ifdef __cplusplus
1637}
1638#endif
1639

Diff Legend

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