X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dff9e15c44ab6340d27215957c56fa72fad246a2..bdbe999b43bcbc257c70efd27142a7b1da323808:/src/xbt/xbt_os_time.c

diff --git a/src/xbt/xbt_os_time.c b/src/xbt/xbt_os_time.c
index ebd1f8bff7..cd4d42011d 100644
--- a/src/xbt/xbt_os_time.c
+++ b/src/xbt/xbt_os_time.c
@@ -1,8 +1,7 @@
-/* $Id$ */
-
 /* xbt_os_time.c -- portable interface to time-related functions            */
 
-/* Copyright (c) 2004-2008 The SimGrid team. All rights reserved.           */
+/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+ * 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. */
@@ -13,9 +12,9 @@
 #include "portable.h"
 #include <math.h>               /* floor */
 
-
-#ifdef WIN32
+#ifdef _XBT_WIN32
 #include <sys/timeb.h>
+#include <windows.h>
 #endif
 
 double xbt_os_time(void)
@@ -23,7 +22,7 @@ double xbt_os_time(void)
 #ifdef HAVE_GETTIMEOFDAY
   struct timeval tv;
   gettimeofday(&tv, NULL);
-#elif defined(WIN32)
+#elif defined(_XBT_WIN32)
   struct timeval tv;
 #  if defined(WIN32_WCE) || (_WIN32_WINNT < 0x0400)
   struct _timeb tm;
@@ -45,11 +44,11 @@ double xbt_os_time(void)
 
   tv.tv_sec = (long) (tm / 1000000L);
   tv.tv_usec = (long) (tm % 1000000L);
-#  endif /* windows version checker */
+#  endif                        /* windows version checker */
 
-#else /* not windows, no gettimeofday => poor resolution */
+#else                           /* not windows, no gettimeofday => poor resolution */
   return (double) (time(NULL));
-#endif /* HAVE_GETTIMEOFDAY? */
+#endif                          /* HAVE_GETTIMEOFDAY? */
 
   return (double) (tv.tv_sec + tv.tv_usec / 1000000.0);
 }
@@ -60,10 +59,10 @@ void xbt_os_sleep(double sec)
   sleep(sec);
   (void) usleep((sec - floor(sec)) * 1000000);
 
-#elif WIN32
+#elif _XBT_WIN32
   Sleep((floor(sec) * 1000) + ((sec - floor(sec)) * 1000));
 
-#else /* don't have usleep. Use select to sleep less than one second */
+#else                           /* don't have usleep. Use select to sleep less than one second */
   struct timeval timeout;
 
 
@@ -85,7 +84,9 @@ void xbt_os_sleep(double sec)
 
 
 struct s_xbt_os_timer {
-#ifdef HAVE_GETTIMEOFDAY
+#ifdef HAVE_POSIX_GETTIME
+  struct timespec start, stop;
+#elif defined(HAVE_GETTIMEOFDAY)
   struct timeval start, stop;
 #else
   unsigned long int start, stop;
@@ -104,7 +105,9 @@ void xbt_os_timer_free(xbt_os_timer_t timer)
 
 void xbt_os_timer_start(xbt_os_timer_t timer)
 {
-#ifdef HAVE_GETTIMEOFDAY
+#ifdef HAVE_POSIX_GETTIME
+  clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &(timer->start));
+#elif defined(HAVE_GETTIMEOFDAY)
   gettimeofday(&(timer->start), NULL);
 #else
   timer->start = (unsigned long int) (time(NULL));
@@ -113,7 +116,9 @@ void xbt_os_timer_start(xbt_os_timer_t timer)
 
 void xbt_os_timer_stop(xbt_os_timer_t timer)
 {
-#ifdef HAVE_GETTIMEOFDAY
+#ifdef HAVE_POSIX_GETTIME
+  clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &(timer->stop));
+#elif defined(HAVE_GETTIMEOFDAY)
   gettimeofday(&(timer->stop), NULL);
 #else
   timer->stop = (unsigned long int) (time(NULL));
@@ -122,10 +127,14 @@ void xbt_os_timer_stop(xbt_os_timer_t timer)
 
 double xbt_os_timer_elapsed(xbt_os_timer_t timer)
 {
-#ifdef HAVE_GETTIMEOFDAY
+#ifdef HAVE_POSIX_GETTIME
+  return ((double) timer->stop.tv_sec) - ((double) timer->start.tv_sec) +
+      ((((double) timer->stop.tv_nsec) -
+        ((double) timer->start.tv_nsec)) / 1e9);
+#elif defined(HAVE_GETTIMEOFDAY)
   return ((double) timer->stop.tv_sec) - ((double) timer->start.tv_sec) +
-    ((((double) timer->stop.tv_usec) -
-      ((double) timer->start.tv_usec)) / 1000000.0);
+      ((((double) timer->stop.tv_usec) -
+        ((double) timer->start.tv_usec)) / 1000000.0);
 #else
   return (double) timer->stop - (double) timer->start;
 #endif