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

diff --git a/src/gras/Virtu/rl_time.c b/src/gras/Virtu/rl_time.c
index 2b2206f93f..24e1fd6f4e 100644
--- a/src/gras/Virtu/rl_time.c
+++ b/src/gras/Virtu/rl_time.c
@@ -2,28 +2,49 @@
 
 /* time - time related syscal wrappers                                      */
 
-/* Copyright (c) 2004 Martin Quinson. All rights reserved.                  */
+/* Copyright (c) 2003, 2004 Martin Quinson. 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. */
 
+#include <math.h> /* floor */
+
+#include "portable.h"
+
 #include "xbt/sysdep.h"
+#include "xbt/log.h"
 #include "gras/virtu.h"
-#include <sys/time.h>   /* gettimeofday() */
-
-double gras_os_time() {
-  struct timeval tv;
+#include "xbt/xbt_portability.h" /* private */
 
-  gettimeofday(&tv, NULL);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(gras_virtu);
 
-  return (double)(tv.tv_sec * 1000000 + tv.tv_usec);
+double gras_os_time() {
+  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
 }
+
+
+