uniformize gras_os_sleep prototype (seconds are double everywhere else, avoid roundin...

[simgrid.git] / src / gras / Virtu / rl_time.c

diff --git a/src/gras/Virtu/rl_time.c b/src/gras/Virtu/rl_time.c
index 86a6100..e9d07b2 100644 (file)
--- a/src/gras/Virtu/rl_time.c
+++ b/src/gras/Virtu/rl_time.c
@@ -7,11 +7,15 @@
 /* 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 "gras/virtu.h"
 
+XBT_LOG_EXTERNAL_CATEGORY(virtu);
+XBT_LOG_DEFAULT_CATEGORY(virtu);
 
 double gras_os_time() {
 #ifdef HAVE_GETTIMEOFDAY
@@ -19,7 +23,7 @@ double gras_os_time() {
 
   gettimeofday(&tv, NULL);
 
-  return (double)(tv.tv_sec + tv.tv_usec / 1000000);
+  return (double)(tv.tv_sec + tv.tv_usec / 1000000.0);
 #else
   /* Poor resolution */
   return (double)(time(NULL)); 
@@ -27,11 +31,16 @@ double gras_os_time() {
        
 }
  
-void gras_os_sleep(unsigned long sec,unsigned long usec) {
+void gras_os_sleep(double sec) {
+  DEBUG1("Do sleep %d sec", (int)sec);
   sleep(sec);
-  if (usec/1000000) sleep(usec/1000000);
 
 #ifdef HAVE_USLEEP
-  (void)usleep(usec % 1000000);
+  DEBUG1("Do sleep %d usec", (int) ((sec - floor(sec)) * 1000000 ));
+  (void)usleep( (sec - floor(sec)) * 1000000);
+#else
+  if ( ((int) sec) == 0) {
+     WARN0("This platform does not implement usleep. Cannot sleep less than one second");
+  }
 #endif /* ! HAVE_USLEEP */
 }