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

diff --git a/src/gras/Virtu/rl_time.c b/src/gras/Virtu/rl_time.c
index f9d80742fa..49024d44e5 100644
--- a/src/gras/Virtu/rl_time.c
+++ b/src/gras/Virtu/rl_time.c
@@ -2,28 +2,41 @@
 
 /* time - time related syscal wrappers                                      */
 
-/* Authors: Martin Quinson                                                  */
-/* Copyright (C) 2003,2004 da GRAS posse.                                   */
+/* 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. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "gras_private.h"
-#include <sys/time.h>   /* gettimeofday() */
+#include "math.h" /* floor */
 
-double gras_os_time() {
-  struct timeval tv;
+#include "portable.h"
+
+#include "xbt/sysdep.h"
+#include "gras/virtu.h"
+#include "xbt/xbt_portability.h" /* private */
 
-  gettimeofday(&tv, NULL);
+XBT_LOG_EXTERNAL_CATEGORY(virtu);
+XBT_LOG_DEFAULT_CATEGORY(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) {
-  sleep(sec);
-  if (usec/1000000) sleep(usec/1000000);
-
+void gras_os_sleep(double sec) {
 #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
 }
+