Updated ChangeLog.

[simgrid.git] / src / xbt / xbt_os_time.c

diff --git a/src/xbt/xbt_os_time.c b/src/xbt/xbt_os_time.c
index ebd1f8b..19624a5 100644 (file)
--- 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. */
@@ -14,7 +13,7 @@
 #include <math.h>               /* floor */
 
 
-#ifdef WIN32
+#ifdef _XBT_WIN32
 #include <sys/timeb.h>
 #endif
 
@@ -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;
@@ -60,7 +59,7 @@ 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 */
@@ -85,35 +84,37 @@ 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;
 #endif
 };
 
-xbt_os_timer_t xbt_os_timer_new(void)
-{
+xbt_os_timer_t xbt_os_timer_new(void) {
   return xbt_new0(struct s_xbt_os_timer, 1);
 }
 
-void xbt_os_timer_free(xbt_os_timer_t timer)
-{
+void xbt_os_timer_free(xbt_os_timer_t timer) {
   free(timer);
 }
 
-void xbt_os_timer_start(xbt_os_timer_t timer)
-{
-#ifdef HAVE_GETTIMEOFDAY
+void xbt_os_timer_start(xbt_os_timer_t timer) {
+#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));
 #endif
 }
 
-void xbt_os_timer_stop(xbt_os_timer_t timer)
-{
-#ifdef HAVE_GETTIMEOFDAY
+void xbt_os_timer_stop(xbt_os_timer_t timer) {
+#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,7 +123,11 @@ 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);