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

Comparing libev/ev.c (file contents):
Revision 1.84 by root, Fri Nov 9 23:04:35 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
… …
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
523inline void 549inline void
524adjustheap (WT *heap, int N, int k, ev_tstamp at) 550adjustheap (WT *heap, int N, int k)
525{ 551{
526 ev_tstamp old_at = heap [k]->at; 552 upheap (heap, k);
527 heap [k]->at = at;
528
529 if (old_at < at)
530 downheap (heap, N, k); 553 downheap (heap, N, k);
531 else
532 upheap (heap, k);
533} 554}
534 555
535/*****************************************************************************/ 556/*****************************************************************************/
536 557
537typedef struct 558typedef struct
… …
560} 581}
561 582
562static void 583static void
563sighandler (int signum) 584sighandler (int signum)
564{ 585{
565#if WIN32 586#if _WIN32
566 signal (signum, sighandler); 587 signal (signum, sighandler);
567#endif 588#endif
568 589
569 signals [signum - 1].gotsig = 1; 590 signals [signum - 1].gotsig = 1;
570 591
571 if (!gotsig) 592 if (!gotsig)
572 { 593 {
573 int old_errno = errno; 594 int old_errno = errno;
574 gotsig = 1; 595 gotsig = 1;
575#ifdef WIN32
576 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
577#else
578 write (sigpipe [1], &signum, 1); 596 write (sigpipe [1], &signum, 1);
579#endif
580 errno = old_errno; 597 errno = old_errno;
581 } 598 }
582} 599}
583 600
584void 601void
… …
604static void 621static void
605sigcb (EV_P_ struct ev_io *iow, int revents) 622sigcb (EV_P_ struct ev_io *iow, int revents)
606{ 623{
607 int signum; 624 int signum;
608 625
609#ifdef WIN32
610 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
611#else
612 read (sigpipe [0], &revents, 1); 626 read (sigpipe [0], &revents, 1);
613#endif
614 gotsig = 0; 627 gotsig = 0;
615 628
616 for (signum = signalmax; signum--; ) 629 for (signum = signalmax; signum--; )
617 if (signals [signum].gotsig) 630 if (signals [signum].gotsig)
618 ev_feed_signal_event (EV_A_ signum + 1); 631 ev_feed_signal_event (EV_A_ signum + 1);
619} 632}
620 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
621static void 646static void
622siginit (EV_P) 647siginit (EV_P)
623{ 648{
624#ifndef WIN32 649 fd_intern (sigpipe [0]);
625 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 650 fd_intern (sigpipe [1]);
626 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
627
628 /* rather than sort out wether we really need nb, set it */
629 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
630 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
631#endif
632 651
633 ev_io_set (&sigev, sigpipe [0], EV_READ); 652 ev_io_set (&sigev, sigpipe [0], EV_READ);
634 ev_io_start (EV_A_ &sigev); 653 ev_io_start (EV_A_ &sigev);
635 ev_unref (EV_A); /* child watcher should not keep loop alive */ 654 ev_unref (EV_A); /* child watcher should not keep loop alive */
636} 655}
637 656
638/*****************************************************************************/ 657/*****************************************************************************/
639 658
640static struct ev_child *childs [PID_HASHSIZE]; 659static struct ev_child *childs [PID_HASHSIZE];
641 660
642#ifndef WIN32 661#ifndef _WIN32
643 662
644static struct ev_signal childev; 663static struct ev_signal childev;
645 664
646#ifndef WCONTINUED 665#ifndef WCONTINUED
647# define WCONTINUED 0 666# define WCONTINUED 0
… …
708 727
709/* 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 */
710static int 729static int
711enable_secure (void) 730enable_secure (void)
712{ 731{
713#ifdef WIN32 732#ifdef _WIN32
714 return 0; 733 return 0;
715#else 734#else
716 return getuid () != geteuid () 735 return getuid () != geteuid ()
717 || getgid () != getegid (); 736 || getgid () != getegid ();
718#endif 737#endif
… …
735 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 754 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
736 have_monotonic = 1; 755 have_monotonic = 1;
737 } 756 }
738#endif 757#endif
739 758
740 rt_now = ev_time (); 759 ev_rt_now = ev_time ();
741 mn_now = get_clock (); 760 mn_now = get_clock ();
742 now_floor = mn_now; 761 now_floor = mn_now;
743 rtmn_diff = rt_now - mn_now; 762 rtmn_diff = ev_rt_now - mn_now;
744 763
745 if (methods == EVMETHOD_AUTO) 764 if (methods == EVMETHOD_AUTO)
746 if (!enable_secure () && getenv ("LIBEV_METHODS")) 765 if (!enable_secure () && getenv ("LIBEV_METHODS"))
747 methods = atoi (getenv ("LIBEV_METHODS")); 766 methods = atoi (getenv ("LIBEV_METHODS"));
748 else 767 else
749 methods = EVMETHOD_ANY; 768 methods = EVMETHOD_ANY;
750 769
751 method = 0; 770 method = 0;
752#if EV_USE_WIN32
753 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods);
754#endif
755#if EV_USE_KQUEUE 771#if EV_USE_KQUEUE
756 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 772 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);
757#endif 773#endif
758#if EV_USE_EPOLL 774#if EV_USE_EPOLL
759 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 775 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods);
… …
773void 789void
774loop_destroy (EV_P) 790loop_destroy (EV_P)
775{ 791{
776 int i; 792 int i;
777 793
778#if EV_USE_WIN32
779 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
780#endif
781#if EV_USE_KQUEUE 794#if EV_USE_KQUEUE
782 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 795 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
783#endif 796#endif
784#if EV_USE_EPOLL 797#if EV_USE_EPOLL
785 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 798 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
… …
793 806
794 for (i = NUMPRI; i--; ) 807 for (i = NUMPRI; i--; )
795 array_free (pending, [i]); 808 array_free (pending, [i]);
796 809
797 /* have to use the microsoft-never-gets-it-right macro */ 810 /* have to use the microsoft-never-gets-it-right macro */
798 array_free_microshit (fdchange); 811 array_free (fdchange, EMPTY);
799 array_free_microshit (timer); 812 array_free (timer, EMPTY);
800 array_free_microshit (periodic); 813#if EV_PERIODICS
801 array_free_microshit (idle); 814 array_free (periodic, EMPTY);
802 array_free_microshit (prepare); 815#endif
803 array_free_microshit (check); 816 array_free (idle, EMPTY);
817 array_free (prepare, EMPTY);
818 array_free (check, EMPTY);
804 819
805 method = 0; 820 method = 0;
806} 821}
807 822
808static void 823static void
… …
887 902
888 if (ev_method (EV_A)) 903 if (ev_method (EV_A))
889 { 904 {
890 siginit (EV_A); 905 siginit (EV_A);
891 906
892#ifndef WIN32 907#ifndef _WIN32
893 ev_signal_init (&childev, childcb, SIGCHLD); 908 ev_signal_init (&childev, childcb, SIGCHLD);
894 ev_set_priority (&childev, EV_MAXPRI); 909 ev_set_priority (&childev, EV_MAXPRI);
895 ev_signal_start (EV_A_ &childev); 910 ev_signal_start (EV_A_ &childev);
896 ev_unref (EV_A); /* child watcher should not keep loop alive */ 911 ev_unref (EV_A); /* child watcher should not keep loop alive */
897#endif 912#endif
… …
908{ 923{
909#if EV_MULTIPLICITY 924#if EV_MULTIPLICITY
910 struct ev_loop *loop = default_loop; 925 struct ev_loop *loop = default_loop;
911#endif 926#endif
912 927
913#ifndef WIN32 928#ifndef _WIN32
914 ev_ref (EV_A); /* child watcher */ 929 ev_ref (EV_A); /* child watcher */
915 ev_signal_stop (EV_A_ &childev); 930 ev_signal_stop (EV_A_ &childev);
916#endif 931#endif
917 932
918 ev_ref (EV_A); /* signal watcher */ 933 ev_ref (EV_A); /* signal watcher */
… …
978 993
979 /* first reschedule or stop timer */ 994 /* first reschedule or stop timer */
980 if (w->repeat) 995 if (w->repeat)
981 { 996 {
982 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
983 ((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
984 downheap ((WT *)timers, timercnt, 0); 1003 downheap ((WT *)timers, timercnt, 0);
985 } 1004 }
986 else 1005 else
987 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1006 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
988 1007
989 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1008 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
990 } 1009 }
991} 1010}
992 1011
1012#if EV_PERIODICS
993static void 1013static void
994periodics_reify (EV_P) 1014periodics_reify (EV_P)
995{ 1015{
996 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1016 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
997 { 1017 {
998 struct ev_periodic *w = periodics [0]; 1018 struct ev_periodic *w = periodics [0];
999 1019
1000 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1020 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
1001 1021
1002 /* first reschedule or stop timer */ 1022 /* first reschedule or stop timer */
1003 if (w->reschedule_cb) 1023 if (w->reschedule_cb)
1004 { 1024 {
1005 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);
1006 1026
1007 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));
1008 downheap ((WT *)periodics, periodiccnt, 0); 1028 downheap ((WT *)periodics, periodiccnt, 0);
1009 } 1029 }
1010 else if (w->interval) 1030 else if (w->interval)
1011 { 1031 {
1012 ((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;
1013 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));
1014 downheap ((WT *)periodics, periodiccnt, 0); 1034 downheap ((WT *)periodics, periodiccnt, 0);
1015 } 1035 }
1016 else 1036 else
1017 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1037 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1018 1038
… …
1029 for (i = 0; i < periodiccnt; ++i) 1049 for (i = 0; i < periodiccnt; ++i)
1030 { 1050 {
1031 struct ev_periodic *w = periodics [i]; 1051 struct ev_periodic *w = periodics [i];
1032 1052
1033 if (w->reschedule_cb) 1053 if (w->reschedule_cb)
1034 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1054 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1035 else if (w->interval) 1055 else if (w->interval)
1036 ((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;
1037 } 1057 }
1038 1058
1039 /* now rebuild the heap */ 1059 /* now rebuild the heap */
1040 for (i = periodiccnt >> 1; i--; ) 1060 for (i = periodiccnt >> 1; i--; )
1041 downheap ((WT *)periodics, periodiccnt, i); 1061 downheap ((WT *)periodics, periodiccnt, i);
1042} 1062}
1063#endif
1043 1064
1044inline int 1065inline int
1045time_update_monotonic (EV_P) 1066time_update_monotonic (EV_P)
1046{ 1067{
1047 mn_now = get_clock (); 1068 mn_now = get_clock ();
1048 1069
1049 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1070 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1050 { 1071 {
1051 rt_now = rtmn_diff + mn_now; 1072 ev_rt_now = rtmn_diff + mn_now;
1052 return 0; 1073 return 0;
1053 } 1074 }
1054 else 1075 else
1055 { 1076 {
1056 now_floor = mn_now; 1077 now_floor = mn_now;
1057 rt_now = ev_time (); 1078 ev_rt_now = ev_time ();
1058 return 1; 1079 return 1;
1059 } 1080 }
1060} 1081}
1061 1082
1062static void 1083static void
… …
1071 { 1092 {
1072 ev_tstamp odiff = rtmn_diff; 1093 ev_tstamp odiff = rtmn_diff;
1073 1094
1074 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 */
1075 { 1096 {
1076 rtmn_diff = rt_now - mn_now; 1097 rtmn_diff = ev_rt_now - mn_now;
1077 1098
1078 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1099 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1079 return; /* all is well */ 1100 return; /* all is well */
1080 1101
1081 rt_now = ev_time (); 1102 ev_rt_now = ev_time ();
1082 mn_now = get_clock (); 1103 mn_now = get_clock ();
1083 now_floor = mn_now; 1104 now_floor = mn_now;
1084 } 1105 }
1085 1106
1107# if EV_PERIODICS
1086 periodics_reschedule (EV_A); 1108 periodics_reschedule (EV_A);
1109# endif
1087 /* no timer adjustment, as the monotonic clock doesn't jump */ 1110 /* no timer adjustment, as the monotonic clock doesn't jump */
1088 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1111 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1089 } 1112 }
1090 } 1113 }
1091 else 1114 else
1092#endif 1115#endif
1093 { 1116 {
1094 rt_now = ev_time (); 1117 ev_rt_now = ev_time ();
1095 1118
1096 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))
1097 { 1120 {
1121#if EV_PERIODICS
1098 periodics_reschedule (EV_A); 1122 periodics_reschedule (EV_A);
1123#endif
1099 1124
1100 /* 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 */
1101 for (i = 0; i < timercnt; ++i) 1126 for (i = 0; i < timercnt; ++i)
1102 ((WT)timers [i])->at += rt_now - mn_now; 1127 ((WT)timers [i])->at += ev_rt_now - mn_now;
1103 } 1128 }
1104 1129
1105 mn_now = rt_now; 1130 mn_now = ev_rt_now;
1106 } 1131 }
1107} 1132}
1108 1133
1109void 1134void
1110ev_ref (EV_P) 1135ev_ref (EV_P)
… …
1150 if (expect_true (have_monotonic)) 1175 if (expect_true (have_monotonic))
1151 time_update_monotonic (EV_A); 1176 time_update_monotonic (EV_A);
1152 else 1177 else
1153#endif 1178#endif
1154 { 1179 {
1155 rt_now = ev_time (); 1180 ev_rt_now = ev_time ();
1156 mn_now = rt_now; 1181 mn_now = ev_rt_now;
1157 } 1182 }
1158 1183
1159 if (flags & EVLOOP_NONBLOCK || idlecnt) 1184 if (flags & EVLOOP_NONBLOCK || idlecnt)
1160 block = 0.; 1185 block = 0.;
1161 else 1186 else
… …
1166 { 1191 {
1167 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1192 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1168 if (block > to) block = to; 1193 if (block > to) block = to;
1169 } 1194 }
1170 1195
1196#if EV_PERIODICS
1171 if (periodiccnt) 1197 if (periodiccnt)
1172 { 1198 {
1173 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1199 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1174 if (block > to) block = to; 1200 if (block > to) block = to;
1175 } 1201 }
1202#endif
1176 1203
1177 if (block < 0.) block = 0.; 1204 if (block < 0.) block = 0.;
1178 } 1205 }
1179 1206
1180 method_poll (EV_A_ block); 1207 method_poll (EV_A_ block);
1181 1208
1182 /* update rt_now, do magic */ 1209 /* update ev_rt_now, do magic */
1183 time_update (EV_A); 1210 time_update (EV_A);
1184 1211
1185 /* queue pending timers and reschedule them */ 1212 /* queue pending timers and reschedule them */
1186 timers_reify (EV_A); /* relative timers called last */ 1213 timers_reify (EV_A); /* relative timers called last */
1214#if EV_PERIODICS
1187 periodics_reify (EV_A); /* absolute timers called first */ 1215 periodics_reify (EV_A); /* absolute timers called first */
1216#endif
1188 1217
1189 /* queue idle watchers unless io or timers are pending */ 1218 /* queue idle watchers unless io or timers are pending */
1190 if (idlecnt && !any_pending (EV_A)) 1219 if (idlecnt && !any_pending (EV_A))
1191 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1220 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1192 1221
… …
1283{ 1312{
1284 ev_clear_pending (EV_A_ (W)w); 1313 ev_clear_pending (EV_A_ (W)w);
1285 if (!ev_is_active (w)) 1314 if (!ev_is_active (w))
1286 return; 1315 return;
1287 1316
1317 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1318
1288 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1319 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1289 ev_stop (EV_A_ (W)w); 1320 ev_stop (EV_A_ (W)w);
1290 1321
1291 fd_change (EV_A_ w->fd); 1322 fd_change (EV_A_ w->fd);
1292} 1323}
… …
1319 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1350 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1320 1351
1321 if (((W)w)->active < timercnt--) 1352 if (((W)w)->active < timercnt--)
1322 { 1353 {
1323 timers [((W)w)->active - 1] = timers [timercnt]; 1354 timers [((W)w)->active - 1] = timers [timercnt];
1324 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1355 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1325 } 1356 }
1326 1357
1327 ((WT)w)->at = w->repeat; 1358 ((WT)w)->at -= mn_now;
1328 1359
1329 ev_stop (EV_A_ (W)w); 1360 ev_stop (EV_A_ (W)w);
1330} 1361}
1331 1362
1332void 1363void
1333ev_timer_again (EV_P_ struct ev_timer *w) 1364ev_timer_again (EV_P_ struct ev_timer *w)
1334{ 1365{
1335 if (ev_is_active (w)) 1366 if (ev_is_active (w))
1336 { 1367 {
1337 if (w->repeat) 1368 if (w->repeat)
1369 {
1370 ((WT)w)->at = mn_now + w->repeat;
1338 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1, mn_now + w->repeat); 1371 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1372 }
1339 else 1373 else
1340 ev_timer_stop (EV_A_ w); 1374 ev_timer_stop (EV_A_ w);
1341 } 1375 }
1342 else if (w->repeat) 1376 else if (w->repeat)
1343 ev_timer_start (EV_A_ w); 1377 ev_timer_start (EV_A_ w);
1344} 1378}
1345 1379
1380#if EV_PERIODICS
1346void 1381void
1347ev_periodic_start (EV_P_ struct ev_periodic *w) 1382ev_periodic_start (EV_P_ struct ev_periodic *w)
1348{ 1383{
1349 if (ev_is_active (w)) 1384 if (ev_is_active (w))
1350 return; 1385 return;
1351 1386
1352 if (w->reschedule_cb) 1387 if (w->reschedule_cb)
1353 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1388 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1354 else if (w->interval) 1389 else if (w->interval)
1355 { 1390 {
1356 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.));
1357 /* 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 */
1358 ((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;
1359 } 1394 }
1360 1395
1361 ev_start (EV_A_ (W)w, ++periodiccnt); 1396 ev_start (EV_A_ (W)w, ++periodiccnt);
1362 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1397 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1363 periodics [periodiccnt - 1] = w; 1398 periodics [periodiccnt - 1] = w;
… …
1376 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1411 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1377 1412
1378 if (((W)w)->active < periodiccnt--) 1413 if (((W)w)->active < periodiccnt--)
1379 { 1414 {
1380 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1415 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1381 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1416 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1382 } 1417 }
1383 1418
1384 ev_stop (EV_A_ (W)w); 1419 ev_stop (EV_A_ (W)w);
1385} 1420}
1386 1421
… …
1389{ 1424{
1390 /* TODO: use adjustheap and recalculation */ 1425 /* TODO: use adjustheap and recalculation */
1391 ev_periodic_stop (EV_A_ w); 1426 ev_periodic_stop (EV_A_ w);
1392 ev_periodic_start (EV_A_ w); 1427 ev_periodic_start (EV_A_ w);
1393} 1428}
1429#endif
1394 1430
1395void 1431void
1396ev_idle_start (EV_P_ struct ev_idle *w) 1432ev_idle_start (EV_P_ struct ev_idle *w)
1397{ 1433{
1398 if (ev_is_active (w)) 1434 if (ev_is_active (w))
… …
1405 1441
1406void 1442void
1407ev_idle_stop (EV_P_ struct ev_idle *w) 1443ev_idle_stop (EV_P_ struct ev_idle *w)
1408{ 1444{
1409 ev_clear_pending (EV_A_ (W)w); 1445 ev_clear_pending (EV_A_ (W)w);
1410 if (ev_is_active (w)) 1446 if (!ev_is_active (w))
1411 return; 1447 return;
1412 1448
1413 idles [((W)w)->active - 1] = idles [--idlecnt]; 1449 idles [((W)w)->active - 1] = idles [--idlecnt];
1414 ev_stop (EV_A_ (W)w); 1450 ev_stop (EV_A_ (W)w);
1415} 1451}
… …
1427 1463
1428void 1464void
1429ev_prepare_stop (EV_P_ struct ev_prepare *w) 1465ev_prepare_stop (EV_P_ struct ev_prepare *w)
1430{ 1466{
1431 ev_clear_pending (EV_A_ (W)w); 1467 ev_clear_pending (EV_A_ (W)w);
1432 if (ev_is_active (w)) 1468 if (!ev_is_active (w))
1433 return; 1469 return;
1434 1470
1435 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1471 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1436 ev_stop (EV_A_ (W)w); 1472 ev_stop (EV_A_ (W)w);
1437} 1473}
… …
1449 1485
1450void 1486void
1451ev_check_stop (EV_P_ struct ev_check *w) 1487ev_check_stop (EV_P_ struct ev_check *w)
1452{ 1488{
1453 ev_clear_pending (EV_A_ (W)w); 1489 ev_clear_pending (EV_A_ (W)w);
1454 if (ev_is_active (w)) 1490 if (!ev_is_active (w))
1455 return; 1491 return;
1456 1492
1457 checks [((W)w)->active - 1] = checks [--checkcnt]; 1493 checks [((W)w)->active - 1] = checks [--checkcnt];
1458 ev_stop (EV_A_ (W)w); 1494 ev_stop (EV_A_ (W)w);
1459} 1495}
… …
1477 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1513 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1478 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1514 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1479 1515
1480 if (!((WL)w)->next) 1516 if (!((WL)w)->next)
1481 { 1517 {
1482#if WIN32 1518#if _WIN32
1483 signal (w->signum, sighandler); 1519 signal (w->signum, sighandler);
1484#else 1520#else
1485 struct sigaction sa; 1521 struct sigaction sa;
1486 sa.sa_handler = sighandler; 1522 sa.sa_handler = sighandler;
1487 sigfillset (&sa.sa_mask); 1523 sigfillset (&sa.sa_mask);
… …
1520 1556
1521void 1557void
1522ev_child_stop (EV_P_ struct ev_child *w) 1558ev_child_stop (EV_P_ struct ev_child *w)
1523{ 1559{
1524 ev_clear_pending (EV_A_ (W)w); 1560 ev_clear_pending (EV_A_ (W)w);
1525 if (ev_is_active (w)) 1561 if (!ev_is_active (w))
1526 return; 1562 return;
1527 1563
1528 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1564 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1529 ev_stop (EV_A_ (W)w); 1565 ev_stop (EV_A_ (W)w);
1530} 1566}
… …
1590 ev_timer_start (EV_A_ &once->to); 1626 ev_timer_start (EV_A_ &once->to);
1591 } 1627 }
1592 } 1628 }
1593} 1629}
1594 1630
1631#ifdef __cplusplus
1632}
1633#endif
1634

Diff Legend

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