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

Comparing libev/ev.c (file contents):
Revision 1.82 by root, Fri Nov 9 20:55:09 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) */
… …
146#define expect_true(expr) expect ((expr) != 0, 1) 156#define expect_true(expr) expect ((expr) != 0, 1)
147 157
148#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 158#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
149#define ABSPRI(w) ((w)->priority - EV_MINPRI) 159#define ABSPRI(w) ((w)->priority - EV_MINPRI)
150 160
161#define EMPTY /* required for microsofts broken pseudo-c compiler */
162
151typedef struct ev_watcher *W; 163typedef struct ev_watcher *W;
152typedef struct ev_watcher_list *WL; 164typedef struct ev_watcher_list *WL;
153typedef struct ev_watcher_time *WT; 165typedef struct ev_watcher_time *WT;
154 166
155static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 167static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
156 168
169#ifdef _WIN32
157#include "ev_win32.c" 170# include "ev_win32.c"
171#endif
158 172
159/*****************************************************************************/ 173/*****************************************************************************/
160 174
161static void (*syserr_cb)(const char *msg); 175static void (*syserr_cb)(const char *msg);
162 176
… …
209typedef struct 223typedef struct
210{ 224{
211 WL head; 225 WL head;
212 unsigned char events; 226 unsigned char events;
213 unsigned char reify; 227 unsigned char reify;
228#if EV_SELECT_IS_WINSOCKET
229 SOCKET handle;
230#endif
214} ANFD; 231} ANFD;
215 232
216typedef struct 233typedef struct
217{ 234{
218 W w; 235 W w;
… …
221 238
222#if EV_MULTIPLICITY 239#if EV_MULTIPLICITY
223 240
224 struct ev_loop 241 struct ev_loop
225 { 242 {
243 ev_tstamp ev_rt_now;
244 #define ev_rt_now ((loop)->ev_rt_now)
226 #define VAR(name,decl) decl; 245 #define VAR(name,decl) decl;
227 #include "ev_vars.h" 246 #include "ev_vars.h"
228 #undef VAR 247 #undef VAR
229 }; 248 };
230 #include "ev_wrap.h" 249 #include "ev_wrap.h"
… …
232 struct ev_loop default_loop_struct; 251 struct ev_loop default_loop_struct;
233 static struct ev_loop *default_loop; 252 static struct ev_loop *default_loop;
234 253
235#else 254#else
236 255
256 ev_tstamp ev_rt_now;
237 #define VAR(name,decl) static decl; 257 #define VAR(name,decl) static decl;
238 #include "ev_vars.h" 258 #include "ev_vars.h"
239 #undef VAR 259 #undef VAR
240 260
241 static int default_loop; 261 static int default_loop;
242 262
243#endif 263#endif
244 264
245/*****************************************************************************/ 265/*****************************************************************************/
246 266
247inline ev_tstamp 267ev_tstamp
248ev_time (void) 268ev_time (void)
249{ 269{
250#if EV_USE_REALTIME 270#if EV_USE_REALTIME
251 struct timespec ts; 271 struct timespec ts;
252 clock_gettime (CLOCK_REALTIME, &ts); 272 clock_gettime (CLOCK_REALTIME, &ts);
… …
271#endif 291#endif
272 292
273 return ev_time (); 293 return ev_time ();
274} 294}
275 295
296#if EV_MULTIPLICITY
276ev_tstamp 297ev_tstamp
277ev_now (EV_P) 298ev_now (EV_P)
278{ 299{
279 return rt_now; 300 return ev_rt_now;
280} 301}
302#endif
281 303
282#define array_roundsize(type,n) ((n) | 4 & ~3) 304#define array_roundsize(type,n) ((n) | 4 & ~3)
283 305
284#define array_needsize(type,base,cur,cnt,init) \ 306#define array_needsize(type,base,cur,cnt,init) \
285 if (expect_false ((cnt) > cur)) \ 307 if (expect_false ((cnt) > cur)) \
… …
302 stem ## max = array_roundsize (stem ## cnt >> 1); \ 324 stem ## max = array_roundsize (stem ## cnt >> 1); \
303 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 325 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
304 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 326 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
305 } 327 }
306 328
307/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
308/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
309#define array_free_microshit(stem) \
310 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
311
312#define array_free(stem, idx) \ 329#define array_free(stem, idx) \
313 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;
314 331
315/*****************************************************************************/ 332/*****************************************************************************/
316 333
… …
390 int events = 0; 407 int events = 0;
391 408
392 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)
393 events |= w->events; 410 events |= w->events;
394 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
395 anfd->reify = 0; 421 anfd->reify = 0;
396 422
397 method_modify (EV_A_ fd, anfd->events, events); 423 method_modify (EV_A_ fd, anfd->events, events);
398 anfd->events = events; 424 anfd->events = events;
399 } 425 }
… …
427} 453}
428 454
429static int 455static int
430fd_valid (int fd) 456fd_valid (int fd)
431{ 457{
432#ifdef WIN32 458#ifdef _WIN32
433 return !!win32_get_osfhandle (fd); 459 return _get_osfhandle (fd) != -1;
434#else 460#else
435 return fcntl (fd, F_GETFD) != -1; 461 return fcntl (fd, F_GETFD) != -1;
436#endif 462#endif
437} 463}
438 464
… …
518 544
519 heap [k] = w; 545 heap [k] = w;
520 ((W)heap [k])->active = k + 1; 546 ((W)heap [k])->active = k + 1;
521} 547}
522 548
549inline void
550adjustheap (WT *heap, int N, int k)
551{
552 upheap (heap, k);
553 downheap (heap, N, k);
554}
555
523/*****************************************************************************/ 556/*****************************************************************************/
524 557
525typedef struct 558typedef struct
526{ 559{
527 WL head; 560 WL head;
… …
548} 581}
549 582
550static void 583static void
551sighandler (int signum) 584sighandler (int signum)
552{ 585{
553#if WIN32 586#if _WIN32
554 signal (signum, sighandler); 587 signal (signum, sighandler);
555#endif 588#endif
556 589
557 signals [signum - 1].gotsig = 1; 590 signals [signum - 1].gotsig = 1;
558 591
559 if (!gotsig) 592 if (!gotsig)
560 { 593 {
561 int old_errno = errno; 594 int old_errno = errno;
562 gotsig = 1; 595 gotsig = 1;
563#ifdef WIN32
564 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
565#else
566 write (sigpipe [1], &signum, 1); 596 write (sigpipe [1], &signum, 1);
567#endif
568 errno = old_errno; 597 errno = old_errno;
569 } 598 }
570} 599}
571 600
572void 601void
… …
592static void 621static void
593sigcb (EV_P_ struct ev_io *iow, int revents) 622sigcb (EV_P_ struct ev_io *iow, int revents)
594{ 623{
595 int signum; 624 int signum;
596 625
597#ifdef WIN32
598 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
599#else
600 read (sigpipe [0], &revents, 1); 626 read (sigpipe [0], &revents, 1);
601#endif
602 gotsig = 0; 627 gotsig = 0;
603 628
604 for (signum = signalmax; signum--; ) 629 for (signum = signalmax; signum--; )
605 if (signals [signum].gotsig) 630 if (signals [signum].gotsig)
606 ev_feed_signal_event (EV_A_ signum + 1); 631 ev_feed_signal_event (EV_A_ signum + 1);
607} 632}
608 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
609static void 646static void
610siginit (EV_P) 647siginit (EV_P)
611{ 648{
612#ifndef WIN32 649 fd_intern (sigpipe [0]);
613 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 650 fd_intern (sigpipe [1]);
614 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
615
616 /* rather than sort out wether we really need nb, set it */
617 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
618 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
619#endif
620 651
621 ev_io_set (&sigev, sigpipe [0], EV_READ); 652 ev_io_set (&sigev, sigpipe [0], EV_READ);
622 ev_io_start (EV_A_ &sigev); 653 ev_io_start (EV_A_ &sigev);
623 ev_unref (EV_A); /* child watcher should not keep loop alive */ 654 ev_unref (EV_A); /* child watcher should not keep loop alive */
624} 655}
625 656
626/*****************************************************************************/ 657/*****************************************************************************/
627 658
628static struct ev_child *childs [PID_HASHSIZE]; 659static struct ev_child *childs [PID_HASHSIZE];
629 660
630#ifndef WIN32 661#ifndef _WIN32
631 662
632static struct ev_signal childev; 663static struct ev_signal childev;
633 664
634#ifndef WCONTINUED 665#ifndef WCONTINUED
635# define WCONTINUED 0 666# define WCONTINUED 0
… …
696 727
697/* 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 */
698static int 729static int
699enable_secure (void) 730enable_secure (void)
700{ 731{
701#ifdef WIN32 732#ifdef _WIN32
702 return 0; 733 return 0;
703#else 734#else
704 return getuid () != geteuid () 735 return getuid () != geteuid ()
705 || getgid () != getegid (); 736 || getgid () != getegid ();
706#endif 737#endif
… …
723 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 754 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
724 have_monotonic = 1; 755 have_monotonic = 1;
725 } 756 }
726#endif 757#endif
727 758
728 rt_now = ev_time (); 759 ev_rt_now = ev_time ();
729 mn_now = get_clock (); 760 mn_now = get_clock ();
730 now_floor = mn_now; 761 now_floor = mn_now;
731 rtmn_diff = rt_now - mn_now; 762 rtmn_diff = ev_rt_now - mn_now;
732 763
733 if (methods == EVMETHOD_AUTO) 764 if (methods == EVMETHOD_AUTO)
734 if (!enable_secure () && getenv ("LIBEV_METHODS")) 765 if (!enable_secure () && getenv ("LIBEV_METHODS"))
735 methods = atoi (getenv ("LIBEV_METHODS")); 766 methods = atoi (getenv ("LIBEV_METHODS"));
736 else 767 else
737 methods = EVMETHOD_ANY; 768 methods = EVMETHOD_ANY;
738 769
739 method = 0; 770 method = 0;
740#if EV_USE_WIN32
741 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods);
742#endif
743#if EV_USE_KQUEUE 771#if EV_USE_KQUEUE
744 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 772 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);
745#endif 773#endif
746#if EV_USE_EPOLL 774#if EV_USE_EPOLL
747 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 775 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods);
… …
751#endif 779#endif
752#if EV_USE_SELECT 780#if EV_USE_SELECT
753 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 781 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
754#endif 782#endif
755 783
756 ev_watcher_init (&sigev, sigcb); 784 ev_init (&sigev, sigcb);
757 ev_set_priority (&sigev, EV_MAXPRI); 785 ev_set_priority (&sigev, EV_MAXPRI);
758 } 786 }
759} 787}
760 788
761void 789void
762loop_destroy (EV_P) 790loop_destroy (EV_P)
763{ 791{
764 int i; 792 int i;
765 793
766#if EV_USE_WIN32
767 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
768#endif
769#if EV_USE_KQUEUE 794#if EV_USE_KQUEUE
770 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 795 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
771#endif 796#endif
772#if EV_USE_EPOLL 797#if EV_USE_EPOLL
773 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 798 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
… …
781 806
782 for (i = NUMPRI; i--; ) 807 for (i = NUMPRI; i--; )
783 array_free (pending, [i]); 808 array_free (pending, [i]);
784 809
785 /* have to use the microsoft-never-gets-it-right macro */ 810 /* have to use the microsoft-never-gets-it-right macro */
786 array_free_microshit (fdchange); 811 array_free (fdchange, EMPTY);
787 array_free_microshit (timer); 812 array_free (timer, EMPTY);
788 array_free_microshit (periodic); 813#if EV_PERIODICS
789 array_free_microshit (idle); 814 array_free (periodic, EMPTY);
790 array_free_microshit (prepare); 815#endif
791 array_free_microshit (check); 816 array_free (idle, EMPTY);
817 array_free (prepare, EMPTY);
818 array_free (check, EMPTY);
792 819
793 method = 0; 820 method = 0;
794} 821}
795 822
796static void 823static void
… …
875 902
876 if (ev_method (EV_A)) 903 if (ev_method (EV_A))
877 { 904 {
878 siginit (EV_A); 905 siginit (EV_A);
879 906
880#ifndef WIN32 907#ifndef _WIN32
881 ev_signal_init (&childev, childcb, SIGCHLD); 908 ev_signal_init (&childev, childcb, SIGCHLD);
882 ev_set_priority (&childev, EV_MAXPRI); 909 ev_set_priority (&childev, EV_MAXPRI);
883 ev_signal_start (EV_A_ &childev); 910 ev_signal_start (EV_A_ &childev);
884 ev_unref (EV_A); /* child watcher should not keep loop alive */ 911 ev_unref (EV_A); /* child watcher should not keep loop alive */
885#endif 912#endif
… …
896{ 923{
897#if EV_MULTIPLICITY 924#if EV_MULTIPLICITY
898 struct ev_loop *loop = default_loop; 925 struct ev_loop *loop = default_loop;
899#endif 926#endif
900 927
901#ifndef WIN32 928#ifndef _WIN32
902 ev_ref (EV_A); /* child watcher */ 929 ev_ref (EV_A); /* child watcher */
903 ev_signal_stop (EV_A_ &childev); 930 ev_signal_stop (EV_A_ &childev);
904#endif 931#endif
905 932
906 ev_ref (EV_A); /* signal watcher */ 933 ev_ref (EV_A); /* signal watcher */
… …
966 993
967 /* first reschedule or stop timer */ 994 /* first reschedule or stop timer */
968 if (w->repeat) 995 if (w->repeat)
969 { 996 {
970 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
971 ((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
972 downheap ((WT *)timers, timercnt, 0); 1003 downheap ((WT *)timers, timercnt, 0);
973 } 1004 }
974 else 1005 else
975 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1006 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
976 1007
977 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1008 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
978 } 1009 }
979} 1010}
980 1011
1012#if EV_PERIODICS
981static void 1013static void
982periodics_reify (EV_P) 1014periodics_reify (EV_P)
983{ 1015{
984 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1016 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
985 { 1017 {
986 struct ev_periodic *w = periodics [0]; 1018 struct ev_periodic *w = periodics [0];
987 1019
988 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1020 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
989 1021
990 /* first reschedule or stop timer */ 1022 /* first reschedule or stop timer */
991 if (w->reschedule_cb) 1023 if (w->reschedule_cb)
992 { 1024 {
993 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);
994 1026
995 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));
996 downheap ((WT *)periodics, periodiccnt, 0); 1028 downheap ((WT *)periodics, periodiccnt, 0);
997 } 1029 }
998 else if (w->interval) 1030 else if (w->interval)
999 { 1031 {
1000 ((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;
1001 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));
1002 downheap ((WT *)periodics, periodiccnt, 0); 1034 downheap ((WT *)periodics, periodiccnt, 0);
1003 } 1035 }
1004 else 1036 else
1005 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1037 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1006 1038
… …
1017 for (i = 0; i < periodiccnt; ++i) 1049 for (i = 0; i < periodiccnt; ++i)
1018 { 1050 {
1019 struct ev_periodic *w = periodics [i]; 1051 struct ev_periodic *w = periodics [i];
1020 1052
1021 if (w->reschedule_cb) 1053 if (w->reschedule_cb)
1022 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1054 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1023 else if (w->interval) 1055 else if (w->interval)
1024 ((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;
1025 } 1057 }
1026 1058
1027 /* now rebuild the heap */ 1059 /* now rebuild the heap */
1028 for (i = periodiccnt >> 1; i--; ) 1060 for (i = periodiccnt >> 1; i--; )
1029 downheap ((WT *)periodics, periodiccnt, i); 1061 downheap ((WT *)periodics, periodiccnt, i);
1030} 1062}
1063#endif
1031 1064
1032inline int 1065inline int
1033time_update_monotonic (EV_P) 1066time_update_monotonic (EV_P)
1034{ 1067{
1035 mn_now = get_clock (); 1068 mn_now = get_clock ();
1036 1069
1037 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1070 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1038 { 1071 {
1039 rt_now = rtmn_diff + mn_now; 1072 ev_rt_now = rtmn_diff + mn_now;
1040 return 0; 1073 return 0;
1041 } 1074 }
1042 else 1075 else
1043 { 1076 {
1044 now_floor = mn_now; 1077 now_floor = mn_now;
1045 rt_now = ev_time (); 1078 ev_rt_now = ev_time ();
1046 return 1; 1079 return 1;
1047 } 1080 }
1048} 1081}
1049 1082
1050static void 1083static void
… …
1059 { 1092 {
1060 ev_tstamp odiff = rtmn_diff; 1093 ev_tstamp odiff = rtmn_diff;
1061 1094
1062 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 */
1063 { 1096 {
1064 rtmn_diff = rt_now - mn_now; 1097 rtmn_diff = ev_rt_now - mn_now;
1065 1098
1066 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1099 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1067 return; /* all is well */ 1100 return; /* all is well */
1068 1101
1069 rt_now = ev_time (); 1102 ev_rt_now = ev_time ();
1070 mn_now = get_clock (); 1103 mn_now = get_clock ();
1071 now_floor = mn_now; 1104 now_floor = mn_now;
1072 } 1105 }
1073 1106
1107# if EV_PERIODICS
1074 periodics_reschedule (EV_A); 1108 periodics_reschedule (EV_A);
1109# endif
1075 /* no timer adjustment, as the monotonic clock doesn't jump */ 1110 /* no timer adjustment, as the monotonic clock doesn't jump */
1076 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1111 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1077 } 1112 }
1078 } 1113 }
1079 else 1114 else
1080#endif 1115#endif
1081 { 1116 {
1082 rt_now = ev_time (); 1117 ev_rt_now = ev_time ();
1083 1118
1084 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))
1085 { 1120 {
1121#if EV_PERIODICS
1086 periodics_reschedule (EV_A); 1122 periodics_reschedule (EV_A);
1123#endif
1087 1124
1088 /* 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 */
1089 for (i = 0; i < timercnt; ++i) 1126 for (i = 0; i < timercnt; ++i)
1090 ((WT)timers [i])->at += rt_now - mn_now; 1127 ((WT)timers [i])->at += ev_rt_now - mn_now;
1091 } 1128 }
1092 1129
1093 mn_now = rt_now; 1130 mn_now = ev_rt_now;
1094 } 1131 }
1095} 1132}
1096 1133
1097void 1134void
1098ev_ref (EV_P) 1135ev_ref (EV_P)
… …
1138 if (expect_true (have_monotonic)) 1175 if (expect_true (have_monotonic))
1139 time_update_monotonic (EV_A); 1176 time_update_monotonic (EV_A);
1140 else 1177 else
1141#endif 1178#endif
1142 { 1179 {
1143 rt_now = ev_time (); 1180 ev_rt_now = ev_time ();
1144 mn_now = rt_now; 1181 mn_now = ev_rt_now;
1145 } 1182 }
1146 1183
1147 if (flags & EVLOOP_NONBLOCK || idlecnt) 1184 if (flags & EVLOOP_NONBLOCK || idlecnt)
1148 block = 0.; 1185 block = 0.;
1149 else 1186 else
… …
1154 { 1191 {
1155 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1192 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1156 if (block > to) block = to; 1193 if (block > to) block = to;
1157 } 1194 }
1158 1195
1196#if EV_PERIODICS
1159 if (periodiccnt) 1197 if (periodiccnt)
1160 { 1198 {
1161 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1199 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1162 if (block > to) block = to; 1200 if (block > to) block = to;
1163 } 1201 }
1202#endif
1164 1203
1165 if (block < 0.) block = 0.; 1204 if (block < 0.) block = 0.;
1166 } 1205 }
1167 1206
1168 method_poll (EV_A_ block); 1207 method_poll (EV_A_ block);
1169 1208
1170 /* update rt_now, do magic */ 1209 /* update ev_rt_now, do magic */
1171 time_update (EV_A); 1210 time_update (EV_A);
1172 1211
1173 /* queue pending timers and reschedule them */ 1212 /* queue pending timers and reschedule them */
1174 timers_reify (EV_A); /* relative timers called last */ 1213 timers_reify (EV_A); /* relative timers called last */
1214#if EV_PERIODICS
1175 periodics_reify (EV_A); /* absolute timers called first */ 1215 periodics_reify (EV_A); /* absolute timers called first */
1216#endif
1176 1217
1177 /* queue idle watchers unless io or timers are pending */ 1218 /* queue idle watchers unless io or timers are pending */
1178 if (idlecnt && !any_pending (EV_A)) 1219 if (idlecnt && !any_pending (EV_A))
1179 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1220 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1180 1221
… …
1271{ 1312{
1272 ev_clear_pending (EV_A_ (W)w); 1313 ev_clear_pending (EV_A_ (W)w);
1273 if (!ev_is_active (w)) 1314 if (!ev_is_active (w))
1274 return; 1315 return;
1275 1316
1317 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1318
1276 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1319 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1277 ev_stop (EV_A_ (W)w); 1320 ev_stop (EV_A_ (W)w);
1278 1321
1279 fd_change (EV_A_ w->fd); 1322 fd_change (EV_A_ w->fd);
1280} 1323}
… …
1307 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1350 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1308 1351
1309 if (((W)w)->active < timercnt--) 1352 if (((W)w)->active < timercnt--)
1310 { 1353 {
1311 timers [((W)w)->active - 1] = timers [timercnt]; 1354 timers [((W)w)->active - 1] = timers [timercnt];
1312 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1355 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1313 } 1356 }
1314 1357
1315 ((WT)w)->at = w->repeat; 1358 ((WT)w)->at -= mn_now;
1316 1359
1317 ev_stop (EV_A_ (W)w); 1360 ev_stop (EV_A_ (W)w);
1318} 1361}
1319 1362
1320void 1363void
… …
1323 if (ev_is_active (w)) 1366 if (ev_is_active (w))
1324 { 1367 {
1325 if (w->repeat) 1368 if (w->repeat)
1326 { 1369 {
1327 ((WT)w)->at = mn_now + w->repeat; 1370 ((WT)w)->at = mn_now + w->repeat;
1328 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1371 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1329 } 1372 }
1330 else 1373 else
1331 ev_timer_stop (EV_A_ w); 1374 ev_timer_stop (EV_A_ w);
1332 } 1375 }
1333 else if (w->repeat) 1376 else if (w->repeat)
1334 ev_timer_start (EV_A_ w); 1377 ev_timer_start (EV_A_ w);
1335} 1378}
1336 1379
1380#if EV_PERIODICS
1337void 1381void
1338ev_periodic_start (EV_P_ struct ev_periodic *w) 1382ev_periodic_start (EV_P_ struct ev_periodic *w)
1339{ 1383{
1340 if (ev_is_active (w)) 1384 if (ev_is_active (w))
1341 return; 1385 return;
1342 1386
1343 if (w->reschedule_cb) 1387 if (w->reschedule_cb)
1344 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1388 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1345 else if (w->interval) 1389 else if (w->interval)
1346 { 1390 {
1347 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.));
1348 /* 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 */
1349 ((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;
1350 } 1394 }
1351 1395
1352 ev_start (EV_A_ (W)w, ++periodiccnt); 1396 ev_start (EV_A_ (W)w, ++periodiccnt);
1353 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1397 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1354 periodics [periodiccnt - 1] = w; 1398 periodics [periodiccnt - 1] = w;
… …
1367 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1411 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1368 1412
1369 if (((W)w)->active < periodiccnt--) 1413 if (((W)w)->active < periodiccnt--)
1370 { 1414 {
1371 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1415 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1372 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1416 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1373 } 1417 }
1374 1418
1375 ev_stop (EV_A_ (W)w); 1419 ev_stop (EV_A_ (W)w);
1376} 1420}
1377 1421
1378void 1422void
1379ev_periodic_again (EV_P_ struct ev_periodic *w) 1423ev_periodic_again (EV_P_ struct ev_periodic *w)
1380{ 1424{
1425 /* TODO: use adjustheap and recalculation */
1381 ev_periodic_stop (EV_A_ w); 1426 ev_periodic_stop (EV_A_ w);
1382 ev_periodic_start (EV_A_ w); 1427 ev_periodic_start (EV_A_ w);
1383} 1428}
1429#endif
1384 1430
1385void 1431void
1386ev_idle_start (EV_P_ struct ev_idle *w) 1432ev_idle_start (EV_P_ struct ev_idle *w)
1387{ 1433{
1388 if (ev_is_active (w)) 1434 if (ev_is_active (w))
… …
1395 1441
1396void 1442void
1397ev_idle_stop (EV_P_ struct ev_idle *w) 1443ev_idle_stop (EV_P_ struct ev_idle *w)
1398{ 1444{
1399 ev_clear_pending (EV_A_ (W)w); 1445 ev_clear_pending (EV_A_ (W)w);
1400 if (ev_is_active (w)) 1446 if (!ev_is_active (w))
1401 return; 1447 return;
1402 1448
1403 idles [((W)w)->active - 1] = idles [--idlecnt]; 1449 idles [((W)w)->active - 1] = idles [--idlecnt];
1404 ev_stop (EV_A_ (W)w); 1450 ev_stop (EV_A_ (W)w);
1405} 1451}
… …
1417 1463
1418void 1464void
1419ev_prepare_stop (EV_P_ struct ev_prepare *w) 1465ev_prepare_stop (EV_P_ struct ev_prepare *w)
1420{ 1466{
1421 ev_clear_pending (EV_A_ (W)w); 1467 ev_clear_pending (EV_A_ (W)w);
1422 if (ev_is_active (w)) 1468 if (!ev_is_active (w))
1423 return; 1469 return;
1424 1470
1425 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1471 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1426 ev_stop (EV_A_ (W)w); 1472 ev_stop (EV_A_ (W)w);
1427} 1473}
… …
1439 1485
1440void 1486void
1441ev_check_stop (EV_P_ struct ev_check *w) 1487ev_check_stop (EV_P_ struct ev_check *w)
1442{ 1488{
1443 ev_clear_pending (EV_A_ (W)w); 1489 ev_clear_pending (EV_A_ (W)w);
1444 if (ev_is_active (w)) 1490 if (!ev_is_active (w))
1445 return; 1491 return;
1446 1492
1447 checks [((W)w)->active - 1] = checks [--checkcnt]; 1493 checks [((W)w)->active - 1] = checks [--checkcnt];
1448 ev_stop (EV_A_ (W)w); 1494 ev_stop (EV_A_ (W)w);
1449} 1495}
… …
1467 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1513 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1468 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1514 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1469 1515
1470 if (!((WL)w)->next) 1516 if (!((WL)w)->next)
1471 { 1517 {
1472#if WIN32 1518#if _WIN32
1473 signal (w->signum, sighandler); 1519 signal (w->signum, sighandler);
1474#else 1520#else
1475 struct sigaction sa; 1521 struct sigaction sa;
1476 sa.sa_handler = sighandler; 1522 sa.sa_handler = sighandler;
1477 sigfillset (&sa.sa_mask); 1523 sigfillset (&sa.sa_mask);
… …
1510 1556
1511void 1557void
1512ev_child_stop (EV_P_ struct ev_child *w) 1558ev_child_stop (EV_P_ struct ev_child *w)
1513{ 1559{
1514 ev_clear_pending (EV_A_ (W)w); 1560 ev_clear_pending (EV_A_ (W)w);
1515 if (ev_is_active (w)) 1561 if (!ev_is_active (w))
1516 return; 1562 return;
1517 1563
1518 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1564 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1519 ev_stop (EV_A_ (W)w); 1565 ev_stop (EV_A_ (W)w);
1520} 1566}
… …
1564 else 1610 else
1565 { 1611 {
1566 once->cb = cb; 1612 once->cb = cb;
1567 once->arg = arg; 1613 once->arg = arg;
1568 1614
1569 ev_watcher_init (&once->io, once_cb_io); 1615 ev_init (&once->io, once_cb_io);
1570 if (fd >= 0) 1616 if (fd >= 0)
1571 { 1617 {
1572 ev_io_set (&once->io, fd, events); 1618 ev_io_set (&once->io, fd, events);
1573 ev_io_start (EV_A_ &once->io); 1619 ev_io_start (EV_A_ &once->io);
1574 } 1620 }
1575 1621
1576 ev_watcher_init (&once->to, once_cb_to); 1622 ev_init (&once->to, once_cb_to);
1577 if (timeout >= 0.) 1623 if (timeout >= 0.)
1578 { 1624 {
1579 ev_timer_set (&once->to, timeout, 0.); 1625 ev_timer_set (&once->to, timeout, 0.);
1580 ev_timer_start (EV_A_ &once->to); 1626 ev_timer_start (EV_A_ &once->to);
1581 } 1627 }
1582 } 1628 }
1583} 1629}
1584 1630
1631#ifdef __cplusplus
1632}
1633#endif
1634

Diff Legend

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