X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dd97404569cc6567988399bcdce1d89b8efef459..778f65057da68465382593cd036b6ee59ada54e9:/src/gras/Virtu/rl_time.c

diff --git a/src/gras/Virtu/rl_time.c b/src/gras/Virtu/rl_time.c
index eeb782b2e9..24e1fd6f4e 100644
--- a/src/gras/Virtu/rl_time.c
+++ b/src/gras/Virtu/rl_time.c
@@ -7,31 +7,44 @@
 /* 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. */
 
+#include <math.h> /* floor */
+
 #include "portable.h"
 
 #include "xbt/sysdep.h"
+#include "xbt/log.h"
 #include "gras/virtu.h"
+#include "xbt/xbt_portability.h" /* private */
 
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(gras_virtu);
 
 double gras_os_time() {
-#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? */ 
-	
+  return xbt_os_time();
 }
  
-void gras_os_sleep(unsigned long sec,unsigned long usec) {
+void gras_os_sleep(double sec) {
+#ifdef HAVE_USLEEP
+  DEBUG1("Do sleep %f sec", sec);
   sleep(sec);
-  if (usec/1000000) sleep(usec/1000000);
+  (void)usleep( (sec - floor(sec)) * 1000000);
 
-#ifdef HAVE_USLEEP
-  (void)usleep(usec % 1000000);
-#endif /* ! HAVE_USLEEP */
+#elif _WIN32
+     DEBUG1("Do sleep %f sec", sec);
+
+     Sleep((floor(sec) * 1000) +((sec - floor(sec)) * 1000));
+
+        
+#else /* don't have usleep. Use select to sleep less than one second */
+  struct timeval timeout;
+
+  DEBUG1("Do sleep %f sec", sec);
+  
+  timeout.tv_sec =  (unsigned long)(sec);
+  timeout.tv_usec = (sec - floor(sec)) * 1000000;
+              
+  select(0, NULL, NULL, NULL, &timeout);
+#endif
 }
+
+
+