rename the plugins from the command line, and document it

[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 0994708..8fd95b5 100644 (file)
--- a/src/xbt/xbt_os_time.c
+++ b/src/xbt/xbt_os_time.c
@@ -1,6 +1,6 @@
 /* xbt_os_time.c -- portable interface to time-related functions            */
 
 /* xbt_os_time.c -- portable interface to time-related functions            */
 

-/* Copyright (c) 2007-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2018. 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. */
 
 /* 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. */


@@ -38,6 +38,32 @@
 #include <mach/task.h>
 #endif
 
 #include <mach/task.h>
 #endif
 

+#ifdef _WIN32
+static void w32_time_to_timeval(struct timeval* tv, const FILETIME* ft)
+{
+  unsigned __int64 tm;
+  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);
+}
+
+static void w32_times_to_timeval(struct timeval* tv, const FILETIME* kernel_time, const FILETIME* user_time)
+{
+  unsigned __int64 ktm, utm;
+  ktm = (unsigned __int64)kernel_time->dwHighDateTime << 32;
+  ktm |= kernel_time->dwLowDateTime;
+  ktm /= 10;
+  utm = (unsigned __int64)user_time->dwHighDateTime << 32;
+  utm |= user_time->dwLowDateTime;
+  utm /= 10;
+  tv->tv_sec  = (long)(ktm / 1000000L) + (long)(utm / 1000000L);
+  tv->tv_usec = (long)(ktm % 1000000L) + (long)(utm % 1000000L);
+}
+#endif
+

 double xbt_os_time(void)
 {
 #if HAVE_GETTIMEOFDAY
 double xbt_os_time(void)
 {
 #if HAVE_GETTIMEOFDAY


@@ -46,17 +72,8 @@ double xbt_os_time(void)
 #elif defined(_WIN32)
   struct timeval tv;
   FILETIME ft;
 #elif defined(_WIN32)
   struct timeval tv;
   FILETIME ft;

-  unsigned __int64 tm;
-

   GetSystemTimeAsFileTime(&ft);
   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);
-
+  w32_time_to_timeval(&tv, &ft);

 #else                           /* not windows, no gettimeofday => poor resolution */
   return (double) (time(NULL));
 #endif                          /* HAVE_GETTIMEOFDAY? */
 #else                           /* not windows, no gettimeofday => poor resolution */
   return (double) (time(NULL));
 #endif                          /* HAVE_GETTIMEOFDAY? */


@@ -85,27 +102,29 @@ void xbt_os_sleep(double sec)
 #endif
 }
 
 #endif
 }
 

-/* TSC (tick-level) timers are said to be unreliable on SMP hosts and thus
-   disabled in SDL source code */
-
+/* 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
 
 /* \defgroup XBT_sysdep All system dependency

- * \brief This section describes many macros/functions that can serve as
- *  an OS abstraction.
+ * \brief This section describes many macros/functions that can serve as  an OS abstraction.

  */
  */

-
-

 struct s_xbt_os_timer {
 #if HAVE_POSIX_GETTIME
 struct s_xbt_os_timer {
 #if HAVE_POSIX_GETTIME

-  struct timespec start, stop, elapse;
+  struct timespec start;
+  struct timespec stop;
+  struct timespec elapse;

 #elif HAVE_GETTIMEOFDAY || defined(_WIN32)
 #elif HAVE_GETTIMEOFDAY || defined(_WIN32)

-  struct timeval start, stop, elapse;
+  struct timeval start;
+  struct timeval stop;
+  struct timeval elapse;

 #else
 #else

-  unsigned long int start, stop, elapse;
+  unsigned long int start;
+  unsigned long int stop;
+  unsigned long int elapse;

 #endif
 };
 
 #endif
 };
 

-size_t xbt_os_timer_size(void){
+size_t xbt_os_timer_size(void)
+{

   return sizeof(struct s_xbt_os_timer);
 }
 
   return sizeof(struct s_xbt_os_timer);
 }
 


@@ -122,18 +141,14 @@ void xbt_os_timer_free(xbt_os_timer_t timer)
 double xbt_os_timer_elapsed(xbt_os_timer_t timer)
 {
 #if HAVE_POSIX_GETTIME
 double xbt_os_timer_elapsed(xbt_os_timer_t timer)
 {
 #if 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);
+  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 HAVE_GETTIMEOFDAY || defined(_WIN32)
 #elif HAVE_GETTIMEOFDAY || defined(_WIN32)

-  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);
+  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
 #else

-  return (double) timer->stop - (double) timer->start + (double)
-    timer->elapse;
+  return (double) timer->stop - (double) timer->start + (double) timer->elapse;

 #endif
 }
 
 #endif
 }
 


@@ -151,16 +166,8 @@ void xbt_os_walltimer_start(xbt_os_timer_t timer)
   timer->elapse.tv_sec = 0;
   timer->elapse.tv_usec = 0;
   FILETIME ft;
   timer->elapse.tv_sec = 0;
   timer->elapse.tv_usec = 0;
   FILETIME ft;

-  unsigned __int64 tm;
-

   GetSystemTimeAsFileTime(&ft);
   GetSystemTimeAsFileTime(&ft);

-  tm = (unsigned __int64) ft.dwHighDateTime << 32;
-  tm |= ft.dwLowDateTime;
-  tm /= 10;
-  tm -= 11644473600000000ULL;
-
-  timer->start.tv_sec = (long) (tm / 1000000L);
-  timer->start.tv_usec = (long) (tm % 1000000L);
+  w32_time_to_timeval(&timer->start, &ft);

 #else
   timer->elapse = 0;
   timer->start = (unsigned long int) (time(NULL));
 #else
   timer->elapse = 0;
   timer->start = (unsigned long int) (time(NULL));


@@ -182,16 +189,8 @@ void xbt_os_walltimer_resume(xbt_os_timer_t timer)
   timer->elapse.tv_sec += timer->stop.tv_sec - timer->start.tv_sec;
   timer->elapse.tv_usec += timer->stop.tv_usec - timer->start.tv_usec;
   FILETIME ft;
   timer->elapse.tv_sec += timer->stop.tv_sec - timer->start.tv_sec;
   timer->elapse.tv_usec += timer->stop.tv_usec - timer->start.tv_usec;
   FILETIME ft;

-  unsigned __int64 tm;
-

   GetSystemTimeAsFileTime(&ft);
   GetSystemTimeAsFileTime(&ft);

-  tm = (unsigned __int64) ft.dwHighDateTime << 32;
-  tm |= ft.dwLowDateTime;
-  tm /= 10;
-  tm -= 11644473600000000ULL;
-
-  timer->start.tv_sec = (long) (tm / 1000000L);
-  timer->start.tv_usec = (long) (tm % 1000000L);
+  w32_time_to_timeval(&timer->start, &ft);

 #else
   timer->elapse = timer->stop - timer->start;
   timer->start = (unsigned long int) (time(NULL));
 #else
   timer->elapse = timer->stop - timer->start;
   timer->start = (unsigned long int) (time(NULL));


@@ -206,16 +205,8 @@ void xbt_os_walltimer_stop(xbt_os_timer_t timer)
   gettimeofday(&(timer->stop), NULL);
 #elif defined(_WIN32)
   FILETIME ft;
   gettimeofday(&(timer->stop), NULL);
 #elif defined(_WIN32)
   FILETIME ft;

-  unsigned __int64 tm;
-

   GetSystemTimeAsFileTime(&ft);
   GetSystemTimeAsFileTime(&ft);

-  tm = (unsigned __int64) ft.dwHighDateTime << 32;
-  tm |= ft.dwLowDateTime;
-  tm /= 10;
-  tm -= 11644473600000000ULL;
-
-  timer->stop.tv_sec = (long) (tm / 1000000L);
-  timer->stop.tv_usec = (long) (tm % 1000000L);
+  w32_time_to_timeval(&timer->stop, &ft);

 #else
   timer->stop = (unsigned long int) (time(NULL));
 #endif
 #else
   timer->stop = (unsigned long int) (time(NULL));
 #endif


@@ -237,15 +228,7 @@ void xbt_os_cputimer_start(xbt_os_timer_t timer)
   HANDLE h = GetCurrentProcess();
   FILETIME creationTime, exitTime, kernelTime, userTime;
   GetProcessTimes(h, &creationTime, &exitTime, &kernelTime, &userTime);
   HANDLE h = GetCurrentProcess();
   FILETIME creationTime, exitTime, kernelTime, userTime;
   GetProcessTimes(h, &creationTime, &exitTime, &kernelTime, &userTime);

-  unsigned __int64 ktm, utm;
-  ktm = (unsigned __int64) kernelTime.dwHighDateTime << 32;
-  ktm |= kernelTime.dwLowDateTime;
-  ktm /= 10;
-  utm = (unsigned __int64) userTime.dwHighDateTime << 32;
-  utm |= userTime.dwLowDateTime;
-  utm /= 10;
-  timer->start.tv_sec = (long) (ktm / 1000000L) + (long) (utm / 1000000L);
-  timer->start.tv_usec = (long) (ktm % 1000000L) + (long) (utm % 1000000L);
+  w32_times_to_timeval(&timer->start, &kernelTime, &userTime);

 #endif
 }
 
 #endif
 }
 


@@ -265,15 +248,7 @@ void xbt_os_cputimer_resume(xbt_os_timer_t timer)
   HANDLE h = GetCurrentProcess();
   FILETIME creationTime, exitTime, kernelTime, userTime;
   GetProcessTimes(h, &creationTime, &exitTime, &kernelTime, &userTime);
   HANDLE h = GetCurrentProcess();
   FILETIME creationTime, exitTime, kernelTime, userTime;
   GetProcessTimes(h, &creationTime, &exitTime, &kernelTime, &userTime);

-  unsigned __int64 ktm, utm;
-  ktm = (unsigned __int64) kernelTime.dwHighDateTime << 32;
-  ktm |= kernelTime.dwLowDateTime;
-  ktm /= 10;
-  utm = (unsigned __int64) userTime.dwHighDateTime << 32;
-  utm |= userTime.dwLowDateTime;
-  utm /= 10;
-  timer->start.tv_sec = (long) (ktm / 1000000L) + (long) (utm / 1000000L);
-  timer->start.tv_usec = (long) (ktm % 1000000L) + (long) (utm % 1000000L);
+  w32_times_to_timeval(&timer->start, &kernelTime, &userTime);

 #endif
 }
 
 #endif
 }
 


@@ -287,15 +262,7 @@ void xbt_os_cputimer_stop(xbt_os_timer_t timer)
   HANDLE h = GetCurrentProcess();
   FILETIME creationTime, exitTime, kernelTime, userTime;
   GetProcessTimes(h, &creationTime, &exitTime, &kernelTime, &userTime);
   HANDLE h = GetCurrentProcess();
   FILETIME creationTime, exitTime, kernelTime, userTime;
   GetProcessTimes(h, &creationTime, &exitTime, &kernelTime, &userTime);

-  unsigned __int64 ktm, utm;
-  ktm = (unsigned __int64) kernelTime.dwHighDateTime << 32;
-  ktm |= kernelTime.dwLowDateTime;
-  ktm /= 10;
-  utm = (unsigned __int64) userTime.dwHighDateTime << 32;
-  utm |= userTime.dwLowDateTime;
-  utm /= 10;
-  timer->stop.tv_sec = (long) (ktm / 1000000L) + (long) (utm / 1000000L);
-  timer->stop.tv_usec = (long) (ktm % 1000000L) + (long) (utm % 1000000L);
+  w32_times_to_timeval(&timer->stop, &kernelTime, &userTime);

 #endif
 }
 
 #endif
 }
 


@@ -322,15 +289,7 @@ void xbt_os_threadtimer_start(xbt_os_timer_t timer)
   HANDLE h = GetCurrentThread();
   FILETIME creationTime, exitTime, kernelTime, userTime;
   GetThreadTimes(h, &creationTime, &exitTime, &kernelTime, &userTime);
   HANDLE h = GetCurrentThread();
   FILETIME creationTime, exitTime, kernelTime, userTime;
   GetThreadTimes(h, &creationTime, &exitTime, &kernelTime, &userTime);

-  unsigned __int64 ktm, utm;
-  ktm = (unsigned __int64) kernelTime.dwHighDateTime << 32;
-  ktm |= kernelTime.dwLowDateTime;
-  ktm /= 10;
-  utm = (unsigned __int64) userTime.dwHighDateTime << 32;
-  utm |= userTime.dwLowDateTime;
-  utm /= 10;
-  timer->start.tv_sec = (long) (ktm / 1000000L) + (long) (utm / 1000000L);
-  timer->start.tv_usec = (long) (ktm % 1000000L) + (long) (utm % 1000000L);
+  w32_times_to_timeval(&timer->start, &kernelTime, &userTime);

 #endif
 }
 
 #endif
 }
 


@@ -359,15 +318,7 @@ void xbt_os_threadtimer_resume(xbt_os_timer_t timer)
   HANDLE h = GetCurrentThread();
   FILETIME creationTime, exitTime, kernelTime, userTime;
   GetThreadTimes(h, &creationTime, &exitTime, &kernelTime, &userTime);
   HANDLE h = GetCurrentThread();
   FILETIME creationTime, exitTime, kernelTime, userTime;
   GetThreadTimes(h, &creationTime, &exitTime, &kernelTime, &userTime);

-  unsigned __int64 ktm, utm;
-  ktm = (unsigned __int64) kernelTime.dwHighDateTime << 32;
-  ktm |= kernelTime.dwLowDateTime;
-  ktm /= 10;
-  utm = (unsigned __int64) userTime.dwHighDateTime << 32;
-  utm |= userTime.dwLowDateTime;
-  utm /= 10;
-  timer->start.tv_sec = (long) (ktm / 1000000L) + (long) (utm / 1000000L);
-  timer->start.tv_usec = (long) (ktm % 1000000L) + (long) (utm % 1000000L);
+  w32_times_to_timeval(&timer->start, &kernelTime, &userTime);

 #endif
 }
 
 #endif
 }
 


@@ -388,14 +339,6 @@ void xbt_os_threadtimer_stop(xbt_os_timer_t timer)
   HANDLE h = GetCurrentThread();
   FILETIME creationTime, exitTime, kernelTime, userTime;
   GetThreadTimes(h, &creationTime, &exitTime, &kernelTime, &userTime);
   HANDLE h = GetCurrentThread();
   FILETIME creationTime, exitTime, kernelTime, userTime;
   GetThreadTimes(h, &creationTime, &exitTime, &kernelTime, &userTime);

-  unsigned __int64 ktm, utm;
-  ktm = (unsigned __int64) kernelTime.dwHighDateTime << 32;
-  ktm |= kernelTime.dwLowDateTime;
-  ktm /= 10;
-  utm = (unsigned __int64) userTime.dwHighDateTime << 32;
-  utm |= userTime.dwLowDateTime;
-  utm /= 10;
-  timer->stop.tv_sec = (long) (ktm / 1000000L) + (long) (utm / 1000000L);
-  timer->stop.tv_usec = (long) (ktm % 1000000L) + (long) (utm % 1000000L);
+  w32_times_to_timeval(&timer->stop, &kernelTime, &userTime);

 #endif
 }
 #endif
 }