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

Comparing libev/ev.c (file contents):
Revision 1.507 by root, Thu Jul 11 08:22:54 2019 UTC vs.
Revision 1.510 by root, Wed Aug 28 09:45:49 2019 UTC

… …
544#define EV_TSTAMP_HUGE \ 544#define EV_TSTAMP_HUGE \
545 (sizeof (time_t) >= 8 ? 10000000000000. \ 545 (sizeof (time_t) >= 8 ? 10000000000000. \
546 : 0 < (time_t)4294967295 ? 4294967295. \ 546 : 0 < (time_t)4294967295 ? 4294967295. \
547 : 2147483647.) \ 547 : 2147483647.) \
548 548
549#ifndef EV_TS_CONST
550# define EV_TS_CONST(nv) nv
549#define EV_TS_TO_MS(a) a * 1e3 + 0.9999 551# define EV_TS_TO_MSEC(a) a * 1e3 + 0.9999
550#define EV_TS_FROM_USEC(us) us * 1e-6 552# 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) 553# 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) 554# 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) 555# 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) 556# define EV_TS_GET(ts) ((ts).tv_sec + (ts).tv_nsec * 1e-9)
557#endif
555 558
556/* the following is ecb.h embedded into libev - use update_ev_c to update from an external copy */ 559/* the following is ecb.h embedded into libev - use update_ev_c to update from an external copy */
557/* ECB.H BEGIN */ 560/* ECB.H BEGIN */
558/* 561/*
559 * libecb - http://software.schmorp.de/pkg/libecb 562 * libecb - http://software.schmorp.de/pkg/libecb
… …
1965 static struct ev_loop default_loop_struct; 1968 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 */ 1969 EV_API_DECL struct ev_loop *ev_default_loop_ptr = 0; /* needs to be initialised to make it a definition despite extern */
1967 1970
1968#else 1971#else
1969 1972
1970 EV_API_DECL ev_tstamp ev_rt_now = 0; /* needs to be initialised to make it a definition despite extern */ 1973 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; 1974 #define VAR(name,decl) static decl;
1972 #include "ev_vars.h" 1975 #include "ev_vars.h"
1973 #undef VAR 1976 #undef VAR
1974 1977
1975 static int ev_default_loop_ptr; 1978 static int ev_default_loop_ptr;
… …
2001 clock_gettime (CLOCK_REALTIME, &ts); 2004 clock_gettime (CLOCK_REALTIME, &ts);
2002 return EV_TS_GET (ts); 2005 return EV_TS_GET (ts);
2003 } 2006 }
2004#endif 2007#endif
2005 2008
2009 {
2006 struct timeval tv; 2010 struct timeval tv;
2007 gettimeofday (&tv, 0); 2011 gettimeofday (&tv, 0);
2008 return EV_TV_GET (tv); 2012 return EV_TV_GET (tv);
2013 }
2009} 2014}
2010#endif 2015#endif
2011 2016
2012inline_size ev_tstamp 2017inline_size ev_tstamp
2013get_clock (void) 2018get_clock (void)
… …
2033#endif 2038#endif
2034 2039
2035void 2040void
2036ev_sleep (ev_tstamp delay) EV_NOEXCEPT 2041ev_sleep (ev_tstamp delay) EV_NOEXCEPT
2037{ 2042{
2038 if (delay > 0.) 2043 if (delay > EV_TS_CONST (0.))
2039 { 2044 {
2040#if EV_USE_NANOSLEEP 2045#if EV_USE_NANOSLEEP
2041 struct timespec ts; 2046 struct timespec ts;
2042 2047
2043 EV_TS_SET (ts, delay); 2048 EV_TS_SET (ts, delay);
2044 nanosleep (&ts, 0); 2049 nanosleep (&ts, 0);
2045#elif defined _WIN32 2050#elif defined _WIN32
2046 /* maybe this should round up, as ms is very low resolution */ 2051 /* maybe this should round up, as ms is very low resolution */
2047 /* compared to select (µs) or nanosleep (ns) */ 2052 /* compared to select (µs) or nanosleep (ns) */
2048 Sleep ((unsigned long)(EV_TS_TO_MS (delay))); 2053 Sleep ((unsigned long)(EV_TS_TO_MSEC (delay)));
2049#else 2054#else
2050 struct timeval tv; 2055 struct timeval tv;
2051 2056
2052 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 2057 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
2053 /* something not guaranteed by newer posix versions, but guaranteed */ 2058 /* something not guaranteed by newer posix versions, but guaranteed */
… …
3544 { 3549 {
3545 ev_at (w) += w->repeat; 3550 ev_at (w) += w->repeat;
3546 if (ev_at (w) < mn_now) 3551 if (ev_at (w) < mn_now)
3547 ev_at (w) = mn_now; 3552 ev_at (w) = mn_now;
3548 3553
3549 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 3554 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > EV_TS_CONST (0.)));
3550 3555
3551 ANHE_at_cache (timers [HEAP0]); 3556 ANHE_at_cache (timers [HEAP0]);
3552 downheap (timers, timercnt, HEAP0); 3557 downheap (timers, timercnt, HEAP0);
3553 } 3558 }
3554 else 3559 else
… …
3685 3690
3686 mn_now = get_clock (); 3691 mn_now = get_clock ();
3687 3692
3688 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 3693 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
3689 /* interpolate in the meantime */ 3694 /* interpolate in the meantime */
3690 if (ecb_expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 3695 if (ecb_expect_true (mn_now - now_floor < EV_TS_CONST (MIN_TIMEJUMP * .5)))
3691 { 3696 {
3692 ev_rt_now = rtmn_diff + mn_now; 3697 ev_rt_now = rtmn_diff + mn_now;
3693 return; 3698 return;
3694 } 3699 }
3695 3700
… …
3709 ev_tstamp diff; 3714 ev_tstamp diff;
3710 rtmn_diff = ev_rt_now - mn_now; 3715 rtmn_diff = ev_rt_now - mn_now;
3711 3716
3712 diff = odiff - rtmn_diff; 3717 diff = odiff - rtmn_diff;
3713 3718
3714 if (ecb_expect_true ((diff < 0. ? -diff : diff) < MIN_TIMEJUMP)) 3719 if (ecb_expect_true ((diff < EV_TS_CONST (0.) ? -diff : diff) < EV_TS_CONST (MIN_TIMEJUMP)))
3715 return; /* all is well */ 3720 return; /* all is well */
3716 3721
3717 ev_rt_now = ev_time (); 3722 ev_rt_now = ev_time ();
3718 mn_now = get_clock (); 3723 mn_now = get_clock ();
3719 now_floor = mn_now; 3724 now_floor = mn_now;
… …
3728 else 3733 else
3729#endif 3734#endif
3730 { 3735 {
3731 ev_rt_now = ev_time (); 3736 ev_rt_now = ev_time ();
3732 3737
3733 if (ecb_expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 3738 if (ecb_expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + EV_TS_CONST (MIN_TIMEJUMP)))
3734 { 3739 {
3735 /* adjust timers. this is easy, as the offset is the same for all of them */ 3740 /* 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); 3741 timers_reschedule (EV_A_ ev_rt_now - mn_now);
3737#if EV_PERIODIC_ENABLE 3742#if EV_PERIODIC_ENABLE
3738 periodics_reschedule (EV_A); 3743 periodics_reschedule (EV_A);
… …
3807 3812
3808 /* remember old timestamp for io_blocktime calculation */ 3813 /* remember old timestamp for io_blocktime calculation */
3809 ev_tstamp prev_mn_now = mn_now; 3814 ev_tstamp prev_mn_now = mn_now;
3810 3815
3811 /* update time to cancel out callback processing overhead */ 3816 /* update time to cancel out callback processing overhead */
3812 time_update (EV_A_ 1e100); 3817 time_update (EV_A_ EV_TS_CONST (EV_TSTAMP_HUGE));
3813 3818
3814 /* from now on, we want a pipe-wake-up */ 3819 /* from now on, we want a pipe-wake-up */
3815 pipe_write_wanted = 1; 3820 pipe_write_wanted = 1;
3816 3821
3817 ECB_MEMORY_FENCE; /* make sure pipe_write_wanted is visible before we check for potential skips */ 3822 ECB_MEMORY_FENCE; /* make sure pipe_write_wanted is visible before we check for potential skips */
3818 3823
3819 if (ecb_expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt || pipe_write_skipped))) 3824 if (ecb_expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt || pipe_write_skipped)))
3820 { 3825 {
3821 waittime = MAX_BLOCKTIME; 3826 waittime = EV_TS_CONST (MAX_BLOCKTIME);
3822 3827
3823 if (timercnt) 3828 if (timercnt)
3824 { 3829 {
3825 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now; 3830 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now;
3826 if (waittime > to) waittime = to; 3831 if (waittime > to) waittime = to;
… …
3849 sleeptime = io_blocktime - (mn_now - prev_mn_now); 3854 sleeptime = io_blocktime - (mn_now - prev_mn_now);
3850 3855
3851 if (sleeptime > waittime - backend_mintime) 3856 if (sleeptime > waittime - backend_mintime)
3852 sleeptime = waittime - backend_mintime; 3857 sleeptime = waittime - backend_mintime;
3853 3858
3854 if (ecb_expect_true (sleeptime > 0.)) 3859 if (ecb_expect_true (sleeptime > EV_TS_CONST (0.)))
3855 { 3860 {
3856 ev_sleep (sleeptime); 3861 ev_sleep (sleeptime);
3857 waittime -= sleeptime; 3862 waittime -= sleeptime;
3858 } 3863 }
3859 } 3864 }
… …
3933} 3938}
3934 3939
3935void 3940void
3936ev_now_update (EV_P) EV_NOEXCEPT 3941ev_now_update (EV_P) EV_NOEXCEPT
3937{ 3942{
3938 time_update (EV_A_ 1e100); 3943 time_update (EV_A_ EV_TSTAMP_HUGE);
3939} 3944}
3940 3945
3941void 3946void
3942ev_suspend (EV_P) EV_NOEXCEPT 3947ev_suspend (EV_P) EV_NOEXCEPT
3943{ 3948{
… …
4174} 4179}
4175 4180
4176ev_tstamp 4181ev_tstamp
4177ev_timer_remaining (EV_P_ ev_timer *w) EV_NOEXCEPT 4182ev_timer_remaining (EV_P_ ev_timer *w) EV_NOEXCEPT
4178{ 4183{
4179 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.); 4184 return ev_at (w) - (ev_is_active (w) ? mn_now : EV_TS_CONST (0.));
4180} 4185}
4181 4186
4182#if EV_PERIODIC_ENABLE 4187#if EV_PERIODIC_ENABLE
4183ecb_noinline 4188ecb_noinline
4184void 4189void

Diff Legend

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