X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Fmtime.c;h=80ed1169ee3f3eb39967d1be350f1ee592cd8484;hb=532b014ad9c53a3ef32a74373fdb895726bde516;hp=dfd6d73775a11bb8425e5c791753477fe4372bf9;hpb=48d8e6bf030cbb4f64d8dafcd8587489c088bbf7;p=vlc diff --git a/src/misc/mtime.c b/src/misc/mtime.c index dfd6d73775..80ed1169ee 100644 --- a/src/misc/mtime.c +++ b/src/misc/mtime.c @@ -33,7 +33,7 @@ # include "config.h" #endif -#include +#include #include /* clock_gettime(), clock_nanosleep() */ #include @@ -52,14 +52,16 @@ # include #endif -#if defined( UNDER_CE ) -# include -#endif - #if defined(HAVE_SYS_TIME_H) # include #endif +#if defined(__APPLE__) && !defined(__powerpc__) && !defined(__ppc__) && !defined(__ppc64__) +#define USE_APPLE_MACH 1 +# include +# include +#endif + #if !defined(HAVE_STRUCT_TIMESPEC) struct timespec { @@ -78,9 +80,9 @@ int nanosleep(struct timespec *, struct timespec *); # if (_POSIX_CLOCK_SELECTION < 0) /* - * We cannot use the monotonic clock is clock selection is not available, + * We cannot use the monotonic clock if clock selection is not available, * as it would screw vlc_cond_timedwait() completely. Instead, we have to - * stick to the realtime clock. Nevermind it screws everything when ntpdate + * stick to the realtime clock. Nevermind it screws everything up when ntpdate * warps the wall clock. */ # undef CLOCK_MONOTONIC @@ -102,7 +104,7 @@ int nanosleep(struct timespec *, struct timespec *); */ char *mstrtime( char *psz_buffer, mtime_t date ) { - static mtime_t ll1000 = 1000, ll60 = 60, ll24 = 24; + static const mtime_t ll1000 = 1000, ll60 = 60, ll24 = 24; snprintf( psz_buffer, MSTRTIME_MAX_SIZE, "%02d:%02d:%02d-%03d.%03d", (int) (date / (ll1000 * ll1000 * ll60 * ll60) % ll24), @@ -123,26 +125,42 @@ char *mstrtime( char *psz_buffer, mtime_t date ) * \param psz_buffer should be a buffer at least MSTRTIME_MAX_SIZE characters * \return psz_buffer is returned so this can be used as printf parameter. */ -char *secstotimestr( char *psz_buffer, int i_seconds ) +char *secstotimestr( char *psz_buffer, int32_t i_seconds ) { - int i_hours, i_mins; - i_mins = i_seconds / 60; - i_hours = i_mins / 60 ; - if( i_hours ) + if( unlikely(i_seconds < 0) ) { - snprintf( psz_buffer, MSTRTIME_MAX_SIZE, "%d:%2.2d:%2.2d", - (int) i_hours, - (int) (i_mins % 60), - (int) (i_seconds % 60) ); + secstotimestr( psz_buffer + 1, -i_seconds ); + *psz_buffer = '-'; + return psz_buffer; } + + div_t d; + + d = div( i_seconds, 60 ); + i_seconds = d.rem; + d = div( d.quot, 60 ); + + if( d.quot ) + snprintf( psz_buffer, MSTRTIME_MAX_SIZE, "%u:%02u:%02u", + d.quot, d.rem, i_seconds ); else - { - snprintf( psz_buffer, MSTRTIME_MAX_SIZE, "%2.2d:%2.2d", - (int) i_mins , - (int) (i_seconds % 60) ); - } - return( psz_buffer ); + snprintf( psz_buffer, MSTRTIME_MAX_SIZE, "%02u:%02u", + d.rem, i_seconds ); + return psz_buffer; +} + +#if defined (HAVE_CLOCK_NANOSLEEP) +static unsigned prec = 0; + +static void mprec_once( void ) +{ + struct timespec ts; + if( clock_getres( CLOCK_MONOTONIC, &ts )) + clock_getres( CLOCK_REALTIME, &ts ); + + prec = ts.tv_nsec / 1000; } +#endif /** * Return a value that is no bigger than the clock precision @@ -151,17 +169,22 @@ char *secstotimestr( char *psz_buffer, int i_seconds ) static inline unsigned mprec( void ) { #if defined (HAVE_CLOCK_NANOSLEEP) - struct timespec ts; - if( clock_getres( CLOCK_MONOTONIC, &ts )) - clock_getres( CLOCK_REALTIME, &ts ); - - return ts.tv_nsec / 1000; -#endif + static pthread_once_t once = PTHREAD_ONCE_INIT; + pthread_once( &once, mprec_once ); + return prec; +#else return 0; +#endif } -static unsigned prec = 0; -static volatile mtime_t cached_time = 0; +#ifdef USE_APPLE_MACH +static mach_timebase_info_data_t mtime_timebase_info; +static pthread_once_t mtime_timebase_info_once = PTHREAD_ONCE_INIT; +static void mtime_init_timebase(void) +{ + mach_timebase_info(&mtime_timebase_info); +} +#endif /** * Return high precision date @@ -188,112 +211,30 @@ mtime_t mdate( void ) #elif defined( HAVE_KERNEL_OS_H ) res = real_time_clock_usecs(); +#elif defined( USE_APPLE_MACH ) + pthread_once(&mtime_timebase_info_once, mtime_init_timebase); + uint64_t date = mach_absolute_time(); + mach_timebase_info_data_t tb = mtime_timebase_info; + + /* Get the ssystem dependent factor. Switch to double to prevent overflow */ + double factor = (double) tb.numer / (double) tb.denom; + /* Convert to microseconds */ + double d = (double) date * factor / 1000; + res = d; + #elif defined( WIN32 ) || defined( UNDER_CE ) /* We don't need the real date, just the value of a high precision timer */ - static mtime_t freq = I64C(-1); - - if( freq == I64C(-1) ) - { - /* Extract from the Tcl source code: - * (http://www.cs.man.ac.uk/fellowsd-bin/TIP/7.html) - * - * Some hardware abstraction layers use the CPU clock - * in place of the real-time clock as a performance counter - * reference. This results in: - * - inconsistent results among the processors on - * multi-processor systems. - * - unpredictable changes in performance counter frequency - * on "gearshift" processors such as Transmeta and - * SpeedStep. - * There seems to be no way to test whether the performance - * counter is reliable, but a useful heuristic is that - * if its frequency is 1.193182 MHz or 3.579545 MHz, it's - * derived from a colorburst crystal and is therefore - * the RTC rather than the TSC. If it's anything else, we - * presume that the performance counter is unreliable. - */ - LARGE_INTEGER buf; - - freq = ( QueryPerformanceFrequency( &buf ) && - (buf.QuadPart == I64C(1193182) || buf.QuadPart == I64C(3579545) ) ) - ? buf.QuadPart : 0; - -#if defined( WIN32 ) - /* on windows 2000, XP and Vista detect if there are two - cores there - that makes QueryPerformanceFrequency in - any case not trustable? - (may also be true, for single cores with adaptive - CPU frequency and active power management?) - */ - HINSTANCE h_Kernel32 = LoadLibrary(_T("kernel32.dll")); - if(h_Kernel32) - { - void WINAPI (*pf_GetSystemInfo)(LPSYSTEM_INFO); - pf_GetSystemInfo = (void WINAPI (*)(LPSYSTEM_INFO)) - GetProcAddress(h_Kernel32, _T("GetSystemInfo")); - if(pf_GetSystemInfo) - { - SYSTEM_INFO system_info; - pf_GetSystemInfo(&system_info); - if(system_info.dwNumberOfProcessors > 1) - freq = 0; - } - FreeLibrary(h_Kernel32); - } -#endif - } + LARGE_INTEGER counter, freq; + if (!QueryPerformanceCounter (&counter) + || !QueryPerformanceFrequency (&freq)) + abort(); - if( freq != 0 ) - { - LARGE_INTEGER counter; - QueryPerformanceCounter (&counter); + /* Convert to from (1/freq) to microsecond resolution */ + /* We need to split the division to avoid 63-bits overflow */ + lldiv_t d = lldiv (counter.QuadPart, freq.QuadPart); - /* Convert to from (1/freq) to microsecond resolution */ - /* We need to split the division to avoid 63-bits overflow */ - lldiv_t d = lldiv (counter.QuadPart, freq); + res = (d.quot * 1000000) + ((d.rem * 1000000) / freq.QuadPart); - res = (d.quot * 1000000) + ((d.rem * 1000000) / freq); - } - else - { - /* Fallback on timeGetTime() which has a milisecond resolution - * (actually, best case is about 5 ms resolution) - * timeGetTime() only returns a DWORD thus will wrap after - * about 49.7 days so we try to detect the wrapping. */ - - static CRITICAL_SECTION date_lock; - static mtime_t i_previous_time = I64C(-1); - static int i_wrap_counts = -1; - - if( i_wrap_counts == -1 ) - { - /* Initialization */ -#if defined( WIN32 ) - i_previous_time = I64C(1000) * timeGetTime(); -#else - i_previous_time = I64C(1000) * GetTickCount(); -#endif - InitializeCriticalSection( &date_lock ); - i_wrap_counts = 0; - } - - EnterCriticalSection( &date_lock ); -#if defined( WIN32 ) - res = I64C(1000) * - (i_wrap_counts * I64C(0x100000000) + timeGetTime()); -#else - res = I64C(1000) * - (i_wrap_counts * I64C(0x100000000) + GetTickCount()); -#endif - if( i_previous_time > res ) - { - /* Counter wrapped */ - i_wrap_counts++; - res += I64C(0x100000000) * 1000; - } - i_previous_time = res; - LeaveCriticalSection( &date_lock ); - } #else struct timeval tv_date; @@ -302,9 +243,10 @@ mtime_t mdate( void ) res = (mtime_t) tv_date.tv_sec * 1000000 + (mtime_t) tv_date.tv_usec; #endif - return cached_time = res; + return res; } +#undef mwait /** * Wait for a date * @@ -315,15 +257,11 @@ mtime_t mdate( void ) */ void mwait( mtime_t date ) { - if( prec == 0 ) - prec = mprec(); - /* If the deadline is already elapsed, or within the clock precision, - * do not even bother the clock. */ - if( ( date - cached_time ) < (mtime_t)prec ) // OK: mtime_t is signed - return; + * do not even bother the system timer. */ + date -= mprec(); -#if 0 && defined (HAVE_CLOCK_NANOSLEEP) +#if defined (HAVE_CLOCK_NANOSLEEP) lldiv_t d = lldiv( date, 1000000 ); struct timespec ts = { d.quot, d.rem * 1000 }; @@ -335,8 +273,20 @@ void mwait( mtime_t date ) ts.tv_sec = d.quot; ts.tv_nsec = d.rem * 1000; while( clock_nanosleep( CLOCK_REALTIME, 0, &ts, NULL ) == EINTR ); } -#else +#elif defined (WIN32) + mtime_t i_total; + + while( (i_total = (date - mdate())) > 0 ) + { + const mtime_t i_sleep = i_total / 1000; + DWORD i_delay = (i_sleep > 0x7fffffff) ? 0x7fffffff : i_sleep; + vlc_testcancel(); + SleepEx( i_delay, TRUE ); + } + vlc_testcancel(); + +#else mtime_t delay = date - mdate(); if( delay > 0 ) msleep( delay ); @@ -344,16 +294,17 @@ void mwait( mtime_t date ) #endif } + +#include "libvlc.h" /* vlc_backtrace() */ +#undef msleep + /** - * More precise sleep() + * Portable usleep(). Cancellation point. * - * Portable usleep() function. * \param delay the amount of time to sleep */ void msleep( mtime_t delay ) { - mtime_t earlier = cached_time; - #if defined( HAVE_CLOCK_NANOSLEEP ) lldiv_t d = lldiv( delay, 1000000 ); struct timespec ts = { d.quot, d.rem * 1000 }; @@ -370,7 +321,7 @@ void msleep( mtime_t delay ) snooze( delay ); #elif defined( WIN32 ) || defined( UNDER_CE ) - Sleep( (DWORD) (delay / 1000) ); + mwait (mdate () + delay); #elif defined( HAVE_NANOSLEEP ) struct timespec ts_delay; @@ -380,6 +331,12 @@ void msleep( mtime_t delay ) while( nanosleep( &ts_delay, &ts_delay ) && ( errno == EINTR ) ); +#elif defined (USE_APPLE_MACH) + /* The version that should be used, if it was cancelable */ + pthread_once(&mtime_timebase_info_once, mtime_init_timebase); + uint64_t mach_time = delay * 1000 * mtime_timebase_info.denom / mtime_timebase_info.numer; + mach_wait_until(mach_time + mach_absolute_time()); + #else struct timeval tv_delay; @@ -390,10 +347,6 @@ void msleep( mtime_t delay ) * or clock_nanosleep() if this is an issue. */ select( 0, NULL, NULL, NULL, &tv_delay ); #endif - - earlier += delay; - if( cached_time < earlier ) - cached_time = earlier; } /* @@ -426,6 +379,8 @@ void date_Init( date_t *p_date, uint32_t i_divider_n, uint32_t i_divider_d ) void date_Change( date_t *p_date, uint32_t i_divider_n, uint32_t i_divider_d ) { + /* change time scale of remainder */ + p_date->i_remainder = p_date->i_remainder * i_divider_n / p_date->i_divider_num; p_date->i_divider_num = i_divider_n; p_date->i_divider_den = i_divider_d; } @@ -474,20 +429,48 @@ void date_Move( date_t *p_date, mtime_t i_difference ) */ mtime_t date_Increment( date_t *p_date, uint32_t i_nb_samples ) { - mtime_t i_dividend = (mtime_t)i_nb_samples * 1000000; - p_date->date += i_dividend / p_date->i_divider_num * p_date->i_divider_den; + mtime_t i_dividend = (mtime_t)i_nb_samples * 1000000 * p_date->i_divider_den; + p_date->date += i_dividend / p_date->i_divider_num; p_date->i_remainder += (int)(i_dividend % p_date->i_divider_num); if( p_date->i_remainder >= p_date->i_divider_num ) { /* This is Bresenham algorithm. */ - p_date->date += p_date->i_divider_den; + assert( p_date->i_remainder < 2*p_date->i_divider_num); + p_date->date += 1; p_date->i_remainder -= p_date->i_divider_num; } return p_date->date; } +/** + * Decrement the date and return the result, taking into account + * rounding errors. + * + * \param date to decrement + * \param decrementation in number of samples + * \return date value + */ +mtime_t date_Decrement( date_t *p_date, uint32_t i_nb_samples ) +{ + mtime_t i_dividend = (mtime_t)i_nb_samples * 1000000 * p_date->i_divider_den; + p_date->date -= i_dividend / p_date->i_divider_num; + unsigned i_rem_adjust = i_dividend % p_date->i_divider_num; + + if( p_date->i_remainder < i_rem_adjust ) + { + /* This is Bresenham algorithm. */ + assert( p_date->i_remainder > -p_date->i_divider_num); + p_date->date -= 1; + p_date->i_remainder += p_date->i_divider_num; + } + + p_date->i_remainder -= i_rem_adjust; + + return p_date->date; +} + #ifndef HAVE_GETTIMEOFDAY #ifdef WIN32