- �a compile sous FreeBSD (mais �a ne tourne pas)

[vlc] / src / misc / mtime.c

diff --git a/src/misc/mtime.c b/src/misc/mtime.c
index 9b27f39cc024de857b7041b2f4bae69d808ef0ca..2f2b42b359abb0a703f7e95e48c7506c7eb3c44f 100644 (file)
--- a/src/misc/mtime.c
+++ b/src/misc/mtime.c
@@ -1,29 +1,49 @@
-/******************************************************************************
+/*****************************************************************************
  * mtime.c: high rezolution time management functions
- * (c)1998 VideoLAN
- ******************************************************************************
  * Functions are prototyped in mtime.h.
- ******************************************************************************
- * to-do list:
+ *****************************************************************************
+ * Copyright (C) 1998, 1999, 2000 VideoLAN
+ *
+ * Authors:
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *****************************************************************************/
+
+/*
+ * TODO:
  *  see if using Linux real-time extensions is possible and profitable
- ******************************************************************************/
+ */
 
-/******************************************************************************
+/*****************************************************************************
  * Preamble
- ******************************************************************************/
-#include <stdio.h>
+ *****************************************************************************/
+#include <stdio.h>                                              /* sprintf() */
+#include <unistd.h>                                              /* select() */
 #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.
- ******************************************************************************/
+ *****************************************************************************/
 char *mstrtime( char *psz_buffer, mtime_t date )
 {
     sprintf( psz_buffer, "%02d:%02d:%02d-%03d.%03d",
@@ -35,16 +55,12 @@ char *mstrtime( char *psz_buffer, mtime_t date )
     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 )
 {
     struct timeval tv_date;
@@ -56,50 +72,46 @@ 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)
- ******************************************************************************
+ *****************************************************************************
  * 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;
-    mtime_t        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 now or already passed */
+    if( delay <= 0 )                 /* wished date is now or already passed */
     {
         return;
     }
+#ifndef usleep
     tv_delay.tv_sec = delay / 1000000;
     tv_delay.tv_usec = delay % 1000000;
 
     /* see msleep() about select() errors */
     select( 0, NULL, NULL, NULL, &tv_delay );
+#else
+    usleep( delay );
+#endif
 }
 
-/******************************************************************************
+/*****************************************************************************
  * msleep: more precise sleep() (inline function)                        (ok ?)
- ******************************************************************************
- * This function uses select() in a classical way to implement a sleep() call
- * with a microsecond precision.
- * For synchronization purposes, mwait() should be prefered.
- ******************************************************************************
- * ?? decalre as inline
- ******************************************************************************/
+ *****************************************************************************
+ * Portable usleep() function.
+ *****************************************************************************/
 void msleep( mtime_t delay )
 {
+#ifndef usleep
     struct timeval tv_delay;
 
     tv_delay.tv_sec = delay / 1000000;
@@ -109,4 +121,7 @@ void msleep( mtime_t delay )
      * (i.e. when a signal is sent to the thread, or when memory is full), and
      * can be ingnored. */
     select( 0, NULL, NULL, NULL, &tv_delay );
+#else
+    usleep( delay );
+#endif
 }