Changeset 2f7f70b37fe512a140cdeb6237ca242942fd8448

Timestamp:

11/25/06 16:38:10 (2 years ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1164469090 +0000

git-parent:

[61d872f559ebffc1a4e0768a77d3631523c60d71]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1164469090 +0000

Message:

Factorize mwait() code,
except for POSIX timers case, which is currently the only natively absolute
timers implementation on LibVLC.

Files:

• src/misc/mtime.c (modified) (7 diffs)

src/misc/mtime.c

@@ -116 +116 @@
-mtime_t mdate( void )
-{
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return( real_time_clock_usecs() );
-
@@ -189 +202 @@
-        return usec_time;
-    }
-
-#elif defined (HAVE_CLOCK_NANOSLEEP)
-    struct timespec ts;
-
-# if (_POSIX_MONOTONIC_CLOCK - 0 >= 0)
-    /* Try to use POSIX monotonic clock if available */
-    if( clock_gettime( CLOCK_MONOTONIC, &ts ) )
-# endif
-        /* Run-time fallback to real-time clock (always available) */
-        (void)clock_gettime( CLOCK_REALTIME, &ts );
-
-    return ((mtime_t)ts.tv_sec * (mtime_t)1000000)
-           + (mtime_t)(ts.tv_nsec / 1000);
-#else
-    struct timeval tv_date;
@@ -221 +221 @@
-void mwait( mtime_t date )
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    lldiv_t d = lldiv( date, 1000000 );
-    struct timespec ts = { d.quot, d.rem * 1000 };
@@ -252 +231 @@
-#else
-
+    mtime_t usec_time, delay;
+
+    usec_time = mdate();
+    delay = date - usec_time;
+    if( delay > 0 )
+        msleep( delay );
+
+
-    struct timeval tv_date;
-    mtime_t        delay;          /* delay in msec, signed to detect errors */
@@ -276 +263 @@
-void msleep( mtime_t delay )
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    lldiv_t d = lldiv( delay, 1000000 );
-    struct timespec ts = { d.quot, d.rem * 1000 };
@@ -296 +271 @@
-# endif
-        clock_nanosleep( CLOCK_REALTIME, 0, &ts, NULL );
+
+#elif defined( HAVE_KERNEL_OS_H )
+    snooze( delay );
+
+#elif defined( PTH_INIT_IN_PTH_H )
+    pth_usleep( delay );
+
+#elif defined( ST_INIT_IN_ST_H )
+    st_usleep( delay );
+
+#elif defined( WIN32 ) || defined( UNDER_CE )
+    Sleep( (int) (delay / 1000) );
-
-#elif defined( HAVE_NANOSLEEP )
@@ -316 +303 @@
-     * can be ignored. */
-    select( 0, NULL, NULL, NULL, &tv_delay );
-
-#endif
-}