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

Comparing libev/ev.c (file contents):
Revision 1.505 by root, Wed Jul 10 14:25:35 2019 UTC vs.
Revision 1.518 by root, Fri Dec 27 16:12:37 2019 UTC

… …
117# define EV_USE_EPOLL 0 117# define EV_USE_EPOLL 0
118# endif 118# endif
119 119
120# if HAVE_LINUX_AIO_ABI_H 120# if HAVE_LINUX_AIO_ABI_H
121# ifndef EV_USE_LINUXAIO 121# ifndef EV_USE_LINUXAIO
122# define EV_USE_LINUXAIO EV_FEATURE_BACKENDS 122# define EV_USE_LINUXAIO 0 /* was: EV_FEATURE_BACKENDS, always off by default */
123# endif 123# endif
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
… …
326# define EV_USE_PORT 0 344# define EV_USE_PORT 0
327#endif 345#endif
328 346
329#ifndef EV_USE_LINUXAIO 347#ifndef EV_USE_LINUXAIO
330# if __linux /* libev currently assumes linux/aio_abi.h is always available on linux */ 348# if __linux /* libev currently assumes linux/aio_abi.h is always available on linux */
331# define EV_USE_LINUXAIO 1 349# define EV_USE_LINUXAIO 0 /* was: 1, always off by default */
332# else 350# else
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
595# define EV_TS_TO_MSEC(a) a * 1e3 + 0.9999
596# define EV_TS_FROM_USEC(us) us * 1e-6
549#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)
550#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)
551#define EV_TV_GET(tv) ((tv).tv_sec + (tv).tv_usec * 1e6) 599# define EV_TV_GET(tv) ((tv).tv_sec + (tv).tv_usec * 1e-6)
552#define EV_TS_GET(ts) ((ts).tv_sec + (ts).tv_nsec * 1e9) 600# define EV_TS_GET(ts) ((ts).tv_sec + (ts).tv_nsec * 1e-9)
601#endif
553 602
554/* 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 */
555/* ECB.H BEGIN */ 604/* ECB.H BEGIN */
556/* 605/*
557 * libecb - http://software.schmorp.de/pkg/libecb 606 * libecb - http://software.schmorp.de/pkg/libecb
… …
1963 static struct ev_loop default_loop_struct; 2012 static struct ev_loop default_loop_struct;
1964 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 */
1965 2014
1966#else 2015#else
1967 2016
1968 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 */
1969 #define VAR(name,decl) static decl; 2018 #define VAR(name,decl) static decl;
1970 #include "ev_vars.h" 2019 #include "ev_vars.h"
1971 #undef VAR 2020 #undef VAR
1972 2021
1973 static int ev_default_loop_ptr; 2022 static int ev_default_loop_ptr;
… …
1999 clock_gettime (CLOCK_REALTIME, &ts); 2048 clock_gettime (CLOCK_REALTIME, &ts);
2000 return EV_TS_GET (ts); 2049 return EV_TS_GET (ts);
2001 } 2050 }
2002#endif 2051#endif
2003 2052
2053 {
2004 struct timeval tv; 2054 struct timeval tv;
2005 gettimeofday (&tv, 0); 2055 gettimeofday (&tv, 0);
2006 return EV_TV_GET (tv); 2056 return EV_TV_GET (tv);
2057 }
2007} 2058}
2008#endif 2059#endif
2009 2060
2010inline_size ev_tstamp 2061inline_size ev_tstamp
2011get_clock (void) 2062get_clock (void)
… …
2031#endif 2082#endif
2032 2083
2033void 2084void
2034ev_sleep (ev_tstamp delay) EV_NOEXCEPT 2085ev_sleep (ev_tstamp delay) EV_NOEXCEPT
2035{ 2086{
2036 if (delay > 0.) 2087 if (delay > EV_TS_CONST (0.))
2037 { 2088 {
2038#if EV_USE_NANOSLEEP 2089#if EV_USE_NANOSLEEP
2039 struct timespec ts; 2090 struct timespec ts;
2040 2091
2041 EV_TS_SET (ts, delay); 2092 EV_TS_SET (ts, delay);
2042 nanosleep (&ts, 0); 2093 nanosleep (&ts, 0);
2043#elif defined _WIN32 2094#elif defined _WIN32
2044 /* maybe this should round up, as ms is very low resolution */ 2095 /* maybe this should round up, as ms is very low resolution */
2045 /* compared to select (µs) or nanosleep (ns) */ 2096 /* compared to select (µs) or nanosleep (ns) */
2046 Sleep ((unsigned long)(delay * 1e3)); 2097 Sleep ((unsigned long)(EV_TS_TO_MSEC (delay)));
2047#else 2098#else
2048 struct timeval tv; 2099 struct timeval tv;
2049 2100
2050 /* 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 */
2051 /* something not guaranteed by newer posix versions, but guaranteed */ 2102 /* something not guaranteed by newer posix versions, but guaranteed */
… …
2401 2452
2402 /* find minimum child */ 2453 /* find minimum child */
2403 if (ecb_expect_true (pos + DHEAP - 1 < E)) 2454 if (ecb_expect_true (pos + DHEAP - 1 < E))
2404 { 2455 {
2405 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos)); 2456 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
2406 if ( ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos)); 2457 if ( minat > ANHE_at (pos [1])) (minpos = pos + 1), (minat = ANHE_at (*minpos));
2407 if ( ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos)); 2458 if ( minat > ANHE_at (pos [2])) (minpos = pos + 2), (minat = ANHE_at (*minpos));
2408 if ( ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos)); 2459 if ( minat > ANHE_at (pos [3])) (minpos = pos + 3), (minat = ANHE_at (*minpos));
2409 } 2460 }
2410 else if (pos < E) 2461 else if (pos < E)
2411 { 2462 {
2412 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos)); 2463 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
2413 if (pos + 1 < E && ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos)); 2464 if (pos + 1 < E && minat > ANHE_at (pos [1])) (minpos = pos + 1), (minat = ANHE_at (*minpos));
2414 if (pos + 2 < E && ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos)); 2465 if (pos + 2 < E && minat > ANHE_at (pos [2])) (minpos = pos + 2), (minat = ANHE_at (*minpos));
2415 if (pos + 3 < E && ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos)); 2466 if (pos + 3 < E && minat > ANHE_at (pos [3])) (minpos = pos + 3), (minat = ANHE_at (*minpos));
2416 } 2467 }
2417 else 2468 else
2418 break; 2469 break;
2419 2470
2420 if (ANHE_at (he) <= minat) 2471 if (ANHE_at (he) <= minat)
… …
2428 2479
2429 heap [k] = he; 2480 heap [k] = he;
2430 ev_active (ANHE_w (he)) = k; 2481 ev_active (ANHE_w (he)) = k;
2431} 2482}
2432 2483
2433#else /* 4HEAP */ 2484#else /* not 4HEAP */
2434 2485
2435#define HEAP0 1 2486#define HEAP0 1
2436#define HPARENT(k) ((k) >> 1) 2487#define HPARENT(k) ((k) >> 1)
2437#define UPHEAP_DONE(p,k) (!(p)) 2488#define UPHEAP_DONE(p,k) (!(p))
2438 2489
… …
2824 2875
2825#endif 2876#endif
2826 2877
2827/*****************************************************************************/ 2878/*****************************************************************************/
2828 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
2829#if EV_USE_IOCP 2932#if EV_USE_IOCP
2830# include "ev_iocp.c" 2933# include "ev_iocp.c"
2831#endif 2934#endif
2832#if EV_USE_PORT 2935#if EV_USE_PORT
2833# include "ev_port.c" 2936# include "ev_port.c"
… …
3065 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 3168 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
3066#endif 3169#endif
3067#if EV_USE_SIGNALFD 3170#if EV_USE_SIGNALFD
3068 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 3171 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
3069#endif 3172#endif
3173#if EV_USE_TIMERFD
3174 timerfd = flags & EVFLAG_NOTIMERFD ? -1 : -2;
3175#endif
3070 3176
3071 if (!(flags & EVBACKEND_MASK)) 3177 if (!(flags & EVBACKEND_MASK))
3072 flags |= ev_recommended_backends (); 3178 flags |= ev_recommended_backends ();
3073 3179
3074#if EV_USE_IOCP 3180#if EV_USE_IOCP
… …
3145 } 3251 }
3146 3252
3147#if EV_USE_SIGNALFD 3253#if EV_USE_SIGNALFD
3148 if (ev_is_active (&sigfd_w)) 3254 if (ev_is_active (&sigfd_w))
3149 close (sigfd); 3255 close (sigfd);
3256#endif
3257
3258#if EV_USE_TIMERFD
3259 if (ev_is_active (&timerfd_w))
3260 close (timerfd);
3150#endif 3261#endif
3151 3262
3152#if EV_USE_INOTIFY 3263#if EV_USE_INOTIFY
3153 if (fs_fd >= 0) 3264 if (fs_fd >= 0)
3154 close (fs_fd); 3265 close (fs_fd);
… …
3247#endif 3358#endif
3248#if EV_USE_INOTIFY 3359#if EV_USE_INOTIFY
3249 infy_fork (EV_A); 3360 infy_fork (EV_A);
3250#endif 3361#endif
3251 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
3252#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE 3384 #if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
3253 if (ev_is_active (&pipe_w) && postfork != 2) 3385 if (ev_is_active (&pipe_w))
3254 { 3386 {
3255 /* 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 */
3256 3388
3257 ev_ref (EV_A); 3389 ev_ref (EV_A);
3258 ev_io_stop (EV_A_ &pipe_w); 3390 ev_io_stop (EV_A_ &pipe_w);
3259 3391
3260 if (evpipe [0] >= 0) 3392 if (evpipe [0] >= 0)
3261 EV_WIN32_CLOSE_FD (evpipe [0]); 3393 EV_WIN32_CLOSE_FD (evpipe [0]);
3262 3394
3263 evpipe_init (EV_A); 3395 evpipe_init (EV_A);
3264 /* iterate over everything, in case we missed something before */ 3396 /* iterate over everything, in case we missed something before */
3265 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM); 3397 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
3398 }
3399 #endif
3266 } 3400 }
3267#endif
3268 3401
3269 postfork = 0; 3402 postfork = 0;
3270} 3403}
3271 3404
3272#if EV_MULTIPLICITY 3405#if EV_MULTIPLICITY
… …
3542 { 3675 {
3543 ev_at (w) += w->repeat; 3676 ev_at (w) += w->repeat;
3544 if (ev_at (w) < mn_now) 3677 if (ev_at (w) < mn_now)
3545 ev_at (w) = mn_now; 3678 ev_at (w) = mn_now;
3546 3679
3547 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.)));
3548 3681
3549 ANHE_at_cache (timers [HEAP0]); 3682 ANHE_at_cache (timers [HEAP0]);
3550 downheap (timers, timercnt, HEAP0); 3683 downheap (timers, timercnt, HEAP0);
3551 } 3684 }
3552 else 3685 else
… …
3683 3816
3684 mn_now = get_clock (); 3817 mn_now = get_clock ();
3685 3818
3686 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 3819 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
3687 /* interpolate in the meantime */ 3820 /* interpolate in the meantime */
3688 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)))
3689 { 3822 {
3690 ev_rt_now = rtmn_diff + mn_now; 3823 ev_rt_now = rtmn_diff + mn_now;
3691 return; 3824 return;
3692 } 3825 }
3693 3826
… …
3707 ev_tstamp diff; 3840 ev_tstamp diff;
3708 rtmn_diff = ev_rt_now - mn_now; 3841 rtmn_diff = ev_rt_now - mn_now;
3709 3842
3710 diff = odiff - rtmn_diff; 3843 diff = odiff - rtmn_diff;
3711 3844
3712 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)))
3713 return; /* all is well */ 3846 return; /* all is well */
3714 3847
3715 ev_rt_now = ev_time (); 3848 ev_rt_now = ev_time ();
3716 mn_now = get_clock (); 3849 mn_now = get_clock ();
3717 now_floor = mn_now; 3850 now_floor = mn_now;
… …
3726 else 3859 else
3727#endif 3860#endif
3728 { 3861 {
3729 ev_rt_now = ev_time (); 3862 ev_rt_now = ev_time ();
3730 3863
3731 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)))
3732 { 3865 {
3733 /* 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 */
3734 timers_reschedule (EV_A_ ev_rt_now - mn_now); 3867 timers_reschedule (EV_A_ ev_rt_now - mn_now);
3735#if EV_PERIODIC_ENABLE 3868#if EV_PERIODIC_ENABLE
3736 periodics_reschedule (EV_A); 3869 periodics_reschedule (EV_A);
… …
3805 3938
3806 /* remember old timestamp for io_blocktime calculation */ 3939 /* remember old timestamp for io_blocktime calculation */
3807 ev_tstamp prev_mn_now = mn_now; 3940 ev_tstamp prev_mn_now = mn_now;
3808 3941
3809 /* update time to cancel out callback processing overhead */ 3942 /* update time to cancel out callback processing overhead */
3810 time_update (EV_A_ 1e100); 3943 time_update (EV_A_ EV_TS_CONST (EV_TSTAMP_HUGE));
3811 3944
3812 /* from now on, we want a pipe-wake-up */ 3945 /* from now on, we want a pipe-wake-up */
3813 pipe_write_wanted = 1; 3946 pipe_write_wanted = 1;
3814 3947
3815 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 */
3816 3949
3817 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)))
3818 { 3951 {
3819 waittime = MAX_BLOCKTIME; 3952 waittime = EV_TS_CONST (MAX_BLOCKTIME);
3820 3953
3821 if (timercnt) 3954 if (timercnt)
3822 { 3955 {
3823 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now; 3956 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now;
3824 if (waittime > to) waittime = to; 3957 if (waittime > to) waittime = to;
… …
3834 3967
3835 /* don't let timeouts decrease the waittime below timeout_blocktime */ 3968 /* don't let timeouts decrease the waittime below timeout_blocktime */
3836 if (ecb_expect_false (waittime < timeout_blocktime)) 3969 if (ecb_expect_false (waittime < timeout_blocktime))
3837 waittime = timeout_blocktime; 3970 waittime = timeout_blocktime;
3838 3971
3839 /* at this point, we NEED to wait, so we have to ensure */ 3972 /* now there are two more special cases left, either we have
3840 /* 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 */
3841 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.)
3842 waittime = backend_mintime; 3980 : backend_mintime;
3843 3981
3844 /* extra check because io_blocktime is commonly 0 */ 3982 /* extra check because io_blocktime is commonly 0 */
3845 if (ecb_expect_false (io_blocktime)) 3983 if (ecb_expect_false (io_blocktime))
3846 { 3984 {
3847 sleeptime = io_blocktime - (mn_now - prev_mn_now); 3985 sleeptime = io_blocktime - (mn_now - prev_mn_now);
3848 3986
3849 if (sleeptime > waittime - backend_mintime) 3987 if (sleeptime > waittime - backend_mintime)
3850 sleeptime = waittime - backend_mintime; 3988 sleeptime = waittime - backend_mintime;
3851 3989
3852 if (ecb_expect_true (sleeptime > 0.)) 3990 if (ecb_expect_true (sleeptime > EV_TS_CONST (0.)))
3853 { 3991 {
3854 ev_sleep (sleeptime); 3992 ev_sleep (sleeptime);
3855 waittime -= sleeptime; 3993 waittime -= sleeptime;
3856 } 3994 }
3857 } 3995 }
… …
3931} 4069}
3932 4070
3933void 4071void
3934ev_now_update (EV_P) EV_NOEXCEPT 4072ev_now_update (EV_P) EV_NOEXCEPT
3935{ 4073{
3936 time_update (EV_A_ 1e100); 4074 time_update (EV_A_ EV_TSTAMP_HUGE);
3937} 4075}
3938 4076
3939void 4077void
3940ev_suspend (EV_P) EV_NOEXCEPT 4078ev_suspend (EV_P) EV_NOEXCEPT
3941{ 4079{
… …
4172} 4310}
4173 4311
4174ev_tstamp 4312ev_tstamp
4175ev_timer_remaining (EV_P_ ev_timer *w) EV_NOEXCEPT 4313ev_timer_remaining (EV_P_ ev_timer *w) EV_NOEXCEPT
4176{ 4314{
4177 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.));
4178} 4316}
4179 4317
4180#if EV_PERIODIC_ENABLE 4318#if EV_PERIODIC_ENABLE
4181ecb_noinline 4319ecb_noinline
4182void 4320void
4183ev_periodic_start (EV_P_ ev_periodic *w) EV_NOEXCEPT 4321ev_periodic_start (EV_P_ ev_periodic *w) EV_NOEXCEPT
4184{ 4322{
4185 if (ecb_expect_false (ev_is_active (w))) 4323 if (ecb_expect_false (ev_is_active (w)))
4186 return; 4324 return;
4325
4326#if EV_USE_TIMERFD
4327 if (timerfd == -2)
4328 evtimerfd_init (EV_A);
4329#endif
4187 4330
4188 if (w->reschedule_cb) 4331 if (w->reschedule_cb)
4189 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 4332 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
4190 else if (w->interval) 4333 else if (w->interval)
4191 { 4334 {
… …
4933 ev_run (EV_A_ EVRUN_NOWAIT); 5076 ev_run (EV_A_ EVRUN_NOWAIT);
4934 } 5077 }
4935 } 5078 }
4936} 5079}
4937 5080
5081#if EV_FORK_ENABLE
4938static void 5082static void
4939embed_fork_cb (EV_P_ ev_fork *fork_w, int revents) 5083embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
4940{ 5084{
4941 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 5085 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
4942 5086
… …
4949 ev_run (EV_A_ EVRUN_NOWAIT); 5093 ev_run (EV_A_ EVRUN_NOWAIT);
4950 } 5094 }
4951 5095
4952 ev_embed_start (EV_A_ w); 5096 ev_embed_start (EV_A_ w);
4953} 5097}
5098#endif
4954 5099
4955#if 0 5100#if 0
4956static void 5101static void
4957embed_idle_cb (EV_P_ ev_idle *idle, int revents) 5102embed_idle_cb (EV_P_ ev_idle *idle, int revents)
4958{ 5103{
… …
4979 5124
4980 ev_prepare_init (&w->prepare, embed_prepare_cb); 5125 ev_prepare_init (&w->prepare, embed_prepare_cb);
4981 ev_set_priority (&w->prepare, EV_MINPRI); 5126 ev_set_priority (&w->prepare, EV_MINPRI);
4982 ev_prepare_start (EV_A_ &w->prepare); 5127 ev_prepare_start (EV_A_ &w->prepare);
4983 5128
5129#if EV_FORK_ENABLE
4984 ev_fork_init (&w->fork, embed_fork_cb); 5130 ev_fork_init (&w->fork, embed_fork_cb);
4985 ev_fork_start (EV_A_ &w->fork); 5131 ev_fork_start (EV_A_ &w->fork);
5132#endif
4986 5133
4987 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 5134 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
4988 5135
4989 ev_start (EV_A_ (W)w, 1); 5136 ev_start (EV_A_ (W)w, 1);
4990 5137
… …
5000 5147
5001 EV_FREQUENT_CHECK; 5148 EV_FREQUENT_CHECK;
5002 5149
5003 ev_io_stop (EV_A_ &w->io); 5150 ev_io_stop (EV_A_ &w->io);
5004 ev_prepare_stop (EV_A_ &w->prepare); 5151 ev_prepare_stop (EV_A_ &w->prepare);
5152#if EV_FORK_ENABLE
5005 ev_fork_stop (EV_A_ &w->fork); 5153 ev_fork_stop (EV_A_ &w->fork);
5154#endif
5006 5155
5007 ev_stop (EV_A_ (W)w); 5156 ev_stop (EV_A_ (W)w);
5008 5157
5009 EV_FREQUENT_CHECK; 5158 EV_FREQUENT_CHECK;
5010} 5159}

Diff Legend

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