* include/mtime.h :

[vlc] / src / misc / mtime.c

diff --git a/src/misc/mtime.c b/src/misc/mtime.c
index 93c1b8b82a2e6e6d915aeba43a749cd7b80887d2..9b27f39cc024de857b7041b2f4bae69d808ef0ca 100644 (file)
--- a/src/misc/mtime.c
+++ b/src/misc/mtime.c
@@ -1,52 +1,51 @@
-/*******************************************************************************
+/******************************************************************************
  * mtime.c: high rezolution time management functions
  * (c)1998 VideoLAN
- *******************************************************************************
+ ******************************************************************************
  * Functions are prototyped in mtime.h.
- *******************************************************************************
+ ******************************************************************************
  * to-do list:
  *  see if using Linux real-time extensions is possible and profitable
- *******************************************************************************/
+ ******************************************************************************/
 
-/*******************************************************************************
+/******************************************************************************
  * Preamble
- *******************************************************************************/
-
+ ******************************************************************************/
 #include <stdio.h>
 #include <sys/time.h>
 
 #include "common.h"
 #include "mtime.h"
 
-/*******************************************************************************
+/******************************************************************************
  * mstrtime: return a date in a readable format
- *******************************************************************************
+ ******************************************************************************
  * This functions is provided for any interface function which need to print a
  * date. psz_buffer should be a buffer long enough to store the formatted
- * date. 
- *******************************************************************************/
+ * date.
+ ******************************************************************************/
 char *mstrtime( char *psz_buffer, mtime_t date )
 {
-    sprintf( psz_buffer, "%02d:%02d:%02d-%03d.%03d", 
-             (int) (date / (1000UL * 1000UL * 60UL * 60UL) % 24UL), 
-             (int) (date / (1000UL * 1000UL * 60UL) % 60UL),
-             (int) (date / (1000UL * 1000UL) % 60UL),
-             (int) (date / 1000UL % 1000UL),
-             (int) (date % 1000UL) );
+    sprintf( psz_buffer, "%02d:%02d:%02d-%03d.%03d",
+             (int) (date / (1000LL * 1000LL * 60LL * 60LL) % 24LL),
+             (int) (date / (1000LL * 1000LL * 60LL) % 60LL),
+             (int) (date / (1000LL * 1000LL) % 60LL),
+             (int) (date / 1000LL % 1000LL),
+             (int) (date % 1000LL) );
     return( psz_buffer );
 }
 
-/*******************************************************************************
+/******************************************************************************
  * mdate: return high precision date (inline function)
- *******************************************************************************
+ ******************************************************************************
  * Uses the gettimeofday() function when possible (1 MHz resolution) or the
  * ftime() function (1 kHz resolution).
- *******************************************************************************
+ ******************************************************************************
  * to-do list: ??
  *  implement the function when gettimeofday is not available
  *  this function should be decalred as inline
- *******************************************************************************/
-mtime_t mdate( void ) 
+ ******************************************************************************/
+mtime_t mdate( void )
 {
     struct timeval tv_date;
 
@@ -57,48 +56,48 @@ mtime_t mdate( void )
     return( (mtime_t) tv_date.tv_sec * 1000000 + (mtime_t) tv_date.tv_usec );
 }
 
-/*******************************************************************************
- * mwait: wait for a date (inline function)                            
- *******************************************************************************
+/******************************************************************************
+ * mwait: wait for a date (inline function)
+ ******************************************************************************
  * This function uses select() and an system date function to wake up at a
  * precise date. It should be used for process synchronization. If current date
  * is posterior to wished date, the function returns immediately.
- *******************************************************************************
+ ******************************************************************************
  * to-do list:
  *  implement the function when gettimeofday is not available
  *  optimize delay calculation
  *  ?? declare as inline
- *******************************************************************************/
+ ******************************************************************************/
 void mwait( mtime_t date )
 {
     struct timeval tv_date, tv_delay;
-    s64            delay;            /* delay in msec, signed to detect errors */
+    mtime_t        delay;           /* delay in msec, signed to detect errors */
 
     /* see mdate() about gettimeofday() possible errors */
     gettimeofday( &tv_date, NULL );
 
     /* calculate delay and check if current date is before wished date */
     delay = date - (mtime_t) tv_date.tv_sec * 1000000 - (mtime_t) tv_date.tv_usec;
-    if( delay < 0 )                       /* wished date is already passed */
+    if( delay <= 0 )                  /* wished date is now or already passed */
     {
         return;
     }
     tv_delay.tv_sec = delay / 1000000;
-    tv_delay.tv_usec = delay % 1000000; 
-    
+    tv_delay.tv_usec = delay % 1000000;
+
     /* see msleep() about select() errors */
     select( 0, NULL, NULL, NULL, &tv_delay );
 }
 
-/*******************************************************************************
+/******************************************************************************
  * msleep: more precise sleep() (inline function)                        (ok ?)
- *******************************************************************************
+ ******************************************************************************
  * This function uses select() in a classical way to implement a sleep() call
- * with a microsecond precision. 
+ * with a microsecond precision.
  * For synchronization purposes, mwait() should be prefered.
- *******************************************************************************
+ ******************************************************************************
  * ?? decalre as inline
- *******************************************************************************/
+ ******************************************************************************/
 void msleep( mtime_t delay )
 {
     struct timeval tv_delay;