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.103 by root, Mon Nov 12 00:31:08 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
… …
91# define EV_USE_EPOLL 0 107# define EV_USE_EPOLL 0
92#endif 108#endif
93 109
94#ifndef EV_USE_KQUEUE 110#ifndef EV_USE_KQUEUE
95# define EV_USE_KQUEUE 0 111# 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 112#endif
107 113
108#ifndef EV_USE_REALTIME 114#ifndef EV_USE_REALTIME
109# define EV_USE_REALTIME 1 115# define EV_USE_REALTIME 1
110#endif 116#endif
… …
117#endif 123#endif
118 124
119#ifndef CLOCK_REALTIME 125#ifndef CLOCK_REALTIME
120# undef EV_USE_REALTIME 126# undef EV_USE_REALTIME
121# define EV_USE_REALTIME 0 127# define EV_USE_REALTIME 0
128#endif
129
130#if EV_SELECT_IS_WINSOCKET
131# include <winsock.h>
122#endif 132#endif
123 133
124/**/ 134/**/
125 135
126#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 136#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) */ 137#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 */ 138#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 */ 139/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */
130 140
141#ifdef EV_H
142# include EV_H
143#else
131#include "ev.h" 144# include "ev.h"
145#endif
132 146
133#if __GNUC__ >= 3 147#if __GNUC__ >= 3
134# define expect(expr,value) __builtin_expect ((expr),(value)) 148# define expect(expr,value) __builtin_expect ((expr),(value))
135# define inline inline 149# define inline inline
136#else 150#else
… …
142#define expect_true(expr) expect ((expr) != 0, 1) 156#define expect_true(expr) expect ((expr) != 0, 1)
143 157
144#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 158#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
145#define ABSPRI(w) ((w)->priority - EV_MINPRI) 159#define ABSPRI(w) ((w)->priority - EV_MINPRI)
146 160
161#define EMPTY /* required for microsofts broken pseudo-c compiler */
162
147typedef struct ev_watcher *W; 163typedef struct ev_watcher *W;
148typedef struct ev_watcher_list *WL; 164typedef struct ev_watcher_list *WL;
149typedef struct ev_watcher_time *WT; 165typedef struct ev_watcher_time *WT;
150 166
151static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 167static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
152 168
169#ifdef _WIN32
153#include "ev_win32.c" 170# include "ev_win32.c"
171#endif
154 172
155/*****************************************************************************/ 173/*****************************************************************************/
156 174
157static void (*syserr_cb)(const char *msg); 175static void (*syserr_cb)(const char *msg);
158 176
… …
205typedef struct 223typedef struct
206{ 224{
207 WL head; 225 WL head;
208 unsigned char events; 226 unsigned char events;
209 unsigned char reify; 227 unsigned char reify;
228#if EV_SELECT_IS_WINSOCKET
229 SOCKET handle;
230#endif
210} ANFD; 231} ANFD;
211 232
212typedef struct 233typedef struct
213{ 234{
214 W w; 235 W w;
… …
217 238
218#if EV_MULTIPLICITY 239#if EV_MULTIPLICITY
219 240
220 struct ev_loop 241 struct ev_loop
221 { 242 {
243 ev_tstamp ev_rt_now;
244 #define ev_rt_now ((loop)->ev_rt_now)
222 #define VAR(name,decl) decl; 245 #define VAR(name,decl) decl;
223 #include "ev_vars.h" 246 #include "ev_vars.h"
224 #undef VAR 247 #undef VAR
225 }; 248 };
226 #include "ev_wrap.h" 249 #include "ev_wrap.h"
… …
228 struct ev_loop default_loop_struct; 251 struct ev_loop default_loop_struct;
229 static struct ev_loop *default_loop; 252 static struct ev_loop *default_loop;
230 253
231#else 254#else
232 255
256 ev_tstamp ev_rt_now;
233 #define VAR(name,decl) static decl; 257 #define VAR(name,decl) static decl;
234 #include "ev_vars.h" 258 #include "ev_vars.h"
235 #undef VAR 259 #undef VAR
236 260
237 static int default_loop; 261 static int default_loop;
238 262
239#endif 263#endif
240 264
241/*****************************************************************************/ 265/*****************************************************************************/
242 266
243inline ev_tstamp 267ev_tstamp
244ev_time (void) 268ev_time (void)
245{ 269{
246#if EV_USE_REALTIME 270#if EV_USE_REALTIME
247 struct timespec ts; 271 struct timespec ts;
248 clock_gettime (CLOCK_REALTIME, &ts); 272 clock_gettime (CLOCK_REALTIME, &ts);
… …
267#endif 291#endif
268 292
269 return ev_time (); 293 return ev_time ();
270} 294}
271 295
296#if EV_MULTIPLICITY
272ev_tstamp 297ev_tstamp
273ev_now (EV_P) 298ev_now (EV_P)
274{ 299{
275 return rt_now; 300 return ev_rt_now;
276} 301}
302#endif
277 303
278#define array_roundsize(type,n) ((n) | 4 & ~3) 304#define array_roundsize(type,n) ((n) | 4 & ~3)
279 305
280#define array_needsize(type,base,cur,cnt,init) \ 306#define array_needsize(type,base,cur,cnt,init) \
281 if (expect_false ((cnt) > cur)) \ 307 if (expect_false ((cnt) > cur)) \
… …
298 stem ## max = array_roundsize (stem ## cnt >> 1); \ 324 stem ## max = array_roundsize (stem ## cnt >> 1); \
299 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 325 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
300 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 326 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
301 } 327 }
302 328
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) \ 329#define array_free(stem, idx) \
309 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 330 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
310 331
311/*****************************************************************************/ 332/*****************************************************************************/
312 333
… …
386 int events = 0; 407 int events = 0;
387 408
388 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 409 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
389 events |= w->events; 410 events |= w->events;
390 411
412#if EV_SELECT_IS_WINSOCKET
413 if (events)
414 {
415 unsigned long argp;
416 anfd->handle = _get_osfhandle (fd);
417 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
418 }
419#endif
420
391 anfd->reify = 0; 421 anfd->reify = 0;
392 422
393 method_modify (EV_A_ fd, anfd->events, events); 423 method_modify (EV_A_ fd, anfd->events, events);
394 anfd->events = events; 424 anfd->events = events;
395 } 425 }
… …
423} 453}
424 454
425static int 455static int
426fd_valid (int fd) 456fd_valid (int fd)
427{ 457{
428#ifdef WIN32 458#ifdef _WIN32
429 return !!win32_get_osfhandle (fd); 459 return _get_osfhandle (fd) != -1;
430#else 460#else
431 return fcntl (fd, F_GETFD) != -1; 461 return fcntl (fd, F_GETFD) != -1;
432#endif 462#endif
433} 463}
434 464
… …
514 544
515 heap [k] = w; 545 heap [k] = w;
516 ((W)heap [k])->active = k + 1; 546 ((W)heap [k])->active = k + 1;
517} 547}
518 548
549inline void
550adjustheap (WT *heap, int N, int k)
551{
552 upheap (heap, k);
553 downheap (heap, N, k);
554}
555
519/*****************************************************************************/ 556/*****************************************************************************/
520 557
521typedef struct 558typedef struct
522{ 559{
523 WL head; 560 WL head;
… …
544} 581}
545 582
546static void 583static void
547sighandler (int signum) 584sighandler (int signum)
548{ 585{
549#if WIN32 586#if _WIN32
550 signal (signum, sighandler); 587 signal (signum, sighandler);
551#endif 588#endif
552 589
553 signals [signum - 1].gotsig = 1; 590 signals [signum - 1].gotsig = 1;
554 591
555 if (!gotsig) 592 if (!gotsig)
556 { 593 {
557 int old_errno = errno; 594 int old_errno = errno;
558 gotsig = 1; 595 gotsig = 1;
559#ifdef WIN32
560 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
561#else
562 write (sigpipe [1], &signum, 1); 596 write (sigpipe [1], &signum, 1);
563#endif
564 errno = old_errno; 597 errno = old_errno;
565 } 598 }
566} 599}
567 600
568void 601void
… …
588static void 621static void
589sigcb (EV_P_ struct ev_io *iow, int revents) 622sigcb (EV_P_ struct ev_io *iow, int revents)
590{ 623{
591 int signum; 624 int signum;
592 625
593#ifdef WIN32
594 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
595#else
596 read (sigpipe [0], &revents, 1); 626 read (sigpipe [0], &revents, 1);
597#endif
598 gotsig = 0; 627 gotsig = 0;
599 628
600 for (signum = signalmax; signum--; ) 629 for (signum = signalmax; signum--; )
601 if (signals [signum].gotsig) 630 if (signals [signum].gotsig)
602 ev_feed_signal_event (EV_A_ signum + 1); 631 ev_feed_signal_event (EV_A_ signum + 1);
603} 632}
604 633
634inline void
635fd_intern (int fd)
636{
637#ifdef _WIN32
638 int arg = 1;
639 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
640#else
641 fcntl (fd, F_SETFD, FD_CLOEXEC);
642 fcntl (fd, F_SETFL, O_NONBLOCK);
643#endif
644}
645
605static void 646static void
606siginit (EV_P) 647siginit (EV_P)
607{ 648{
608#ifndef WIN32 649 fd_intern (sigpipe [0]);
609 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 650 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 651
617 ev_io_set (&sigev, sigpipe [0], EV_READ); 652 ev_io_set (&sigev, sigpipe [0], EV_READ);
618 ev_io_start (EV_A_ &sigev); 653 ev_io_start (EV_A_ &sigev);
619 ev_unref (EV_A); /* child watcher should not keep loop alive */ 654 ev_unref (EV_A); /* child watcher should not keep loop alive */
620} 655}
621 656
622/*****************************************************************************/ 657/*****************************************************************************/
623 658
624static struct ev_child *childs [PID_HASHSIZE]; 659static struct ev_child *childs [PID_HASHSIZE];
625 660
626#ifndef WIN32 661#ifndef _WIN32
627 662
628static struct ev_signal childev; 663static struct ev_signal childev;
629 664
630#ifndef WCONTINUED 665#ifndef WCONTINUED
631# define WCONTINUED 0 666# define WCONTINUED 0
… …
692 727
693/* return true if we are running with elevated privileges and should ignore env variables */ 728/* return true if we are running with elevated privileges and should ignore env variables */
694static int 729static int
695enable_secure (void) 730enable_secure (void)
696{ 731{
697#ifdef WIN32 732#ifdef _WIN32
698 return 0; 733 return 0;
699#else 734#else
700 return getuid () != geteuid () 735 return getuid () != geteuid ()
701 || getgid () != getegid (); 736 || getgid () != getegid ();
702#endif 737#endif
… …
719 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 754 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
720 have_monotonic = 1; 755 have_monotonic = 1;
721 } 756 }
722#endif 757#endif
723 758
724 rt_now = ev_time (); 759 ev_rt_now = ev_time ();
725 mn_now = get_clock (); 760 mn_now = get_clock ();
726 now_floor = mn_now; 761 now_floor = mn_now;
727 rtmn_diff = rt_now - mn_now; 762 rtmn_diff = ev_rt_now - mn_now;
728 763
729 if (methods == EVMETHOD_AUTO) 764 if (methods == EVMETHOD_AUTO)
730 if (!enable_secure () && getenv ("LIBEV_METHODS")) 765 if (!enable_secure () && getenv ("LIBEV_METHODS"))
731 methods = atoi (getenv ("LIBEV_METHODS")); 766 methods = atoi (getenv ("LIBEV_METHODS"));
732 else 767 else
733 methods = EVMETHOD_ANY; 768 methods = EVMETHOD_ANY;
734 769
735 method = 0; 770 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 771#if EV_USE_KQUEUE
740 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 772 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);
741#endif 773#endif
742#if EV_USE_EPOLL 774#if EV_USE_EPOLL
743 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 775 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods);
… …
747#endif 779#endif
748#if EV_USE_SELECT 780#if EV_USE_SELECT
749 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 781 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
750#endif 782#endif
751 783
752 ev_watcher_init (&sigev, sigcb); 784 ev_init (&sigev, sigcb);
753 ev_set_priority (&sigev, EV_MAXPRI); 785 ev_set_priority (&sigev, EV_MAXPRI);
754 } 786 }
755} 787}
756 788
757void 789void
758loop_destroy (EV_P) 790loop_destroy (EV_P)
759{ 791{
760 int i; 792 int i;
761 793
762#if EV_USE_WIN32
763 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
764#endif
765#if EV_USE_KQUEUE 794#if EV_USE_KQUEUE
766 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 795 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
767#endif 796#endif
768#if EV_USE_EPOLL 797#if EV_USE_EPOLL
769 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 798 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
… …
777 806
778 for (i = NUMPRI; i--; ) 807 for (i = NUMPRI; i--; )
779 array_free (pending, [i]); 808 array_free (pending, [i]);
780 809
781 /* have to use the microsoft-never-gets-it-right macro */ 810 /* have to use the microsoft-never-gets-it-right macro */
782 array_free_microshit (fdchange); 811 array_free (fdchange, EMPTY);
783 array_free_microshit (timer); 812 array_free (timer, EMPTY);
784 array_free_microshit (periodic); 813#if EV_PERIODICS
785 array_free_microshit (idle); 814 array_free (periodic, EMPTY);
786 array_free_microshit (prepare); 815#endif
787 array_free_microshit (check); 816 array_free (idle, EMPTY);
817 array_free (prepare, EMPTY);
818 array_free (check, EMPTY);
788 819
789 method = 0; 820 method = 0;
790} 821}
791 822
792static void 823static void
… …
871 902
872 if (ev_method (EV_A)) 903 if (ev_method (EV_A))
873 { 904 {
874 siginit (EV_A); 905 siginit (EV_A);
875 906
876#ifndef WIN32 907#ifndef _WIN32
877 ev_signal_init (&childev, childcb, SIGCHLD); 908 ev_signal_init (&childev, childcb, SIGCHLD);
878 ev_set_priority (&childev, EV_MAXPRI); 909 ev_set_priority (&childev, EV_MAXPRI);
879 ev_signal_start (EV_A_ &childev); 910 ev_signal_start (EV_A_ &childev);
880 ev_unref (EV_A); /* child watcher should not keep loop alive */ 911 ev_unref (EV_A); /* child watcher should not keep loop alive */
881#endif 912#endif
… …
892{ 923{
893#if EV_MULTIPLICITY 924#if EV_MULTIPLICITY
894 struct ev_loop *loop = default_loop; 925 struct ev_loop *loop = default_loop;
895#endif 926#endif
896 927
897#ifndef WIN32 928#ifndef _WIN32
898 ev_ref (EV_A); /* child watcher */ 929 ev_ref (EV_A); /* child watcher */
899 ev_signal_stop (EV_A_ &childev); 930 ev_signal_stop (EV_A_ &childev);
900#endif 931#endif
901 932
902 ev_ref (EV_A); /* signal watcher */ 933 ev_ref (EV_A); /* signal watcher */
… …
944 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 975 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
945 976
946 if (p->w) 977 if (p->w)
947 { 978 {
948 p->w->pending = 0; 979 p->w->pending = 0;
949 p->w->cb (EV_A_ p->w, p->events); 980 EV_CB_INVOKE (p->w, p->events);
950 } 981 }
951 } 982 }
952} 983}
953 984
954static void 985static void
… …
962 993
963 /* first reschedule or stop timer */ 994 /* first reschedule or stop timer */
964 if (w->repeat) 995 if (w->repeat)
965 { 996 {
966 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 997 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
998
967 ((WT)w)->at = mn_now + w->repeat; 999 ((WT)w)->at += w->repeat;
1000 if (((WT)w)->at < mn_now)
1001 ((WT)w)->at = mn_now;
1002
968 downheap ((WT *)timers, timercnt, 0); 1003 downheap ((WT *)timers, timercnt, 0);
969 } 1004 }
970 else 1005 else
971 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1006 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
972 1007
973 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1008 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
974 } 1009 }
975} 1010}
976 1011
1012#if EV_PERIODICS
977static void 1013static void
978periodics_reify (EV_P) 1014periodics_reify (EV_P)
979{ 1015{
980 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1016 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
981 { 1017 {
982 struct ev_periodic *w = periodics [0]; 1018 struct ev_periodic *w = periodics [0];
983 1019
984 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1020 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
985 1021
986 /* first reschedule or stop timer */ 1022 /* first reschedule or stop timer */
987 if (w->reschedule_cb) 1023 if (w->reschedule_cb)
988 { 1024 {
989 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, rt_now + 0.0001); 1025 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
990 1026
991 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > rt_now)); 1027 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
992 downheap ((WT *)periodics, periodiccnt, 0); 1028 downheap ((WT *)periodics, periodiccnt, 0);
993 } 1029 }
994 else if (w->interval) 1030 else if (w->interval)
995 { 1031 {
996 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1032 ((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)); 1033 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); 1034 downheap ((WT *)periodics, periodiccnt, 0);
999 } 1035 }
1000 else 1036 else
1001 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1037 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1002 1038
… …
1013 for (i = 0; i < periodiccnt; ++i) 1049 for (i = 0; i < periodiccnt; ++i)
1014 { 1050 {
1015 struct ev_periodic *w = periodics [i]; 1051 struct ev_periodic *w = periodics [i];
1016 1052
1017 if (w->reschedule_cb) 1053 if (w->reschedule_cb)
1018 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1054 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1019 else if (w->interval) 1055 else if (w->interval)
1020 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1056 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1021 } 1057 }
1022 1058
1023 /* now rebuild the heap */ 1059 /* now rebuild the heap */
1024 for (i = periodiccnt >> 1; i--; ) 1060 for (i = periodiccnt >> 1; i--; )
1025 downheap ((WT *)periodics, periodiccnt, i); 1061 downheap ((WT *)periodics, periodiccnt, i);
1026} 1062}
1063#endif
1027 1064
1028inline int 1065inline int
1029time_update_monotonic (EV_P) 1066time_update_monotonic (EV_P)
1030{ 1067{
1031 mn_now = get_clock (); 1068 mn_now = get_clock ();
1032 1069
1033 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1070 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1034 { 1071 {
1035 rt_now = rtmn_diff + mn_now; 1072 ev_rt_now = rtmn_diff + mn_now;
1036 return 0; 1073 return 0;
1037 } 1074 }
1038 else 1075 else
1039 { 1076 {
1040 now_floor = mn_now; 1077 now_floor = mn_now;
1041 rt_now = ev_time (); 1078 ev_rt_now = ev_time ();
1042 return 1; 1079 return 1;
1043 } 1080 }
1044} 1081}
1045 1082
1046static void 1083static void
… …
1055 { 1092 {
1056 ev_tstamp odiff = rtmn_diff; 1093 ev_tstamp odiff = rtmn_diff;
1057 1094
1058 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1095 for (i = 4; --i; ) /* loop a few times, before making important decisions */
1059 { 1096 {
1060 rtmn_diff = rt_now - mn_now; 1097 rtmn_diff = ev_rt_now - mn_now;
1061 1098
1062 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1099 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1063 return; /* all is well */ 1100 return; /* all is well */
1064 1101
1065 rt_now = ev_time (); 1102 ev_rt_now = ev_time ();
1066 mn_now = get_clock (); 1103 mn_now = get_clock ();
1067 now_floor = mn_now; 1104 now_floor = mn_now;
1068 } 1105 }
1069 1106
1107# if EV_PERIODICS
1070 periodics_reschedule (EV_A); 1108 periodics_reschedule (EV_A);
1109# endif
1071 /* no timer adjustment, as the monotonic clock doesn't jump */ 1110 /* no timer adjustment, as the monotonic clock doesn't jump */
1072 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1111 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1073 } 1112 }
1074 } 1113 }
1075 else 1114 else
1076#endif 1115#endif
1077 { 1116 {
1078 rt_now = ev_time (); 1117 ev_rt_now = ev_time ();
1079 1118
1080 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1119 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1081 { 1120 {
1121#if EV_PERIODICS
1082 periodics_reschedule (EV_A); 1122 periodics_reschedule (EV_A);
1123#endif
1083 1124
1084 /* adjust timers. this is easy, as the offset is the same for all */ 1125 /* adjust timers. this is easy, as the offset is the same for all */
1085 for (i = 0; i < timercnt; ++i) 1126 for (i = 0; i < timercnt; ++i)
1086 ((WT)timers [i])->at += rt_now - mn_now; 1127 ((WT)timers [i])->at += ev_rt_now - mn_now;
1087 } 1128 }
1088 1129
1089 mn_now = rt_now; 1130 mn_now = ev_rt_now;
1090 } 1131 }
1091} 1132}
1092 1133
1093void 1134void
1094ev_ref (EV_P) 1135ev_ref (EV_P)
… …
1134 if (expect_true (have_monotonic)) 1175 if (expect_true (have_monotonic))
1135 time_update_monotonic (EV_A); 1176 time_update_monotonic (EV_A);
1136 else 1177 else
1137#endif 1178#endif
1138 { 1179 {
1139 rt_now = ev_time (); 1180 ev_rt_now = ev_time ();
1140 mn_now = rt_now; 1181 mn_now = ev_rt_now;
1141 } 1182 }
1142 1183
1143 if (flags & EVLOOP_NONBLOCK || idlecnt) 1184 if (flags & EVLOOP_NONBLOCK || idlecnt)
1144 block = 0.; 1185 block = 0.;
1145 else 1186 else
… …
1150 { 1191 {
1151 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1192 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1152 if (block > to) block = to; 1193 if (block > to) block = to;
1153 } 1194 }
1154 1195
1196#if EV_PERIODICS
1155 if (periodiccnt) 1197 if (periodiccnt)
1156 { 1198 {
1157 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1199 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1158 if (block > to) block = to; 1200 if (block > to) block = to;
1159 } 1201 }
1202#endif
1160 1203
1161 if (block < 0.) block = 0.; 1204 if (block < 0.) block = 0.;
1162 } 1205 }
1163 1206
1164 method_poll (EV_A_ block); 1207 method_poll (EV_A_ block);
1165 1208
1166 /* update rt_now, do magic */ 1209 /* update ev_rt_now, do magic */
1167 time_update (EV_A); 1210 time_update (EV_A);
1168 1211
1169 /* queue pending timers and reschedule them */ 1212 /* queue pending timers and reschedule them */
1170 timers_reify (EV_A); /* relative timers called last */ 1213 timers_reify (EV_A); /* relative timers called last */
1214#if EV_PERIODICS
1171 periodics_reify (EV_A); /* absolute timers called first */ 1215 periodics_reify (EV_A); /* absolute timers called first */
1216#endif
1172 1217
1173 /* queue idle watchers unless io or timers are pending */ 1218 /* queue idle watchers unless io or timers are pending */
1174 if (idlecnt && !any_pending (EV_A)) 1219 if (idlecnt && !any_pending (EV_A))
1175 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1220 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1176 1221
… …
1267{ 1312{
1268 ev_clear_pending (EV_A_ (W)w); 1313 ev_clear_pending (EV_A_ (W)w);
1269 if (!ev_is_active (w)) 1314 if (!ev_is_active (w))
1270 return; 1315 return;
1271 1316
1317 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1318
1272 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1319 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1273 ev_stop (EV_A_ (W)w); 1320 ev_stop (EV_A_ (W)w);
1274 1321
1275 fd_change (EV_A_ w->fd); 1322 fd_change (EV_A_ w->fd);
1276} 1323}
… …
1303 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1350 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1304 1351
1305 if (((W)w)->active < timercnt--) 1352 if (((W)w)->active < timercnt--)
1306 { 1353 {
1307 timers [((W)w)->active - 1] = timers [timercnt]; 1354 timers [((W)w)->active - 1] = timers [timercnt];
1308 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1355 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1309 } 1356 }
1310 1357
1311 ((WT)w)->at = w->repeat; 1358 ((WT)w)->at -= mn_now;
1312 1359
1313 ev_stop (EV_A_ (W)w); 1360 ev_stop (EV_A_ (W)w);
1314} 1361}
1315 1362
1316void 1363void
… …
1319 if (ev_is_active (w)) 1366 if (ev_is_active (w))
1320 { 1367 {
1321 if (w->repeat) 1368 if (w->repeat)
1322 { 1369 {
1323 ((WT)w)->at = mn_now + w->repeat; 1370 ((WT)w)->at = mn_now + w->repeat;
1324 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1371 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1325 } 1372 }
1326 else 1373 else
1327 ev_timer_stop (EV_A_ w); 1374 ev_timer_stop (EV_A_ w);
1328 } 1375 }
1329 else if (w->repeat) 1376 else if (w->repeat)
1330 ev_timer_start (EV_A_ w); 1377 ev_timer_start (EV_A_ w);
1331} 1378}
1332 1379
1380#if EV_PERIODICS
1333void 1381void
1334ev_periodic_start (EV_P_ struct ev_periodic *w) 1382ev_periodic_start (EV_P_ struct ev_periodic *w)
1335{ 1383{
1336 if (ev_is_active (w)) 1384 if (ev_is_active (w))
1337 return; 1385 return;
1338 1386
1339 if (w->reschedule_cb) 1387 if (w->reschedule_cb)
1340 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1388 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1341 else if (w->interval) 1389 else if (w->interval)
1342 { 1390 {
1343 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1391 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 */ 1392 /* 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; 1393 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1346 } 1394 }
1347 1395
1348 ev_start (EV_A_ (W)w, ++periodiccnt); 1396 ev_start (EV_A_ (W)w, ++periodiccnt);
1349 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1397 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1350 periodics [periodiccnt - 1] = w; 1398 periodics [periodiccnt - 1] = w;
… …
1363 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1411 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1364 1412
1365 if (((W)w)->active < periodiccnt--) 1413 if (((W)w)->active < periodiccnt--)
1366 { 1414 {
1367 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1415 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1368 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1416 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1369 } 1417 }
1370 1418
1371 ev_stop (EV_A_ (W)w); 1419 ev_stop (EV_A_ (W)w);
1372} 1420}
1373 1421
1374void 1422void
1375ev_periodic_again (EV_P_ struct ev_periodic *w) 1423ev_periodic_again (EV_P_ struct ev_periodic *w)
1376{ 1424{
1425 /* TODO: use adjustheap and recalculation */
1377 ev_periodic_stop (EV_A_ w); 1426 ev_periodic_stop (EV_A_ w);
1378 ev_periodic_start (EV_A_ w); 1427 ev_periodic_start (EV_A_ w);
1379} 1428}
1429#endif
1380 1430
1381void 1431void
1382ev_idle_start (EV_P_ struct ev_idle *w) 1432ev_idle_start (EV_P_ struct ev_idle *w)
1383{ 1433{
1384 if (ev_is_active (w)) 1434 if (ev_is_active (w))
… …
1391 1441
1392void 1442void
1393ev_idle_stop (EV_P_ struct ev_idle *w) 1443ev_idle_stop (EV_P_ struct ev_idle *w)
1394{ 1444{
1395 ev_clear_pending (EV_A_ (W)w); 1445 ev_clear_pending (EV_A_ (W)w);
1396 if (ev_is_active (w)) 1446 if (!ev_is_active (w))
1397 return; 1447 return;
1398 1448
1399 idles [((W)w)->active - 1] = idles [--idlecnt]; 1449 idles [((W)w)->active - 1] = idles [--idlecnt];
1400 ev_stop (EV_A_ (W)w); 1450 ev_stop (EV_A_ (W)w);
1401} 1451}
… …
1413 1463
1414void 1464void
1415ev_prepare_stop (EV_P_ struct ev_prepare *w) 1465ev_prepare_stop (EV_P_ struct ev_prepare *w)
1416{ 1466{
1417 ev_clear_pending (EV_A_ (W)w); 1467 ev_clear_pending (EV_A_ (W)w);
1418 if (ev_is_active (w)) 1468 if (!ev_is_active (w))
1419 return; 1469 return;
1420 1470
1421 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1471 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1422 ev_stop (EV_A_ (W)w); 1472 ev_stop (EV_A_ (W)w);
1423} 1473}
… …
1435 1485
1436void 1486void
1437ev_check_stop (EV_P_ struct ev_check *w) 1487ev_check_stop (EV_P_ struct ev_check *w)
1438{ 1488{
1439 ev_clear_pending (EV_A_ (W)w); 1489 ev_clear_pending (EV_A_ (W)w);
1440 if (ev_is_active (w)) 1490 if (!ev_is_active (w))
1441 return; 1491 return;
1442 1492
1443 checks [((W)w)->active - 1] = checks [--checkcnt]; 1493 checks [((W)w)->active - 1] = checks [--checkcnt];
1444 ev_stop (EV_A_ (W)w); 1494 ev_stop (EV_A_ (W)w);
1445} 1495}
… …
1463 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1513 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1464 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1514 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1465 1515
1466 if (!((WL)w)->next) 1516 if (!((WL)w)->next)
1467 { 1517 {
1468#if WIN32 1518#if _WIN32
1469 signal (w->signum, sighandler); 1519 signal (w->signum, sighandler);
1470#else 1520#else
1471 struct sigaction sa; 1521 struct sigaction sa;
1472 sa.sa_handler = sighandler; 1522 sa.sa_handler = sighandler;
1473 sigfillset (&sa.sa_mask); 1523 sigfillset (&sa.sa_mask);
… …
1506 1556
1507void 1557void
1508ev_child_stop (EV_P_ struct ev_child *w) 1558ev_child_stop (EV_P_ struct ev_child *w)
1509{ 1559{
1510 ev_clear_pending (EV_A_ (W)w); 1560 ev_clear_pending (EV_A_ (W)w);
1511 if (ev_is_active (w)) 1561 if (!ev_is_active (w))
1512 return; 1562 return;
1513 1563
1514 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1564 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1515 ev_stop (EV_A_ (W)w); 1565 ev_stop (EV_A_ (W)w);
1516} 1566}
… …
1560 else 1610 else
1561 { 1611 {
1562 once->cb = cb; 1612 once->cb = cb;
1563 once->arg = arg; 1613 once->arg = arg;
1564 1614
1565 ev_watcher_init (&once->io, once_cb_io); 1615 ev_init (&once->io, once_cb_io);
1566 if (fd >= 0) 1616 if (fd >= 0)
1567 { 1617 {
1568 ev_io_set (&once->io, fd, events); 1618 ev_io_set (&once->io, fd, events);
1569 ev_io_start (EV_A_ &once->io); 1619 ev_io_start (EV_A_ &once->io);
1570 } 1620 }
1571 1621
1572 ev_watcher_init (&once->to, once_cb_to); 1622 ev_init (&once->to, once_cb_to);
1573 if (timeout >= 0.) 1623 if (timeout >= 0.)
1574 { 1624 {
1575 ev_timer_set (&once->to, timeout, 0.); 1625 ev_timer_set (&once->to, timeout, 0.);
1576 ev_timer_start (EV_A_ &once->to); 1626 ev_timer_start (EV_A_ &once->to);
1577 } 1627 }
1578 } 1628 }
1579} 1629}
1580 1630
1631#ifdef __cplusplus
1632}
1633#endif
1634

Diff Legend

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