cleanup windows portability in there

[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 94de59a..e3e00cc 100644 (file)
--- a/src/xbt/xbt_os_time.c
+++ b/src/xbt/xbt_os_time.c
@@ -4,7 +4,7 @@
 /*  no system header should be loaded out of this file so that we have only */
 /*  one file to check when porting to another OS                            */
 
 /*  no system header should be loaded out of this file so that we have only */
 /*  one file to check when porting to another OS                            */
 

-/* Copyright (c) 2004 Martin Quinson. All rights reserved.                  */
+/* Copyright (c) 2004-2007 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. */
 
 /* 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. */


@@ -13,8 +13,72 @@
 #include "xbt/xbt_os_time.h" /* this module */
 #include "xbt/log.h"
 #include "portable.h"
 #include "xbt/xbt_os_time.h" /* this module */
 #include "xbt/log.h"
 #include "portable.h"

+#include <math.h> /* floor */

 
 
 
 

+#ifdef WIN32
+#include <sys\timeb.h>
+#endif
+
+double xbt_os_time(void) {
+#ifdef HAVE_GETTIMEOFDAY
+  struct timeval tv;
+
+  gettimeofday(&tv, NULL);
+
+  return (double)(tv.tv_sec + tv.tv_usec / 1000000.0);
+#elsif defined(WIN32)
+
+#  if defined(WIN32_WCE) || (_WIN32_WINNT < 0x0400)
+   struct _timeb tm;
+   
+   _ftime (&tm);
+       
+   tv->tv_sec = tm.time;
+   tv->tv_usec = tm.millitm * 1000;
+   
+#  else
+   FILETIME  ft;
+   unsigned __int64 tm;
+   
+   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 /* windows version checker */
+               
+   
+#else  /* not windows, no gettimeofday => poor resolution */
+   
+  return (double)(time(NULL));
+#endif /* HAVE_GETTIMEOFDAY? */        
+}
+
+void xbt_os_sleep(double sec) {
+#ifdef HAVE_USLEEP
+  sleep(sec);
+  (void)usleep( (sec - floor(sec)) * 1000000);
+
+#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;
+
+  
+  timeout.tv_sec =  (unsigned long)(sec);
+  timeout.tv_usec = (sec - floor(sec)) * 1000000;
+              
+  select(0, NULL, NULL, NULL, &timeout);
+#endif
+}
+

 /** @brief like free 
     @hideinitializer */
 XBT_PUBLIC(void) xbt_free_f(void* p)
 /** @brief like free 
     @hideinitializer */
 XBT_PUBLIC(void) xbt_free_f(void* p)


@@ -32,6 +96,7 @@ XBT_PUBLIC(void) xbt_free_f(void* p)
  *  an OS abstraction.
  */
 
  *  an OS abstraction.
  */
 

+/*

 double xbt_os_time(void) {
 #ifdef HAVE_GETTIMEOFDAY
   struct timeval tv;
 double xbt_os_time(void) {
 #ifdef HAVE_GETTIMEOFDAY
   struct timeval tv;


@@ -39,11 +104,11 @@ double xbt_os_time(void) {
   gettimeofday(&tv, NULL);
 
   return (double)(tv.tv_sec + tv.tv_usec / 1000000.0);
   gettimeofday(&tv, NULL);
 
   return (double)(tv.tv_sec + tv.tv_usec / 1000000.0);

-#else
+#else*/

   /* Poor resolution */
   /* Poor resolution */

-  return (double)(time(NULL));
-#endif /* HAVE_GETTIMEOFDAY? */        
-}
+/*  return (double)(time(NULL));*/
+//#endif /* HAVE_GETTIMEOFDAY? */      
+//}

 
 /*XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sysdep, xbt, "System dependency");*/
 
 
 /*XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sysdep, xbt, "System dependency");*/