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.106 by root, Mon Nov 12 01:07:50 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 117#endif
97 118
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
107
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
111 122
112/**/ 123/**/
124
125/* darwin simply cnanot be helped */
126#ifdef __APPLE__
127# undef EV_USE_POLL
128# undef EV_USE_KQUEUE
129#endif
113 130
114#ifndef CLOCK_MONOTONIC 131#ifndef CLOCK_MONOTONIC
115# undef EV_USE_MONOTONIC 132# undef EV_USE_MONOTONIC
116# define EV_USE_MONOTONIC 0 133# define EV_USE_MONOTONIC 0
117#endif 134#endif
118 135
119#ifndef CLOCK_REALTIME 136#ifndef CLOCK_REALTIME
120# undef EV_USE_REALTIME 137# undef EV_USE_REALTIME
121# define EV_USE_REALTIME 0 138# define EV_USE_REALTIME 0
139#endif
140
141#if EV_SELECT_IS_WINSOCKET
142# include <winsock.h>
122#endif 143#endif
123 144
124/**/ 145/**/
125 146
126#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 147#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
… …
146#define expect_true(expr) expect ((expr) != 0, 1) 167#define expect_true(expr) expect ((expr) != 0, 1)
147 168
148#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 169#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
149#define ABSPRI(w) ((w)->priority - EV_MINPRI) 170#define ABSPRI(w) ((w)->priority - EV_MINPRI)
150 171
172#define EMPTY /* required for microsofts broken pseudo-c compiler */
173
151typedef struct ev_watcher *W; 174typedef struct ev_watcher *W;
152typedef struct ev_watcher_list *WL; 175typedef struct ev_watcher_list *WL;
153typedef struct ev_watcher_time *WT; 176typedef struct ev_watcher_time *WT;
154 177
155static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 178static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
156 179
180#ifdef _WIN32
157#include "ev_win32.c" 181# include "ev_win32.c"
182#endif
158 183
159/*****************************************************************************/ 184/*****************************************************************************/
160 185
161static void (*syserr_cb)(const char *msg); 186static void (*syserr_cb)(const char *msg);
162 187
… …
209typedef struct 234typedef struct
210{ 235{
211 WL head; 236 WL head;
212 unsigned char events; 237 unsigned char events;
213 unsigned char reify; 238 unsigned char reify;
239#if EV_SELECT_IS_WINSOCKET
240 SOCKET handle;
241#endif
214} ANFD; 242} ANFD;
215 243
216typedef struct 244typedef struct
217{ 245{
218 W w; 246 W w;
… …
221 249
222#if EV_MULTIPLICITY 250#if EV_MULTIPLICITY
223 251
224 struct ev_loop 252 struct ev_loop
225 { 253 {
254 ev_tstamp ev_rt_now;
255 #define ev_rt_now ((loop)->ev_rt_now)
226 #define VAR(name,decl) decl; 256 #define VAR(name,decl) decl;
227 #include "ev_vars.h" 257 #include "ev_vars.h"
228 #undef VAR 258 #undef VAR
229 }; 259 };
230 #include "ev_wrap.h" 260 #include "ev_wrap.h"
… …
232 struct ev_loop default_loop_struct; 262 struct ev_loop default_loop_struct;
233 static struct ev_loop *default_loop; 263 static struct ev_loop *default_loop;
234 264
235#else 265#else
236 266
267 ev_tstamp ev_rt_now;
237 #define VAR(name,decl) static decl; 268 #define VAR(name,decl) static decl;
238 #include "ev_vars.h" 269 #include "ev_vars.h"
239 #undef VAR 270 #undef VAR
240 271
241 static int default_loop; 272 static int default_loop;
242 273
243#endif 274#endif
244 275
245/*****************************************************************************/ 276/*****************************************************************************/
246 277
247inline ev_tstamp 278ev_tstamp
248ev_time (void) 279ev_time (void)
249{ 280{
250#if EV_USE_REALTIME 281#if EV_USE_REALTIME
251 struct timespec ts; 282 struct timespec ts;
252 clock_gettime (CLOCK_REALTIME, &ts); 283 clock_gettime (CLOCK_REALTIME, &ts);
… …
271#endif 302#endif
272 303
273 return ev_time (); 304 return ev_time ();
274} 305}
275 306
307#if EV_MULTIPLICITY
276ev_tstamp 308ev_tstamp
277ev_now (EV_P) 309ev_now (EV_P)
278{ 310{
279 return rt_now; 311 return ev_rt_now;
280} 312}
313#endif
281 314
282#define array_roundsize(type,n) ((n) | 4 & ~3) 315#define array_roundsize(type,n) ((n) | 4 & ~3)
283 316
284#define array_needsize(type,base,cur,cnt,init) \ 317#define array_needsize(type,base,cur,cnt,init) \
285 if (expect_false ((cnt) > cur)) \ 318 if (expect_false ((cnt) > cur)) \
… …
302 stem ## max = array_roundsize (stem ## cnt >> 1); \ 335 stem ## max = array_roundsize (stem ## cnt >> 1); \
303 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 336 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
304 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 337 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
305 } 338 }
306 339
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) \ 340#define array_free(stem, idx) \
313 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 341 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
314 342
315/*****************************************************************************/ 343/*****************************************************************************/
316 344
… …
390 int events = 0; 418 int events = 0;
391 419
392 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 420 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
393 events |= w->events; 421 events |= w->events;
394 422
423#if EV_SELECT_IS_WINSOCKET
424 if (events)
425 {
426 unsigned long argp;
427 anfd->handle = _get_osfhandle (fd);
428 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
429 }
430#endif
431
395 anfd->reify = 0; 432 anfd->reify = 0;
396 433
397 method_modify (EV_A_ fd, anfd->events, events); 434 method_modify (EV_A_ fd, anfd->events, events);
398 anfd->events = events; 435 anfd->events = events;
399 } 436 }
… …
427} 464}
428 465
429static int 466static int
430fd_valid (int fd) 467fd_valid (int fd)
431{ 468{
432#ifdef WIN32 469#ifdef _WIN32
433 return !!win32_get_osfhandle (fd); 470 return _get_osfhandle (fd) != -1;
434#else 471#else
435 return fcntl (fd, F_GETFD) != -1; 472 return fcntl (fd, F_GETFD) != -1;
436#endif 473#endif
437} 474}
438 475
… …
518 555
519 heap [k] = w; 556 heap [k] = w;
520 ((W)heap [k])->active = k + 1; 557 ((W)heap [k])->active = k + 1;
521} 558}
522 559
560inline void
561adjustheap (WT *heap, int N, int k)
562{
563 upheap (heap, k);
564 downheap (heap, N, k);
565}
566
523/*****************************************************************************/ 567/*****************************************************************************/
524 568
525typedef struct 569typedef struct
526{ 570{
527 WL head; 571 WL head;
… …
548} 592}
549 593
550static void 594static void
551sighandler (int signum) 595sighandler (int signum)
552{ 596{
553#if WIN32 597#if _WIN32
554 signal (signum, sighandler); 598 signal (signum, sighandler);
555#endif 599#endif
556 600
557 signals [signum - 1].gotsig = 1; 601 signals [signum - 1].gotsig = 1;
558 602
559 if (!gotsig) 603 if (!gotsig)
560 { 604 {
561 int old_errno = errno; 605 int old_errno = errno;
562 gotsig = 1; 606 gotsig = 1;
563#ifdef WIN32
564 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
565#else
566 write (sigpipe [1], &signum, 1); 607 write (sigpipe [1], &signum, 1);
567#endif
568 errno = old_errno; 608 errno = old_errno;
569 } 609 }
570} 610}
571 611
572void 612void
… …
592static void 632static void
593sigcb (EV_P_ struct ev_io *iow, int revents) 633sigcb (EV_P_ struct ev_io *iow, int revents)
594{ 634{
595 int signum; 635 int signum;
596 636
597#ifdef WIN32
598 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
599#else
600 read (sigpipe [0], &revents, 1); 637 read (sigpipe [0], &revents, 1);
601#endif
602 gotsig = 0; 638 gotsig = 0;
603 639
604 for (signum = signalmax; signum--; ) 640 for (signum = signalmax; signum--; )
605 if (signals [signum].gotsig) 641 if (signals [signum].gotsig)
606 ev_feed_signal_event (EV_A_ signum + 1); 642 ev_feed_signal_event (EV_A_ signum + 1);
607} 643}
608 644
645inline void
646fd_intern (int fd)
647{
648#ifdef _WIN32
649 int arg = 1;
650 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
651#else
652 fcntl (fd, F_SETFD, FD_CLOEXEC);
653 fcntl (fd, F_SETFL, O_NONBLOCK);
654#endif
655}
656
609static void 657static void
610siginit (EV_P) 658siginit (EV_P)
611{ 659{
612#ifndef WIN32 660 fd_intern (sigpipe [0]);
613 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 661 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 662
621 ev_io_set (&sigev, sigpipe [0], EV_READ); 663 ev_io_set (&sigev, sigpipe [0], EV_READ);
622 ev_io_start (EV_A_ &sigev); 664 ev_io_start (EV_A_ &sigev);
623 ev_unref (EV_A); /* child watcher should not keep loop alive */ 665 ev_unref (EV_A); /* child watcher should not keep loop alive */
624} 666}
625 667
626/*****************************************************************************/ 668/*****************************************************************************/
627 669
628static struct ev_child *childs [PID_HASHSIZE]; 670static struct ev_child *childs [PID_HASHSIZE];
629 671
630#ifndef WIN32 672#ifndef _WIN32
631 673
632static struct ev_signal childev; 674static struct ev_signal childev;
633 675
634#ifndef WCONTINUED 676#ifndef WCONTINUED
635# define WCONTINUED 0 677# define WCONTINUED 0
… …
696 738
697/* return true if we are running with elevated privileges and should ignore env variables */ 739/* return true if we are running with elevated privileges and should ignore env variables */
698static int 740static int
699enable_secure (void) 741enable_secure (void)
700{ 742{
701#ifdef WIN32 743#ifdef _WIN32
702 return 0; 744 return 0;
703#else 745#else
704 return getuid () != geteuid () 746 return getuid () != geteuid ()
705 || getgid () != getegid (); 747 || getgid () != getegid ();
706#endif 748#endif
… …
723 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 765 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
724 have_monotonic = 1; 766 have_monotonic = 1;
725 } 767 }
726#endif 768#endif
727 769
728 rt_now = ev_time (); 770 ev_rt_now = ev_time ();
729 mn_now = get_clock (); 771 mn_now = get_clock ();
730 now_floor = mn_now; 772 now_floor = mn_now;
731 rtmn_diff = rt_now - mn_now; 773 rtmn_diff = ev_rt_now - mn_now;
732 774
733 if (methods == EVMETHOD_AUTO) 775 if (methods == EVMETHOD_AUTO)
734 if (!enable_secure () && getenv ("LIBEV_METHODS")) 776 if (!enable_secure () && getenv ("LIBEV_METHODS"))
735 methods = atoi (getenv ("LIBEV_METHODS")); 777 methods = atoi (getenv ("LIBEV_METHODS"));
736 else 778 else
737 methods = EVMETHOD_ANY; 779 methods = EVMETHOD_ANY;
738 780
739 method = 0; 781 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 782#if EV_USE_KQUEUE
744 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 783 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);
745#endif 784#endif
746#if EV_USE_EPOLL 785#if EV_USE_EPOLL
747 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 786 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods);
… …
751#endif 790#endif
752#if EV_USE_SELECT 791#if EV_USE_SELECT
753 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 792 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
754#endif 793#endif
755 794
756 ev_watcher_init (&sigev, sigcb); 795 ev_init (&sigev, sigcb);
757 ev_set_priority (&sigev, EV_MAXPRI); 796 ev_set_priority (&sigev, EV_MAXPRI);
758 } 797 }
759} 798}
760 799
761void 800void
762loop_destroy (EV_P) 801loop_destroy (EV_P)
763{ 802{
764 int i; 803 int i;
765 804
766#if EV_USE_WIN32
767 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
768#endif
769#if EV_USE_KQUEUE 805#if EV_USE_KQUEUE
770 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 806 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
771#endif 807#endif
772#if EV_USE_EPOLL 808#if EV_USE_EPOLL
773 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 809 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
… …
781 817
782 for (i = NUMPRI; i--; ) 818 for (i = NUMPRI; i--; )
783 array_free (pending, [i]); 819 array_free (pending, [i]);
784 820
785 /* have to use the microsoft-never-gets-it-right macro */ 821 /* have to use the microsoft-never-gets-it-right macro */
786 array_free_microshit (fdchange); 822 array_free (fdchange, EMPTY);
787 array_free_microshit (timer); 823 array_free (timer, EMPTY);
788 array_free_microshit (periodic); 824#if EV_PERIODICS
789 array_free_microshit (idle); 825 array_free (periodic, EMPTY);
790 array_free_microshit (prepare); 826#endif
791 array_free_microshit (check); 827 array_free (idle, EMPTY);
828 array_free (prepare, EMPTY);
829 array_free (check, EMPTY);
792 830
793 method = 0; 831 method = 0;
794} 832}
795 833
796static void 834static void
… …
875 913
876 if (ev_method (EV_A)) 914 if (ev_method (EV_A))
877 { 915 {
878 siginit (EV_A); 916 siginit (EV_A);
879 917
880#ifndef WIN32 918#ifndef _WIN32
881 ev_signal_init (&childev, childcb, SIGCHLD); 919 ev_signal_init (&childev, childcb, SIGCHLD);
882 ev_set_priority (&childev, EV_MAXPRI); 920 ev_set_priority (&childev, EV_MAXPRI);
883 ev_signal_start (EV_A_ &childev); 921 ev_signal_start (EV_A_ &childev);
884 ev_unref (EV_A); /* child watcher should not keep loop alive */ 922 ev_unref (EV_A); /* child watcher should not keep loop alive */
885#endif 923#endif
… …
896{ 934{
897#if EV_MULTIPLICITY 935#if EV_MULTIPLICITY
898 struct ev_loop *loop = default_loop; 936 struct ev_loop *loop = default_loop;
899#endif 937#endif
900 938
901#ifndef WIN32 939#ifndef _WIN32
902 ev_ref (EV_A); /* child watcher */ 940 ev_ref (EV_A); /* child watcher */
903 ev_signal_stop (EV_A_ &childev); 941 ev_signal_stop (EV_A_ &childev);
904#endif 942#endif
905 943
906 ev_ref (EV_A); /* signal watcher */ 944 ev_ref (EV_A); /* signal watcher */
… …
966 1004
967 /* first reschedule or stop timer */ 1005 /* first reschedule or stop timer */
968 if (w->repeat) 1006 if (w->repeat)
969 { 1007 {
970 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1008 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1009
971 ((WT)w)->at = mn_now + w->repeat; 1010 ((WT)w)->at += w->repeat;
1011 if (((WT)w)->at < mn_now)
1012 ((WT)w)->at = mn_now;
1013
972 downheap ((WT *)timers, timercnt, 0); 1014 downheap ((WT *)timers, timercnt, 0);
973 } 1015 }
974 else 1016 else
975 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1017 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
976 1018
977 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1019 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
978 } 1020 }
979} 1021}
980 1022
1023#if EV_PERIODICS
981static void 1024static void
982periodics_reify (EV_P) 1025periodics_reify (EV_P)
983{ 1026{
984 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1027 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
985 { 1028 {
986 struct ev_periodic *w = periodics [0]; 1029 struct ev_periodic *w = periodics [0];
987 1030
988 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1031 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
989 1032
990 /* first reschedule or stop timer */ 1033 /* first reschedule or stop timer */
991 if (w->reschedule_cb) 1034 if (w->reschedule_cb)
992 { 1035 {
993 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, rt_now + 0.0001); 1036 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
994 1037
995 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > rt_now)); 1038 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
996 downheap ((WT *)periodics, periodiccnt, 0); 1039 downheap ((WT *)periodics, periodiccnt, 0);
997 } 1040 }
998 else if (w->interval) 1041 else if (w->interval)
999 { 1042 {
1000 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1043 ((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)); 1044 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); 1045 downheap ((WT *)periodics, periodiccnt, 0);
1003 } 1046 }
1004 else 1047 else
1005 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1048 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1006 1049
… …
1017 for (i = 0; i < periodiccnt; ++i) 1060 for (i = 0; i < periodiccnt; ++i)
1018 { 1061 {
1019 struct ev_periodic *w = periodics [i]; 1062 struct ev_periodic *w = periodics [i];
1020 1063
1021 if (w->reschedule_cb) 1064 if (w->reschedule_cb)
1022 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1065 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1023 else if (w->interval) 1066 else if (w->interval)
1024 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1067 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1025 } 1068 }
1026 1069
1027 /* now rebuild the heap */ 1070 /* now rebuild the heap */
1028 for (i = periodiccnt >> 1; i--; ) 1071 for (i = periodiccnt >> 1; i--; )
1029 downheap ((WT *)periodics, periodiccnt, i); 1072 downheap ((WT *)periodics, periodiccnt, i);
1030} 1073}
1074#endif
1031 1075
1032inline int 1076inline int
1033time_update_monotonic (EV_P) 1077time_update_monotonic (EV_P)
1034{ 1078{
1035 mn_now = get_clock (); 1079 mn_now = get_clock ();
1036 1080
1037 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1081 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1038 { 1082 {
1039 rt_now = rtmn_diff + mn_now; 1083 ev_rt_now = rtmn_diff + mn_now;
1040 return 0; 1084 return 0;
1041 } 1085 }
1042 else 1086 else
1043 { 1087 {
1044 now_floor = mn_now; 1088 now_floor = mn_now;
1045 rt_now = ev_time (); 1089 ev_rt_now = ev_time ();
1046 return 1; 1090 return 1;
1047 } 1091 }
1048} 1092}
1049 1093
1050static void 1094static void
… …
1059 { 1103 {
1060 ev_tstamp odiff = rtmn_diff; 1104 ev_tstamp odiff = rtmn_diff;
1061 1105
1062 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1106 for (i = 4; --i; ) /* loop a few times, before making important decisions */
1063 { 1107 {
1064 rtmn_diff = rt_now - mn_now; 1108 rtmn_diff = ev_rt_now - mn_now;
1065 1109
1066 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1110 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1067 return; /* all is well */ 1111 return; /* all is well */
1068 1112
1069 rt_now = ev_time (); 1113 ev_rt_now = ev_time ();
1070 mn_now = get_clock (); 1114 mn_now = get_clock ();
1071 now_floor = mn_now; 1115 now_floor = mn_now;
1072 } 1116 }
1073 1117
1118# if EV_PERIODICS
1074 periodics_reschedule (EV_A); 1119 periodics_reschedule (EV_A);
1120# endif
1075 /* no timer adjustment, as the monotonic clock doesn't jump */ 1121 /* no timer adjustment, as the monotonic clock doesn't jump */
1076 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1122 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1077 } 1123 }
1078 } 1124 }
1079 else 1125 else
1080#endif 1126#endif
1081 { 1127 {
1082 rt_now = ev_time (); 1128 ev_rt_now = ev_time ();
1083 1129
1084 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1130 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1085 { 1131 {
1132#if EV_PERIODICS
1086 periodics_reschedule (EV_A); 1133 periodics_reschedule (EV_A);
1134#endif
1087 1135
1088 /* adjust timers. this is easy, as the offset is the same for all */ 1136 /* adjust timers. this is easy, as the offset is the same for all */
1089 for (i = 0; i < timercnt; ++i) 1137 for (i = 0; i < timercnt; ++i)
1090 ((WT)timers [i])->at += rt_now - mn_now; 1138 ((WT)timers [i])->at += ev_rt_now - mn_now;
1091 } 1139 }
1092 1140
1093 mn_now = rt_now; 1141 mn_now = ev_rt_now;
1094 } 1142 }
1095} 1143}
1096 1144
1097void 1145void
1098ev_ref (EV_P) 1146ev_ref (EV_P)
… …
1138 if (expect_true (have_monotonic)) 1186 if (expect_true (have_monotonic))
1139 time_update_monotonic (EV_A); 1187 time_update_monotonic (EV_A);
1140 else 1188 else
1141#endif 1189#endif
1142 { 1190 {
1143 rt_now = ev_time (); 1191 ev_rt_now = ev_time ();
1144 mn_now = rt_now; 1192 mn_now = ev_rt_now;
1145 } 1193 }
1146 1194
1147 if (flags & EVLOOP_NONBLOCK || idlecnt) 1195 if (flags & EVLOOP_NONBLOCK || idlecnt)
1148 block = 0.; 1196 block = 0.;
1149 else 1197 else
… …
1154 { 1202 {
1155 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1203 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1156 if (block > to) block = to; 1204 if (block > to) block = to;
1157 } 1205 }
1158 1206
1207#if EV_PERIODICS
1159 if (periodiccnt) 1208 if (periodiccnt)
1160 { 1209 {
1161 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1210 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1162 if (block > to) block = to; 1211 if (block > to) block = to;
1163 } 1212 }
1213#endif
1164 1214
1165 if (block < 0.) block = 0.; 1215 if (block < 0.) block = 0.;
1166 } 1216 }
1167 1217
1168 method_poll (EV_A_ block); 1218 method_poll (EV_A_ block);
1169 1219
1170 /* update rt_now, do magic */ 1220 /* update ev_rt_now, do magic */
1171 time_update (EV_A); 1221 time_update (EV_A);
1172 1222
1173 /* queue pending timers and reschedule them */ 1223 /* queue pending timers and reschedule them */
1174 timers_reify (EV_A); /* relative timers called last */ 1224 timers_reify (EV_A); /* relative timers called last */
1225#if EV_PERIODICS
1175 periodics_reify (EV_A); /* absolute timers called first */ 1226 periodics_reify (EV_A); /* absolute timers called first */
1227#endif
1176 1228
1177 /* queue idle watchers unless io or timers are pending */ 1229 /* queue idle watchers unless io or timers are pending */
1178 if (idlecnt && !any_pending (EV_A)) 1230 if (idlecnt && !any_pending (EV_A))
1179 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1231 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1180 1232
… …
1271{ 1323{
1272 ev_clear_pending (EV_A_ (W)w); 1324 ev_clear_pending (EV_A_ (W)w);
1273 if (!ev_is_active (w)) 1325 if (!ev_is_active (w))
1274 return; 1326 return;
1275 1327
1328 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1329
1276 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1330 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1277 ev_stop (EV_A_ (W)w); 1331 ev_stop (EV_A_ (W)w);
1278 1332
1279 fd_change (EV_A_ w->fd); 1333 fd_change (EV_A_ w->fd);
1280} 1334}
… …
1307 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1361 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1308 1362
1309 if (((W)w)->active < timercnt--) 1363 if (((W)w)->active < timercnt--)
1310 { 1364 {
1311 timers [((W)w)->active - 1] = timers [timercnt]; 1365 timers [((W)w)->active - 1] = timers [timercnt];
1312 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1366 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1313 } 1367 }
1314 1368
1315 ((WT)w)->at = w->repeat; 1369 ((WT)w)->at -= mn_now;
1316 1370
1317 ev_stop (EV_A_ (W)w); 1371 ev_stop (EV_A_ (W)w);
1318} 1372}
1319 1373
1320void 1374void
… …
1323 if (ev_is_active (w)) 1377 if (ev_is_active (w))
1324 { 1378 {
1325 if (w->repeat) 1379 if (w->repeat)
1326 { 1380 {
1327 ((WT)w)->at = mn_now + w->repeat; 1381 ((WT)w)->at = mn_now + w->repeat;
1328 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1382 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1329 } 1383 }
1330 else 1384 else
1331 ev_timer_stop (EV_A_ w); 1385 ev_timer_stop (EV_A_ w);
1332 } 1386 }
1333 else if (w->repeat) 1387 else if (w->repeat)
1334 ev_timer_start (EV_A_ w); 1388 ev_timer_start (EV_A_ w);
1335} 1389}
1336 1390
1391#if EV_PERIODICS
1337void 1392void
1338ev_periodic_start (EV_P_ struct ev_periodic *w) 1393ev_periodic_start (EV_P_ struct ev_periodic *w)
1339{ 1394{
1340 if (ev_is_active (w)) 1395 if (ev_is_active (w))
1341 return; 1396 return;
1342 1397
1343 if (w->reschedule_cb) 1398 if (w->reschedule_cb)
1344 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1399 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1345 else if (w->interval) 1400 else if (w->interval)
1346 { 1401 {
1347 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1402 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 */ 1403 /* 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; 1404 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1350 } 1405 }
1351 1406
1352 ev_start (EV_A_ (W)w, ++periodiccnt); 1407 ev_start (EV_A_ (W)w, ++periodiccnt);
1353 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1408 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1354 periodics [periodiccnt - 1] = w; 1409 periodics [periodiccnt - 1] = w;
… …
1367 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1422 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1368 1423
1369 if (((W)w)->active < periodiccnt--) 1424 if (((W)w)->active < periodiccnt--)
1370 { 1425 {
1371 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1426 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1372 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1427 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1373 } 1428 }
1374 1429
1375 ev_stop (EV_A_ (W)w); 1430 ev_stop (EV_A_ (W)w);
1376} 1431}
1377 1432
1378void 1433void
1379ev_periodic_again (EV_P_ struct ev_periodic *w) 1434ev_periodic_again (EV_P_ struct ev_periodic *w)
1380{ 1435{
1436 /* TODO: use adjustheap and recalculation */
1381 ev_periodic_stop (EV_A_ w); 1437 ev_periodic_stop (EV_A_ w);
1382 ev_periodic_start (EV_A_ w); 1438 ev_periodic_start (EV_A_ w);
1383} 1439}
1440#endif
1384 1441
1385void 1442void
1386ev_idle_start (EV_P_ struct ev_idle *w) 1443ev_idle_start (EV_P_ struct ev_idle *w)
1387{ 1444{
1388 if (ev_is_active (w)) 1445 if (ev_is_active (w))
… …
1395 1452
1396void 1453void
1397ev_idle_stop (EV_P_ struct ev_idle *w) 1454ev_idle_stop (EV_P_ struct ev_idle *w)
1398{ 1455{
1399 ev_clear_pending (EV_A_ (W)w); 1456 ev_clear_pending (EV_A_ (W)w);
1400 if (ev_is_active (w)) 1457 if (!ev_is_active (w))
1401 return; 1458 return;
1402 1459
1403 idles [((W)w)->active - 1] = idles [--idlecnt]; 1460 idles [((W)w)->active - 1] = idles [--idlecnt];
1404 ev_stop (EV_A_ (W)w); 1461 ev_stop (EV_A_ (W)w);
1405} 1462}
… …
1417 1474
1418void 1475void
1419ev_prepare_stop (EV_P_ struct ev_prepare *w) 1476ev_prepare_stop (EV_P_ struct ev_prepare *w)
1420{ 1477{
1421 ev_clear_pending (EV_A_ (W)w); 1478 ev_clear_pending (EV_A_ (W)w);
1422 if (ev_is_active (w)) 1479 if (!ev_is_active (w))
1423 return; 1480 return;
1424 1481
1425 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1482 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1426 ev_stop (EV_A_ (W)w); 1483 ev_stop (EV_A_ (W)w);
1427} 1484}
… …
1439 1496
1440void 1497void
1441ev_check_stop (EV_P_ struct ev_check *w) 1498ev_check_stop (EV_P_ struct ev_check *w)
1442{ 1499{
1443 ev_clear_pending (EV_A_ (W)w); 1500 ev_clear_pending (EV_A_ (W)w);
1444 if (ev_is_active (w)) 1501 if (!ev_is_active (w))
1445 return; 1502 return;
1446 1503
1447 checks [((W)w)->active - 1] = checks [--checkcnt]; 1504 checks [((W)w)->active - 1] = checks [--checkcnt];
1448 ev_stop (EV_A_ (W)w); 1505 ev_stop (EV_A_ (W)w);
1449} 1506}
… …
1467 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1524 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1468 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1525 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1469 1526
1470 if (!((WL)w)->next) 1527 if (!((WL)w)->next)
1471 { 1528 {
1472#if WIN32 1529#if _WIN32
1473 signal (w->signum, sighandler); 1530 signal (w->signum, sighandler);
1474#else 1531#else
1475 struct sigaction sa; 1532 struct sigaction sa;
1476 sa.sa_handler = sighandler; 1533 sa.sa_handler = sighandler;
1477 sigfillset (&sa.sa_mask); 1534 sigfillset (&sa.sa_mask);
… …
1510 1567
1511void 1568void
1512ev_child_stop (EV_P_ struct ev_child *w) 1569ev_child_stop (EV_P_ struct ev_child *w)
1513{ 1570{
1514 ev_clear_pending (EV_A_ (W)w); 1571 ev_clear_pending (EV_A_ (W)w);
1515 if (ev_is_active (w)) 1572 if (!ev_is_active (w))
1516 return; 1573 return;
1517 1574
1518 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1575 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1519 ev_stop (EV_A_ (W)w); 1576 ev_stop (EV_A_ (W)w);
1520} 1577}
… …
1564 else 1621 else
1565 { 1622 {
1566 once->cb = cb; 1623 once->cb = cb;
1567 once->arg = arg; 1624 once->arg = arg;
1568 1625
1569 ev_watcher_init (&once->io, once_cb_io); 1626 ev_init (&once->io, once_cb_io);
1570 if (fd >= 0) 1627 if (fd >= 0)
1571 { 1628 {
1572 ev_io_set (&once->io, fd, events); 1629 ev_io_set (&once->io, fd, events);
1573 ev_io_start (EV_A_ &once->io); 1630 ev_io_start (EV_A_ &once->io);
1574 } 1631 }
1575 1632
1576 ev_watcher_init (&once->to, once_cb_to); 1633 ev_init (&once->to, once_cb_to);
1577 if (timeout >= 0.) 1634 if (timeout >= 0.)
1578 { 1635 {
1579 ev_timer_set (&once->to, timeout, 0.); 1636 ev_timer_set (&once->to, timeout, 0.);
1580 ev_timer_start (EV_A_ &once->to); 1637 ev_timer_start (EV_A_ &once->to);
1581 } 1638 }
1582 } 1639 }
1583} 1640}
1584 1641
1642#ifdef __cplusplus
1643}
1644#endif
1645

Diff Legend

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