# include <mmsystem.h>
#endif
-#if defined( UNDER_CE )
-# include <windows.h>
-#endif
-
#if defined(HAVE_SYS_TIME_H)
# include <sys/time.h>
#endif
+#ifdef __APPLE__
+# include <mach/mach.h>
+# include <mach/mach_time.h>
+#endif
+
#if !defined(HAVE_STRUCT_TIMESPEC)
struct timespec
{
#endif
}
+#ifdef __APPLE__
+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
*
#elif defined( HAVE_KERNEL_OS_H )
res = real_time_clock_usecs();
+#elif defined( __APPLE__ )
+ pthread_once(&mtime_timebase_info_once, mtime_init_timebase);
+ uint64_t date = mach_absolute_time();
+
+ /* Convert to nanoseconds */
+ date *= mtime_timebase_info.numer;
+ date /= mtime_timebase_info.denom;
+
+ /* Convert to microseconds */
+ res = date / 1000;
#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 = INT64_C(-1);
}
else
{
- /* Fallback on timeGetTime() which has a milisecond resolution
+ /* Fallback on timeGetTime() which has a millisecond 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. */
i_previous_time = res;
LeaveCriticalSection( &date_lock );
}
+#elif defined( __APPLE__ ) /* The version that should be used, if it was cancelable */
+ pthread_once(&mtime_timebase_info_once, mtime_init_timebase);
+ uint64_t mach_time = date * 1000 * mtime_timebase_info.denom / mtime_timebase_info.numer;
+ mach_wait_until(mach_time);
+
#else
struct timeval tv_date;
return res;
}
+#undef mwait
/**
* Wait for a 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 );
#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 )
snooze( delay );
#elif defined( WIN32 ) || defined( UNDER_CE )
- for (delay /= 1000; delay > 0x7fffffff; delay -= 0x7fffffff)
- Sleep (0x7fffffff);
- Sleep (delay);
+ mwait (mdate () + delay);
#elif defined( HAVE_NANOSLEEP )
struct timespec ts_delay;
while( nanosleep( &ts_delay, &ts_delay ) && ( errno == EINTR ) );
+#elif defined( __APPLE__ ) /* 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;