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

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

Diff Legend

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