Various cleanups+allow cross-compilation with gcc

[simgrid.git] / src / xbt / xbt_os_time.c

diff --git a/src/xbt/xbt_os_time.c b/src/xbt/xbt_os_time.c
index bcdf8ad..de79d93 100644 (file)
--- a/src/xbt/xbt_os_time.c
+++ b/src/xbt/xbt_os_time.c
@@ -1,10 +1,8 @@
 /* $Id$ */
 
-/* sysdep.c -- all system dependency                                        */
-/*  no system header should be loaded out of this file so that we have only */
-/*  one file to check when porting to another OS                            */
+/* xbt_os_time.c -- portable interface to time-related functions            */
 
-/* Copyright (c) 2004 Martin Quinson. All rights reserved.                  */
+/* Copyright (c) 2004-2008 The SimGrid team. All rights reserved.           */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -17,59 +15,42 @@
 
 
 #ifdef WIN32
-#include <sys\timeb.h>
-#include <errno.h>
-
-int 
-gettimeofday(struct timeval *tv, struct timezone *tz)
-{
-       
-       #if defined(WIN32_WCE) || (_WIN32_WINNT < 0x0400)
+#include <sys/timeb.h>
+#endif
+
+double xbt_os_time(void) {
+#ifdef HAVE_GETTIMEOFDAY
+       struct timeval tv;
+       gettimeofday(&tv, NULL);
+#elif defined(WIN32)
+       struct timeval tv;
+#  if defined(WIN32_WCE) || (_WIN32_WINNT < 0x0400)
        struct _timeb tm;
-       #else
+
+       _ftime (&tm);
+
+       tv.tv_sec = tm.time;
+       tv.tv_usec = tm.millitm * 1000;
+
+#  else
        FILETIME  ft;
        unsigned __int64 tm;
-       #endif
-       
-       if (!tv) 
-       {
-               errno = EINVAL;
-               return -1;
-       }
-       
-       #if defined(WIN32_WCE) || (_WIN32_WINNT < 0x0400)
-       _ftime (&tm);
-       
-    tv->tv_sec = tm.time;
-    tv->tv_usec = tm.millitm * 1000;
-       #else
+
        GetSystemTimeAsFileTime (&ft);
        tm = (unsigned __int64)ft.dwHighDateTime << 32;
        tm |= ft.dwLowDateTime;
        tm /=10;
        tm -= 11644473600000000ULL;
-       
-       tv->tv_sec  = (long) (tm / 1000000L);
-       tv->tv_usec = (long) (tm % 1000000L);
-       #endif
-       
-       
-       
-       return 0;
-}
-#endif
 
-double xbt_os_time(void) {
-#ifdef HAVE_GETTIMEOFDAY
-  struct timeval tv;
+       tv.tv_sec  = (long) (tm / 1000000L);
+       tv.tv_usec = (long) (tm % 1000000L);
+#  endif /* windows version checker */
 
-  gettimeofday(&tv, NULL);
+#else  /* not windows, no gettimeofday => poor resolution */
+   return (double)(time(NULL));
+#endif /* HAVE_GETTIMEOFDAY? */
 
-  return (double)(tv.tv_sec + tv.tv_usec / 1000000.0);
-#else
-  /* Poor resolution */
-  return (double)(time(NULL));
-#endif /* HAVE_GETTIMEOFDAY? */        
+   return (double)(tv.tv_sec + tv.tv_usec / 1000000.0);        
 }
 
 void xbt_os_sleep(double sec) {
@@ -77,10 +58,8 @@ void xbt_os_sleep(double sec) {
   sleep(sec);
   (void)usleep( (sec - floor(sec)) * 1000000);
 
-#elif _WIN32
-
-     Sleep((floor(sec) * 1000) +((sec - floor(sec)) * 1000));
-
+#elif WIN32
+   Sleep((floor(sec) * 1000) +((sec - floor(sec)) * 1000));
         
 #else /* don't have usleep. Use select to sleep less than one second */
   struct timeval timeout;
@@ -95,9 +74,8 @@ void xbt_os_sleep(double sec) {
 
 /** @brief like free 
     @hideinitializer */
-XBT_PUBLIC(void) xbt_free_f(void* p)
-{
-       free(p);
+XBT_PUBLIC(void) xbt_free_f(void* p) {
+   free(p);
 }
 
 
@@ -110,22 +88,6 @@ XBT_PUBLIC(void) xbt_free_f(void* p)
  *  an OS abstraction.
  */
 
-/*
-double xbt_os_time(void) {
-#ifdef HAVE_GETTIMEOFDAY
-  struct timeval tv;
-
-  gettimeofday(&tv, NULL);
-
-  return (double)(tv.tv_sec + tv.tv_usec / 1000000.0);
-#else*/
-  /* Poor resolution */
-/*  return (double)(time(NULL));*/
-//#endif /* HAVE_GETTIMEOFDAY? */      
-//}
-
-/*XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sysdep, xbt, "System dependency");*/
-
 
 struct s_xbt_os_timer {
 #ifdef HAVE_GETTIMEOFDAY