Use select to sleep portably on weird platforms

[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 eeb782b..49024d4 100644 (file)
--- a/src/gras/Virtu/rl_time.c
+++ b/src/gras/Virtu/rl_time.c
@@ -7,31 +7,36 @@
 /* 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. */
 

+#include "math.h" /* floor */
+

 #include "portable.h"
 
 #include "xbt/sysdep.h"
 #include "gras/virtu.h"
 #include "portable.h"
 
 #include "xbt/sysdep.h"
 #include "gras/virtu.h"

+#include "xbt/xbt_portability.h" /* private */

 
 

+XBT_LOG_EXTERNAL_CATEGORY(virtu);
+XBT_LOG_DEFAULT_CATEGORY(virtu);

 
 double gras_os_time() {
 
 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) {
-  sleep(sec);
-  if (usec/1000000) sleep(usec/1000000);
-
+void gras_os_sleep(double sec) {

 #ifdef HAVE_USLEEP
 #ifdef HAVE_USLEEP

-  (void)usleep(usec % 1000000);
-#endif /* ! HAVE_USLEEP */
+  DEBUG1("Do sleep %f sec", sec);
+  sleep(sec);
+  (void)usleep( (sec - floor(sec)) * 1000000);
+        
+#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

 }
 }

+