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

Comparing libev/ev.c (file contents):
Revision 1.506 by root, Thu Jul 11 05:41:39 2019 UTC vs.
Revision 1.516 by root, Tue Dec 24 13:24:29 2019 UTC

… …
124# else 124# else
125# undef EV_USE_LINUXAIO 125# undef EV_USE_LINUXAIO
126# define EV_USE_LINUXAIO 0 126# define EV_USE_LINUXAIO 0
127# endif 127# endif
128 128
129# if HAVE_LINUX_FS_H && HAVE_SYS_TIMERFD_H && HAVE_KERNEL_RWF_T
130# ifndef EV_USE_IOURING
131# define EV_USE_IOURING EV_FEATURE_BACKENDS
132# endif
133# else
134# undef EV_USE_IOURING
135# define EV_USE_IOURING 0
136# endif
137
129# if HAVE_KQUEUE && HAVE_SYS_EVENT_H 138# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
130# ifndef EV_USE_KQUEUE 139# ifndef EV_USE_KQUEUE
131# define EV_USE_KQUEUE EV_FEATURE_BACKENDS 140# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
132# endif 141# endif
133# else 142# else
… …
168# endif 177# endif
169# else 178# else
170# undef EV_USE_EVENTFD 179# undef EV_USE_EVENTFD
171# define EV_USE_EVENTFD 0 180# define EV_USE_EVENTFD 0
172# endif 181# endif
173 182
183# if HAVE_SYS_TIMERFD_H
184# ifndef EV_USE_TIMERFD
185# define EV_USE_TIMERFD EV_FEATURE_OS
186# endif
187# else
188# undef EV_USE_TIMERFD
189# define EV_USE_TIMERFD 0
190# endif
191
174#endif 192#endif
175 193
176/* OS X, in its infinite idiocy, actually HARDCODES 194/* OS X, in its infinite idiocy, actually HARDCODES
177 * a limit of 1024 into their select. Where people have brains, 195 * a limit of 1024 into their select. Where people have brains,
178 * OS X engineers apparently have a vacuum. Or maybe they were 196 * OS X engineers apparently have a vacuum. Or maybe they were
… …
333# define EV_USE_LINUXAIO 0 351# define EV_USE_LINUXAIO 0
334# endif 352# endif
335#endif 353#endif
336 354
337#ifndef EV_USE_IOURING 355#ifndef EV_USE_IOURING
338# if __linux 356# if __linux /* later checks might disable again */
339# define EV_USE_IOURING 0 357# define EV_USE_IOURING 1
340# else 358# else
341# define EV_USE_IOURING 0 359# define EV_USE_IOURING 0
342# endif 360# endif
343#endif 361#endif
344 362
… …
369#ifndef EV_USE_SIGNALFD 387#ifndef EV_USE_SIGNALFD
370# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 388# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
371# define EV_USE_SIGNALFD EV_FEATURE_OS 389# define EV_USE_SIGNALFD EV_FEATURE_OS
372# else 390# else
373# define EV_USE_SIGNALFD 0 391# define EV_USE_SIGNALFD 0
392# endif
393#endif
394
395#ifndef EV_USE_TIMERFD
396# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 8))
397# define EV_USE_TIMERFD EV_FEATURE_OS
398# else
399# define EV_USE_TIMERFD 0
374# endif 400# endif
375#endif 401#endif
376 402
377#if 0 /* debugging */ 403#if 0 /* debugging */
378# define EV_VERIFY 3 404# define EV_VERIFY 3
… …
438#if !EV_STAT_ENABLE 464#if !EV_STAT_ENABLE
439# undef EV_USE_INOTIFY 465# undef EV_USE_INOTIFY
440# define EV_USE_INOTIFY 0 466# define EV_USE_INOTIFY 0
441#endif 467#endif
442 468
469#if __linux && EV_USE_IOURING
470# include <linux/version.h>
471# if LINUX_VERSION_CODE < KERNEL_VERSION(4,14,0)
472# undef EV_USE_IOURING
473# define EV_USE_IOURING 0
474# endif
475#endif
476
443#if !EV_USE_NANOSLEEP 477#if !EV_USE_NANOSLEEP
444/* hp-ux has it in sys/time.h, which we unconditionally include above */ 478/* hp-ux has it in sys/time.h, which we unconditionally include above */
445# if !defined _WIN32 && !defined __hpux 479# if !defined _WIN32 && !defined __hpux
446# include <sys/select.h> 480# include <sys/select.h>
447# endif 481# endif
… …
481# define EV_USE_INOTIFY 0 515# define EV_USE_INOTIFY 0
482# endif 516# endif
483#endif 517#endif
484 518
485#if EV_USE_EVENTFD 519#if EV_USE_EVENTFD
486/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 520/* our minimum requirement is glibc 2.7 which has the stub, but not the full header */
487# include <stdint.h> 521# include <stdint.h>
488# ifndef EFD_NONBLOCK 522# ifndef EFD_NONBLOCK
489# define EFD_NONBLOCK O_NONBLOCK 523# define EFD_NONBLOCK O_NONBLOCK
490# endif 524# endif
491# ifndef EFD_CLOEXEC 525# ifndef EFD_CLOEXEC
… …
497# endif 531# endif
498EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags); 532EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
499#endif 533#endif
500 534
501#if EV_USE_SIGNALFD 535#if EV_USE_SIGNALFD
502/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 536/* our minimum requirement is glibc 2.7 which has the stub, but not the full header */
503# include <stdint.h> 537# include <stdint.h>
504# ifndef SFD_NONBLOCK 538# ifndef SFD_NONBLOCK
505# define SFD_NONBLOCK O_NONBLOCK 539# define SFD_NONBLOCK O_NONBLOCK
506# endif 540# endif
507# ifndef SFD_CLOEXEC 541# ifndef SFD_CLOEXEC
… …
509# define SFD_CLOEXEC O_CLOEXEC 543# define SFD_CLOEXEC O_CLOEXEC
510# else 544# else
511# define SFD_CLOEXEC 02000000 545# define SFD_CLOEXEC 02000000
512# endif 546# endif
513# endif 547# endif
514EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags); 548EV_CPP (extern "C") int (signalfd) (int fd, const sigset_t *mask, int flags);
515 549
516struct signalfd_siginfo 550struct signalfd_siginfo
517{ 551{
518 uint32_t ssi_signo; 552 uint32_t ssi_signo;
519 char pad[128 - sizeof (uint32_t)]; 553 char pad[128 - sizeof (uint32_t)];
520}; 554};
555#endif
556
557/* for timerfd, libev core requires TFD_TIMER_CANCEL_ON_SET &c */
558#if EV_USE_TIMERFD
559# include <sys/timerfd.h>
560/* timerfd is only used for periodics */
561# if !(defined (TFD_TIMER_CANCEL_ON_SET) && defined (TFD_CLOEXEC) && defined (TFD_NONBLOCK)) || !EV_PERIODIC_ENABLE
562# undef EV_USE_TIMERFD
563# define EV_USE_TIMERFD 0
564# endif
521#endif 565#endif
522 566
523/*****************************************************************************/ 567/*****************************************************************************/
524 568
525#if EV_VERIFY >= 3 569#if EV_VERIFY >= 3
… …
544#define EV_TSTAMP_HUGE \ 588#define EV_TSTAMP_HUGE \
545 (sizeof (time_t) >= 8 ? 10000000000000. \ 589 (sizeof (time_t) >= 8 ? 10000000000000. \
546 : 0 < (time_t)4294967295 ? 4294967295. \ 590 : 0 < (time_t)4294967295 ? 4294967295. \
547 : 2147483647.) \ 591 : 2147483647.) \
548 592
593#ifndef EV_TS_CONST
594# define EV_TS_CONST(nv) nv
549#define EV_TS_TO_MS(a) a * 1e3 + 0.9999 595# define EV_TS_TO_MSEC(a) a * 1e3 + 0.9999
550#define EV_TS_FROM_US(us) us * 1e-6 596# define EV_TS_FROM_USEC(us) us * 1e-6
551#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0) 597# define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
552#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0) 598# define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
553#define EV_TV_GET(tv) ((tv).tv_sec + (tv).tv_usec * 1e-6) 599# define EV_TV_GET(tv) ((tv).tv_sec + (tv).tv_usec * 1e-6)
554#define EV_TS_GET(ts) ((ts).tv_sec + (ts).tv_nsec * 1e-9) 600# define EV_TS_GET(ts) ((ts).tv_sec + (ts).tv_nsec * 1e-9)
601#endif
555 602
556/* the following is ecb.h embedded into libev - use update_ev_c to update from an external copy */ 603/* the following is ecb.h embedded into libev - use update_ev_c to update from an external copy */
557/* ECB.H BEGIN */ 604/* ECB.H BEGIN */
558/* 605/*
559 * libecb - http://software.schmorp.de/pkg/libecb 606 * libecb - http://software.schmorp.de/pkg/libecb
… …
1965 static struct ev_loop default_loop_struct; 2012 static struct ev_loop default_loop_struct;
1966 EV_API_DECL struct ev_loop *ev_default_loop_ptr = 0; /* needs to be initialised to make it a definition despite extern */ 2013 EV_API_DECL struct ev_loop *ev_default_loop_ptr = 0; /* needs to be initialised to make it a definition despite extern */
1967 2014
1968#else 2015#else
1969 2016
1970 EV_API_DECL ev_tstamp ev_rt_now = 0; /* needs to be initialised to make it a definition despite extern */ 2017 EV_API_DECL ev_tstamp ev_rt_now = EV_TS_CONST (0.); /* needs to be initialised to make it a definition despite extern */
1971 #define VAR(name,decl) static decl; 2018 #define VAR(name,decl) static decl;
1972 #include "ev_vars.h" 2019 #include "ev_vars.h"
1973 #undef VAR 2020 #undef VAR
1974 2021
1975 static int ev_default_loop_ptr; 2022 static int ev_default_loop_ptr;
… …
2001 clock_gettime (CLOCK_REALTIME, &ts); 2048 clock_gettime (CLOCK_REALTIME, &ts);
2002 return EV_TS_GET (ts); 2049 return EV_TS_GET (ts);
2003 } 2050 }
2004#endif 2051#endif
2005 2052
2053 {
2006 struct timeval tv; 2054 struct timeval tv;
2007 gettimeofday (&tv, 0); 2055 gettimeofday (&tv, 0);
2008 return EV_TV_GET (tv); 2056 return EV_TV_GET (tv);
2057 }
2009} 2058}
2010#endif 2059#endif
2011 2060
2012inline_size ev_tstamp 2061inline_size ev_tstamp
2013get_clock (void) 2062get_clock (void)
… …
2033#endif 2082#endif
2034 2083
2035void 2084void
2036ev_sleep (ev_tstamp delay) EV_NOEXCEPT 2085ev_sleep (ev_tstamp delay) EV_NOEXCEPT
2037{ 2086{
2038 if (delay > 0.) 2087 if (delay > EV_TS_CONST (0.))
2039 { 2088 {
2040#if EV_USE_NANOSLEEP 2089#if EV_USE_NANOSLEEP
2041 struct timespec ts; 2090 struct timespec ts;
2042 2091
2043 EV_TS_SET (ts, delay); 2092 EV_TS_SET (ts, delay);
2044 nanosleep (&ts, 0); 2093 nanosleep (&ts, 0);
2045#elif defined _WIN32 2094#elif defined _WIN32
2046 /* maybe this should round up, as ms is very low resolution */ 2095 /* maybe this should round up, as ms is very low resolution */
2047 /* compared to select (µs) or nanosleep (ns) */ 2096 /* compared to select (µs) or nanosleep (ns) */
2048 Sleep ((unsigned long)(EV_TS_TO_MS (delay))); 2097 Sleep ((unsigned long)(EV_TS_TO_MSEC (delay)));
2049#else 2098#else
2050 struct timeval tv; 2099 struct timeval tv;
2051 2100
2052 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 2101 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
2053 /* something not guaranteed by newer posix versions, but guaranteed */ 2102 /* something not guaranteed by newer posix versions, but guaranteed */
… …
2826 2875
2827#endif 2876#endif
2828 2877
2829/*****************************************************************************/ 2878/*****************************************************************************/
2830 2879
2880#if EV_USE_TIMERFD
2881
2882static void periodics_reschedule (EV_P);
2883
2884static void
2885timerfdcb (EV_P_ ev_io *iow, int revents)
2886{
2887 struct itimerspec its = { 0 };
2888
2889 /* since we can't easily come zup with a (portable) maximum value of time_t,
2890 * we wake up once per month, which hopefully is rare enough to not
2891 * be a problem. */
2892 its.it_value.tv_sec = ev_rt_now + 86400 * 30;
2893 timerfd_settime (timerfd, TFD_TIMER_ABSTIME | TFD_TIMER_CANCEL_ON_SET, &its, 0);
2894
2895 ev_rt_now = ev_time ();
2896 /* periodics_reschedule only needs ev_rt_now */
2897 /* but maybe in the future we want the full treatment. */
2898 /*
2899 now_floor = EV_TS_CONST (0.);
2900 time_update (EV_A_ EV_TSTAMP_HUGE);
2901 */
2902 periodics_reschedule (EV_A);
2903}
2904
2905ecb_noinline ecb_cold
2906static void
2907evtimerfd_init (EV_P)
2908{
2909 if (!ev_is_active (&timerfd_w))
2910 {
2911 timerfd = timerfd_create (CLOCK_REALTIME, TFD_NONBLOCK | TFD_CLOEXEC);
2912
2913 if (timerfd >= 0)
2914 {
2915 fd_intern (timerfd); /* just to be sure */
2916
2917 ev_io_init (&timerfd_w, timerfdcb, timerfd, EV_READ);
2918 ev_set_priority (&timerfd_w, EV_MINPRI);
2919 ev_io_start (EV_A_ &timerfd_w);
2920 ev_unref (EV_A); /* watcher should not keep loop alive */
2921
2922 /* (re-) arm timer */
2923 timerfdcb (EV_A_ 0, 0);
2924 }
2925 }
2926}
2927
2928#endif
2929
2930/*****************************************************************************/
2931
2831#if EV_USE_IOCP 2932#if EV_USE_IOCP
2832# include "ev_iocp.c" 2933# include "ev_iocp.c"
2833#endif 2934#endif
2834#if EV_USE_PORT 2935#if EV_USE_PORT
2835# include "ev_port.c" 2936# include "ev_port.c"
… …
3067 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 3168 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
3068#endif 3169#endif
3069#if EV_USE_SIGNALFD 3170#if EV_USE_SIGNALFD
3070 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 3171 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
3071#endif 3172#endif
3173#if EV_USE_TIMERFD
3174 timerfd = flags & EVFLAG_NOTIMERFD ? -1 : -2;
3175#endif
3072 3176
3073 if (!(flags & EVBACKEND_MASK)) 3177 if (!(flags & EVBACKEND_MASK))
3074 flags |= ev_recommended_backends (); 3178 flags |= ev_recommended_backends ();
3075 3179
3076#if EV_USE_IOCP 3180#if EV_USE_IOCP
… …
3147 } 3251 }
3148 3252
3149#if EV_USE_SIGNALFD 3253#if EV_USE_SIGNALFD
3150 if (ev_is_active (&sigfd_w)) 3254 if (ev_is_active (&sigfd_w))
3151 close (sigfd); 3255 close (sigfd);
3256#endif
3257
3258#if EV_USE_TIMERFD
3259 if (ev_is_active (&timerfd_w))
3260 close (timerfd);
3152#endif 3261#endif
3153 3262
3154#if EV_USE_INOTIFY 3263#if EV_USE_INOTIFY
3155 if (fs_fd >= 0) 3264 if (fs_fd >= 0)
3156 close (fs_fd); 3265 close (fs_fd);
… …
3249#endif 3358#endif
3250#if EV_USE_INOTIFY 3359#if EV_USE_INOTIFY
3251 infy_fork (EV_A); 3360 infy_fork (EV_A);
3252#endif 3361#endif
3253 3362
3363 if (postfork != 2)
3364 {
3365 #if EV_USE_SIGNALFD
3366 /* surprisingly, nothing needs to be done for signalfd, accoridng to docs, it does the right thing on fork */
3367 #endif
3368
3369 #if EV_USE_TIMERFD
3370 if (ev_is_active (&timerfd_w))
3371 {
3372 ev_ref (EV_A);
3373 ev_io_stop (EV_A_ &timerfd_w);
3374
3375 close (timerfd);
3376 timerfd = -2;
3377
3378 evtimerfd_init (EV_A);
3379 /* reschedule periodics, in case we missed something */
3380 ev_feed_event (EV_A_ &timerfd_w, EV_CUSTOM);
3381 }
3382 #endif
3383
3254#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE 3384 #if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
3255 if (ev_is_active (&pipe_w) && postfork != 2) 3385 if (ev_is_active (&pipe_w))
3256 { 3386 {
3257 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */ 3387 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */
3258 3388
3259 ev_ref (EV_A); 3389 ev_ref (EV_A);
3260 ev_io_stop (EV_A_ &pipe_w); 3390 ev_io_stop (EV_A_ &pipe_w);
3261 3391
3262 if (evpipe [0] >= 0) 3392 if (evpipe [0] >= 0)
3263 EV_WIN32_CLOSE_FD (evpipe [0]); 3393 EV_WIN32_CLOSE_FD (evpipe [0]);
3264 3394
3265 evpipe_init (EV_A); 3395 evpipe_init (EV_A);
3266 /* iterate over everything, in case we missed something before */ 3396 /* iterate over everything, in case we missed something before */
3267 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM); 3397 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
3398 }
3399 #endif
3268 } 3400 }
3269#endif
3270 3401
3271 postfork = 0; 3402 postfork = 0;
3272} 3403}
3273 3404
3274#if EV_MULTIPLICITY 3405#if EV_MULTIPLICITY
… …
3544 { 3675 {
3545 ev_at (w) += w->repeat; 3676 ev_at (w) += w->repeat;
3546 if (ev_at (w) < mn_now) 3677 if (ev_at (w) < mn_now)
3547 ev_at (w) = mn_now; 3678 ev_at (w) = mn_now;
3548 3679
3549 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 3680 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > EV_TS_CONST (0.)));
3550 3681
3551 ANHE_at_cache (timers [HEAP0]); 3682 ANHE_at_cache (timers [HEAP0]);
3552 downheap (timers, timercnt, HEAP0); 3683 downheap (timers, timercnt, HEAP0);
3553 } 3684 }
3554 else 3685 else
… …
3685 3816
3686 mn_now = get_clock (); 3817 mn_now = get_clock ();
3687 3818
3688 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 3819 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
3689 /* interpolate in the meantime */ 3820 /* interpolate in the meantime */
3690 if (ecb_expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 3821 if (ecb_expect_true (mn_now - now_floor < EV_TS_CONST (MIN_TIMEJUMP * .5)))
3691 { 3822 {
3692 ev_rt_now = rtmn_diff + mn_now; 3823 ev_rt_now = rtmn_diff + mn_now;
3693 return; 3824 return;
3694 } 3825 }
3695 3826
… …
3709 ev_tstamp diff; 3840 ev_tstamp diff;
3710 rtmn_diff = ev_rt_now - mn_now; 3841 rtmn_diff = ev_rt_now - mn_now;
3711 3842
3712 diff = odiff - rtmn_diff; 3843 diff = odiff - rtmn_diff;
3713 3844
3714 if (ecb_expect_true ((diff < 0. ? -diff : diff) < MIN_TIMEJUMP)) 3845 if (ecb_expect_true ((diff < EV_TS_CONST (0.) ? -diff : diff) < EV_TS_CONST (MIN_TIMEJUMP)))
3715 return; /* all is well */ 3846 return; /* all is well */
3716 3847
3717 ev_rt_now = ev_time (); 3848 ev_rt_now = ev_time ();
3718 mn_now = get_clock (); 3849 mn_now = get_clock ();
3719 now_floor = mn_now; 3850 now_floor = mn_now;
… …
3728 else 3859 else
3729#endif 3860#endif
3730 { 3861 {
3731 ev_rt_now = ev_time (); 3862 ev_rt_now = ev_time ();
3732 3863
3733 if (ecb_expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 3864 if (ecb_expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + EV_TS_CONST (MIN_TIMEJUMP)))
3734 { 3865 {
3735 /* adjust timers. this is easy, as the offset is the same for all of them */ 3866 /* adjust timers. this is easy, as the offset is the same for all of them */
3736 timers_reschedule (EV_A_ ev_rt_now - mn_now); 3867 timers_reschedule (EV_A_ ev_rt_now - mn_now);
3737#if EV_PERIODIC_ENABLE 3868#if EV_PERIODIC_ENABLE
3738 periodics_reschedule (EV_A); 3869 periodics_reschedule (EV_A);
… …
3807 3938
3808 /* remember old timestamp for io_blocktime calculation */ 3939 /* remember old timestamp for io_blocktime calculation */
3809 ev_tstamp prev_mn_now = mn_now; 3940 ev_tstamp prev_mn_now = mn_now;
3810 3941
3811 /* update time to cancel out callback processing overhead */ 3942 /* update time to cancel out callback processing overhead */
3812 time_update (EV_A_ 1e100); 3943 time_update (EV_A_ EV_TS_CONST (EV_TSTAMP_HUGE));
3813 3944
3814 /* from now on, we want a pipe-wake-up */ 3945 /* from now on, we want a pipe-wake-up */
3815 pipe_write_wanted = 1; 3946 pipe_write_wanted = 1;
3816 3947
3817 ECB_MEMORY_FENCE; /* make sure pipe_write_wanted is visible before we check for potential skips */ 3948 ECB_MEMORY_FENCE; /* make sure pipe_write_wanted is visible before we check for potential skips */
3818 3949
3819 if (ecb_expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt || pipe_write_skipped))) 3950 if (ecb_expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt || pipe_write_skipped)))
3820 { 3951 {
3821 waittime = MAX_BLOCKTIME; 3952 waittime = EV_TS_CONST (MAX_BLOCKTIME);
3822 3953
3823 if (timercnt) 3954 if (timercnt)
3824 { 3955 {
3825 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now; 3956 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now;
3826 if (waittime > to) waittime = to; 3957 if (waittime > to) waittime = to;
… …
3836 3967
3837 /* don't let timeouts decrease the waittime below timeout_blocktime */ 3968 /* don't let timeouts decrease the waittime below timeout_blocktime */
3838 if (ecb_expect_false (waittime < timeout_blocktime)) 3969 if (ecb_expect_false (waittime < timeout_blocktime))
3839 waittime = timeout_blocktime; 3970 waittime = timeout_blocktime;
3840 3971
3841 /* at this point, we NEED to wait, so we have to ensure */ 3972 /* now there are two more special cases left, either we have
3842 /* to pass a minimum nonzero value to the backend */ 3973 * already-expired timers, so we should not sleep, or we have timers
3974 * that expire very soon, in which case we need to wait for a minimum
3975 * amount of time for some event loop backends.
3976 */
3843 if (ecb_expect_false (waittime < backend_mintime)) 3977 if (ecb_expect_false (waittime < backend_mintime))
3978 waittime = waittime <= EV_TS_CONST (0.)
3979 ? EV_TS_CONST (0.)
3844 waittime = backend_mintime; 3980 : backend_mintime;
3845 3981
3846 /* extra check because io_blocktime is commonly 0 */ 3982 /* extra check because io_blocktime is commonly 0 */
3847 if (ecb_expect_false (io_blocktime)) 3983 if (ecb_expect_false (io_blocktime))
3848 { 3984 {
3849 sleeptime = io_blocktime - (mn_now - prev_mn_now); 3985 sleeptime = io_blocktime - (mn_now - prev_mn_now);
3850 3986
3851 if (sleeptime > waittime - backend_mintime) 3987 if (sleeptime > waittime - backend_mintime)
3852 sleeptime = waittime - backend_mintime; 3988 sleeptime = waittime - backend_mintime;
3853 3989
3854 if (ecb_expect_true (sleeptime > 0.)) 3990 if (ecb_expect_true (sleeptime > EV_TS_CONST (0.)))
3855 { 3991 {
3856 ev_sleep (sleeptime); 3992 ev_sleep (sleeptime);
3857 waittime -= sleeptime; 3993 waittime -= sleeptime;
3858 } 3994 }
3859 } 3995 }
… …
3933} 4069}
3934 4070
3935void 4071void
3936ev_now_update (EV_P) EV_NOEXCEPT 4072ev_now_update (EV_P) EV_NOEXCEPT
3937{ 4073{
3938 time_update (EV_A_ 1e100); 4074 time_update (EV_A_ EV_TSTAMP_HUGE);
3939} 4075}
3940 4076
3941void 4077void
3942ev_suspend (EV_P) EV_NOEXCEPT 4078ev_suspend (EV_P) EV_NOEXCEPT
3943{ 4079{
… …
4174} 4310}
4175 4311
4176ev_tstamp 4312ev_tstamp
4177ev_timer_remaining (EV_P_ ev_timer *w) EV_NOEXCEPT 4313ev_timer_remaining (EV_P_ ev_timer *w) EV_NOEXCEPT
4178{ 4314{
4179 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.); 4315 return ev_at (w) - (ev_is_active (w) ? mn_now : EV_TS_CONST (0.));
4180} 4316}
4181 4317
4182#if EV_PERIODIC_ENABLE 4318#if EV_PERIODIC_ENABLE
4183ecb_noinline 4319ecb_noinline
4184void 4320void
4185ev_periodic_start (EV_P_ ev_periodic *w) EV_NOEXCEPT 4321ev_periodic_start (EV_P_ ev_periodic *w) EV_NOEXCEPT
4186{ 4322{
4187 if (ecb_expect_false (ev_is_active (w))) 4323 if (ecb_expect_false (ev_is_active (w)))
4188 return; 4324 return;
4325
4326#if EV_USE_TIMERFD
4327 if (timerfd == -2)
4328 evtimerfd_init (EV_A);
4329#endif
4189 4330
4190 if (w->reschedule_cb) 4331 if (w->reschedule_cb)
4191 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 4332 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
4192 else if (w->interval) 4333 else if (w->interval)
4193 { 4334 {

Diff Legend

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