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

diff --git a/src/xbt/xbt_os_time.c b/src/xbt/xbt_os_time.c
index 365d127b2c..0f17fcc9a6 100644
--- a/src/xbt/xbt_os_time.c
+++ b/src/xbt/xbt_os_time.c
@@ -1,136 +1,168 @@
-/* xbt_os_time.c -- portable interface to time-related functions            */
-
-/* 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. */
-
-#include "xbt/sysdep.h"
-#include "xbt/xbt_os_time.h"    /* this module */
-#include "xbt/log.h"
-#include "portable.h"
-#include <math.h>               /* floor */
-
-#ifdef WIN32
-#include <sys/timeb.h>
-#endif
-
-double xbt_os_time(void)
-{
-#ifdef HAVE_GETTIMEOFDAY
-  struct timeval tv;
-  gettimeofday(&tv, NULL);
-#elif defined(WIN32)
-  struct timeval tv;
-#  if defined(WIN32_WCE) || (_WIN32_WINNT < 0x0400)
-  struct _timeb tm;
-
-  _ftime(&tm);
-
-  tv.tv_sec = tm.time;
-  tv.tv_usec = tm.millitm * 1000;
-
-#  else
-  FILETIME ft;
-  unsigned __int64 tm;
-
-  GetSystemTimeAsFileTime(&ft);
-  tm = (unsigned __int64) ft.dwHighDateTime << 32;
-  tm |= ft.dwLowDateTime;
-  tm /= 10;
-  tm -= 11644473600000000ULL;
-
-  tv.tv_sec = (long) (tm / 1000000L);
-  tv.tv_usec = (long) (tm % 1000000L);
-#  endif /* windows version checker */
-
-#else /* not windows, no gettimeofday => poor resolution */
-  return (double) (time(NULL));
-#endif /* HAVE_GETTIMEOFDAY? */
-
-  return (double) (tv.tv_sec + tv.tv_usec / 1000000.0);
-}
-
-void xbt_os_sleep(double sec)
-{
-#ifdef HAVE_USLEEP
-  sleep(sec);
-  (void) usleep((sec - floor(sec)) * 1000000);
-
-#elif WIN32
-  Sleep((floor(sec) * 1000) + ((sec - floor(sec)) * 1000));
-
-#else /* don't have usleep. Use select to sleep less than one second */
-  struct timeval timeout;
-
-
-  timeout.tv_sec = (unsigned long) (sec);
-  timeout.tv_usec = (sec - floor(sec)) * 1000000;
-
-  select(0, NULL, NULL, NULL, &timeout);
-#endif
-}
-
-/* TSC (tick-level) timers are said to be unreliable on SMP hosts and thus
-   disabled in SDL source code */
-
-
-/* \defgroup XBT_sysdep All system dependency
- * \brief This section describes many macros/functions that can serve as
- *  an OS abstraction.
- */
-
-
-struct s_xbt_os_timer {
-#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) {
-  return xbt_new0(struct s_xbt_os_timer, 1);
-}
-
-void xbt_os_timer_free(xbt_os_timer_t timer) {
-  free(timer);
-}
-
-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_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));
-#endif
-}
-
-double xbt_os_timer_elapsed(xbt_os_timer_t timer)
-{
-#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);
-#else
-  return (double) timer->stop - (double) timer->start;
-#endif
-}
+/* xbt_os_time.c -- portable interface to time-related functions            */
+
+/* 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. */
+
+#include "xbt/sysdep.h"
+#include "xbt/xbt_os_time.h"    /* this module */
+#include "xbt/log.h"
+#include "portable.h"
+#include <math.h>               /* floor */
+
+#ifdef _XBT_WIN32
+#include <sys/timeb.h>
+#include <windows.h>
+#endif
+
+double xbt_os_time(void)
+{
+#ifdef HAVE_GETTIMEOFDAY
+  struct timeval tv;
+  gettimeofday(&tv, NULL);
+#elif defined(_XBT_WIN32)
+  struct timeval tv;
+#  if defined(WIN32_WCE) || (_WIN32_WINNT < 0x0400)
+  struct _timeb tm;
+
+  _ftime(&tm);
+
+  tv.tv_sec = tm.time;
+  tv.tv_usec = tm.millitm * 1000;
+
+#  else
+  FILETIME ft;
+  unsigned __int64 tm;
+
+  GetSystemTimeAsFileTime(&ft);
+  tm = (unsigned __int64) ft.dwHighDateTime << 32;
+  tm |= ft.dwLowDateTime;
+  tm /= 10;
+  tm -= 11644473600000000ULL;
+
+  tv.tv_sec = (long) (tm / 1000000L);
+  tv.tv_usec = (long) (tm % 1000000L);
+#  endif                        /* windows version checker */
+
+#else                           /* not windows, no gettimeofday => poor resolution */
+  return (double) (time(NULL));
+#endif                          /* HAVE_GETTIMEOFDAY? */
+
+  return (double) (tv.tv_sec + tv.tv_usec / 1000000.0);
+}
+
+void xbt_os_sleep(double sec)
+{
+
+#ifdef _XBT_WIN32
+  Sleep((floor(sec) * 1000) + ((sec - floor(sec)) * 1000));
+
+#elif HAVE_NANOSLEEP
+  struct timespec ts;
+  ts.tv_sec = sec;
+  ts.tv_nsec = (sec - floor(sec)) * 1e9;
+  nanosleep (&ts, NULL);
+#else                           /* don't have nanosleep. Use select to sleep less than one second */
+  struct timeval timeout;
+
+  timeout.tv_sec = (unsigned long) (sec);
+  timeout.tv_usec = (sec - floor(sec)) * 1000000;
+
+  select(0, NULL, NULL, NULL, &timeout);
+#endif
+}
+
+/* TSC (tick-level) timers are said to be unreliable on SMP hosts and thus
+   disabled in SDL source code */
+
+
+/* \defgroup XBT_sysdep All system dependency
+ * \brief This section describes many macros/functions that can serve as
+ *  an OS abstraction.
+ */
+
+
+struct s_xbt_os_timer {
+#ifdef HAVE_POSIX_GETTIME
+  struct timespec start, stop, elapse;
+#elif defined(HAVE_GETTIMEOFDAY)
+  struct timeval start, stop, elapse;
+#else
+  unsigned long int start, stop, elapse;
+#endif
+};
+
+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)
+{
+  free(timer);
+}
+
+void xbt_os_timer_resume(xbt_os_timer_t timer)
+{
+#ifdef HAVE_POSIX_GETTIME
+  timer->elapse.tv_sec += timer->stop.tv_sec - timer->start.tv_sec;
+
+   timer->elapse.tv_nsec += timer->stop.tv_nsec - timer->start.tv_nsec;
+  clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &(timer->start));
+#elif defined(HAVE_GETTIMEOFDAY)
+  timer->elapse.tv_sec += timer->stop.tv_sec - timer->start.tv_sec;
+
+   timer->elapse.tv_usec += timer->stop.tv_usec - timer->start.tv_usec;
+  gettimeofday(&(timer->start), NULL);
+#else
+  timer->elapse = timer->stop - timer->start;
+  timer->start = (unsigned long int) (time(NULL));
+#endif
+}
+
+void xbt_os_timer_start(xbt_os_timer_t timer)
+{
+#ifdef HAVE_POSIX_GETTIME
+  timer->elapse.tv_sec = 0;
+  timer->elapse.tv_nsec = 0;
+  clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &(timer->start));
+#elif defined(HAVE_GETTIMEOFDAY)
+  timer->elapse.tv_sec = 0;
+  timer->elapse.tv_usec = 0;
+  gettimeofday(&(timer->start), NULL);
+#else
+  timer->elapse = 0;
+  timer->start = (unsigned long int) (time(NULL));
+#endif
+}
+
+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));
+#endif
+}
+
+double xbt_os_timer_elapsed(xbt_os_timer_t timer)
+{
+#ifdef HAVE_POSIX_GETTIME
+  return ((double) timer->stop.tv_sec) - ((double) timer->start.tv_sec) +
+                                          ((double) timer->elapse.tv_sec ) +
+      ((((double) timer->stop.tv_nsec) -
+        ((double) timer->start.tv_nsec) + ((double) timer->elapse.tv_nsec )) / 1e9);
+#elif defined(HAVE_GETTIMEOFDAY)
+  return ((double) timer->stop.tv_sec) - ((double) timer->start.tv_sec)
+    + ((double) timer->elapse.tv_sec ) +
+      ((((double) timer->stop.tv_usec) -
+        ((double) timer->start.tv_usec) + ((double) timer->elapse.tv_usec )) / 1000000.0);
+#else
+  return (double) timer->stop - (double) timer->start + (double)
+    timer->elapse;
+#endif
+}