first cleanups in the WIN32 preprocessor stuff

[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 2f45c1c..4c6d37a 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            */
 
-/* Copyright (c) 2007-2010, 2012-2014. The SimGrid Team.
+/* Copyright (c) 2007-2010, 2012-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -9,35 +9,41 @@
 #include "xbt/sysdep.h"
 #include "xbt/xbt_os_time.h"    /* this module */
 #include "xbt/log.h"
-#include "portable.h"
+#include "src/portable.h"
 #include <math.h>               /* floor */
 
-#ifdef _XBT_WIN32
+#ifdef _WIN32
 #include <sys/timeb.h>
 #include <windows.h>
 #endif
 
 //Freebsd doesn't provide this clock_gettime flag yet, because it was added too recently (after 1993)
-#ifdef __FreeBSD__
+#if defined (CLOCK_PROF) && ! defined (CLOCK_PROCESS_CPUTIME_ID)
 #define CLOCK_PROCESS_CPUTIME_ID CLOCK_PROF
 #endif
 
+#if defined(__APPLE__) && defined(__MACH__)
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#include <mach/mach_init.h>
+#include <mach/mach_host.h>
+#include <mach/mach_port.h>
+#include <mach/mach_traps.h>
+#include <mach/task_info.h>
+#include <mach/thread_info.h>
+#include <mach/thread_act.h>
+#include <mach/vm_region.h>
+#include <mach/vm_map.h>
+#include <mach/task.h>
+#endif
+
 double xbt_os_time(void)
 {
 #ifdef HAVE_GETTIMEOFDAY
   struct timeval tv;
   gettimeofday(&tv, NULL);
-#elif defined(_XBT_WIN32)
+#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;
 
@@ -49,7 +55,6 @@ double xbt_os_time(void)
 
   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));
@@ -61,7 +66,7 @@ double xbt_os_time(void)
 void xbt_os_sleep(double sec)
 {
 
-#ifdef _XBT_WIN32
+#ifdef _WIN32
   Sleep((floor(sec) * 1000) + ((sec - floor(sec)) * 1000));
 
 #elif HAVE_NANOSLEEP
@@ -92,7 +97,7 @@ void xbt_os_sleep(double sec)
 struct s_xbt_os_timer {
 #ifdef HAVE_POSIX_GETTIME
   struct timespec start, stop, elapse;
-#elif defined(HAVE_GETTIMEOFDAY) || defined(_XBT_WIN32)
+#elif defined(HAVE_GETTIMEOFDAY) || defined(_WIN32)
   struct timeval start, stop, elapse;
 #else
   unsigned long int start, stop, elapse;
@@ -120,7 +125,7 @@ double xbt_os_timer_elapsed(xbt_os_timer_t timer)
                                           ((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) || defined(_XBT_WIN32)
+#elif defined(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) -
@@ -141,18 +146,9 @@ void xbt_os_walltimer_start(xbt_os_timer_t timer)
   timer->elapse.tv_sec = 0;
   timer->elapse.tv_usec = 0;
   gettimeofday(&(timer->start), NULL);
-#elif defined(_XBT_WIN32)
+#elif defined(_WIN32)
   timer->elapse.tv_sec = 0;
   timer->elapse.tv_usec = 0;
-#  if defined(WIN32_WCE) || (_WIN32_WINNT < 0x0400)
-  struct _timeb tm;
-
-  _ftime(&tm);
-
-  timer->start.tv_sec = tm.time;
-  timer->start.tv_usec = tm.millitm * 1000;
-
-#  else
   FILETIME ft;
   unsigned __int64 tm;
 
@@ -164,7 +160,6 @@ void xbt_os_walltimer_start(xbt_os_timer_t timer)
 
   timer->start.tv_sec = (long) (tm / 1000000L);
   timer->start.tv_usec = (long) (tm % 1000000L);
-#  endif                        /* windows version checker */
 #else
   timer->elapse = 0;
   timer->start = (unsigned long int) (time(NULL));
@@ -182,18 +177,9 @@ 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;
   gettimeofday(&(timer->start), NULL);
-#elif defined(_XBT_WIN32)
+#elif defined(_WIN32)
   timer->elapse.tv_sec += timer->stop.tv_sec - timer->start.tv_sec;
   timer->elapse.tv_usec += timer->stop.tv_usec - timer->start.tv_usec;
-#  if defined(WIN32_WCE) || (_WIN32_WINNT < 0x0400)
-  struct _timeb tm;
-
-  _ftime(&tm);
-
-  timer->start.tv_sec = tm.time;
-  timer->start.tv_usec = tm.millitm * 1000;
-
-#  else
   FILETIME ft;
   unsigned __int64 tm;
 
@@ -205,7 +191,6 @@ void xbt_os_walltimer_resume(xbt_os_timer_t timer)
 
   timer->start.tv_sec = (long) (tm / 1000000L);
   timer->start.tv_usec = (long) (tm % 1000000L);
-#  endif
 #else
   timer->elapse = timer->stop - timer->start;
   timer->start = (unsigned long int) (time(NULL));
@@ -218,16 +203,7 @@ void xbt_os_walltimer_stop(xbt_os_timer_t timer)
   clock_gettime(CLOCK_REALTIME, &(timer->stop));
 #elif defined(HAVE_GETTIMEOFDAY)
   gettimeofday(&(timer->stop), NULL);
-#elif defined(_XBT_WIN32)
-#  if defined(WIN32_WCE) || (_WIN32_WINNT < 0x0400)
-  struct _timeb tm;
-
-  _ftime(&tm);
-
-  timer->stop.tv_sec = tm.time;
-  timer->stop.tv_usec = tm.millitm * 1000;
-
-#  else
+#elif defined(_WIN32)
   FILETIME ft;
   unsigned __int64 tm;
 
@@ -239,7 +215,6 @@ void xbt_os_walltimer_stop(xbt_os_timer_t timer)
 
   timer->stop.tv_sec = (long) (tm / 1000000L);
   timer->stop.tv_usec = (long) (tm % 1000000L);
-#  endif
 #else
   timer->stop = (unsigned long int) (time(NULL));
 #endif
@@ -251,12 +226,13 @@ void xbt_os_cputimer_start(xbt_os_timer_t timer)
   timer->elapse.tv_sec = 0;
   timer->elapse.tv_nsec = 0;
   clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &(timer->start));
-#elif defined(_XBT_WIN32)
+#elif defined(HAVE_GETTIMEOFDAY)//return time and not cputime in this case
+  timer->elapse.tv_sec = 0;
+  timer->elapse.tv_usec = 0;
+  gettimeofday(&(timer->start), NULL);
+#elif defined(_WIN32)
   timer->elapse.tv_sec = 0;
   timer->elapse.tv_usec = 0;
-#  if defined(WIN32_WCE) || (_WIN32_WINNT < 0x0400)
-  THROW_UNIMPLEMENTED;
-#  else
   HANDLE h = GetCurrentProcess();
   FILETIME creationTime, exitTime, kernelTime, userTime;
   GetProcessTimes(h, &creationTime, &exitTime, &kernelTime, &userTime);
@@ -269,7 +245,6 @@ void xbt_os_cputimer_start(xbt_os_timer_t timer)
   utm /= 10;
   timer->start.tv_sec = (long) (ktm / 1000000L) + (long) (utm / 1000000L);
   timer->start.tv_usec = (long) (ktm % 1000000L) + (long) (utm % 1000000L);
-#  endif                        /* windows version checker */
 #endif
 }
 
@@ -279,12 +254,13 @@ void xbt_os_cputimer_resume(xbt_os_timer_t timer)
   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(_XBT_WIN32)
+#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);
+#elif defined(_WIN32)
   timer->elapse.tv_sec += timer->stop.tv_sec - timer->start.tv_sec;
   timer->elapse.tv_usec += timer->stop.tv_usec - timer->start.tv_usec;
-#  if defined(WIN32_WCE) || (_WIN32_WINNT < 0x0400)
-  THROW_UNIMPLEMENTED;
-#  else
   HANDLE h = GetCurrentProcess();
   FILETIME creationTime, exitTime, kernelTime, userTime;
   GetProcessTimes(h, &creationTime, &exitTime, &kernelTime, &userTime);
@@ -297,8 +273,6 @@ void xbt_os_cputimer_resume(xbt_os_timer_t timer)
   utm /= 10;
   timer->start.tv_sec = (long) (ktm / 1000000L) + (long) (utm / 1000000L);
   timer->start.tv_usec = (long) (ktm % 1000000L) + (long) (utm % 1000000L);
-#  endif                        /* windows version checker */
-
 #endif
 }
 
@@ -306,10 +280,9 @@ void xbt_os_cputimer_stop(xbt_os_timer_t timer)
 {
 #ifdef HAVE_POSIX_GETTIME
   clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &(timer->stop));
-#elif defined(_XBT_WIN32)
-#  if defined(WIN32_WCE) || (_WIN32_WINNT < 0x0400)
-  THROW_UNIMPLEMENTED;
-#  else
+#elif defined(HAVE_GETTIMEOFDAY)
+  gettimeofday(&(timer->stop), NULL);
+#elif defined(_WIN32)
   HANDLE h = GetCurrentProcess();
   FILETIME creationTime, exitTime, kernelTime, userTime;
   GetProcessTimes(h, &creationTime, &exitTime, &kernelTime, &userTime);
@@ -322,7 +295,6 @@ void xbt_os_cputimer_stop(xbt_os_timer_t timer)
   utm /= 10;
   timer->stop.tv_sec = (long) (ktm / 1000000L) + (long) (utm / 1000000L);
   timer->stop.tv_usec = (long) (ktm % 1000000L) + (long) (utm % 1000000L);
-#  endif                        /* windows version checker */
 #endif
 }
 
@@ -332,11 +304,20 @@ void xbt_os_threadtimer_start(xbt_os_timer_t timer)
   timer->elapse.tv_sec = 0;
   timer->elapse.tv_nsec = 0;
   clock_gettime(CLOCK_THREAD_CPUTIME_ID, &(timer->start));
-#elif defined(_XBT_WIN32)
-  struct timeval tv;
-#  if defined(WIN32_WCE) || (_WIN32_WINNT < 0x0400)
-  THROW_UNIMPLEMENTED;
-#  else
+#elif defined(HAVE_GETTIMEOFDAY) && defined(__MACH__) && defined(__APPLE__)//attempt for timing of the thread on OSX
+  timer->elapse.tv_sec = 0;
+  timer->elapse.tv_usec = 0;
+  mach_msg_type_number_t count = THREAD_BASIC_INFO_COUNT;
+  thread_basic_info_data_t thi_data;
+  thread_basic_info_t thi = &thi_data;
+  thread_info(mach_thread_self(), THREAD_BASIC_INFO, (thread_info_t)thi, &count);
+  timer->start.tv_usec =  thi->system_time.microseconds + thi->user_time.microseconds;
+  timer->start.tv_sec = thi->system_time.seconds + thi->user_time.seconds;
+#elif defined(HAVE_GETTIMEOFDAY)//return time and not cputime in this case
+  timer->elapse.tv_sec = 0;
+  timer->elapse.tv_usec = 0;
+  gettimeofday(&(timer->start), NULL);
+#elif defined(_WIN32)
   HANDLE h = GetCurrentThread();
   FILETIME creationTime, exitTime, kernelTime, userTime;
   GetThreadTimes(h, &creationTime, &exitTime, &kernelTime, &userTime);
@@ -349,7 +330,6 @@ void xbt_os_threadtimer_start(xbt_os_timer_t timer)
   utm /= 10;
   timer->start.tv_sec = (long) (ktm / 1000000L) + (long) (utm / 1000000L);
   timer->start.tv_usec = (long) (ktm % 1000000L) + (long) (utm % 1000000L);
-#  endif                        /* windows version checker */
 #endif
 }
 
@@ -359,12 +339,22 @@ void xbt_os_threadtimer_resume(xbt_os_timer_t timer)
   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_THREAD_CPUTIME_ID, &(timer->start));
-#elif defined(_XBT_WIN32)
+#elif defined(HAVE_GETTIMEOFDAY) && defined(__MACH__) && defined(__APPLE__)
+  timer->elapse.tv_sec += timer->stop.tv_sec - timer->start.tv_sec;
+  timer->elapse.tv_usec += timer->stop.tv_usec - timer->start.tv_usec;
+  mach_msg_type_number_t count = THREAD_BASIC_INFO_COUNT;
+  thread_basic_info_data_t thi_data;
+  thread_basic_info_t thi = &thi_data;
+  thread_info(mach_thread_self(), THREAD_BASIC_INFO, (thread_info_t)thi, &count);
+  timer->start.tv_usec =  thi->system_time.microseconds + thi->user_time.microseconds;
+  timer->start.tv_sec = thi->system_time.seconds + thi->user_time.seconds;
+#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);
+#elif defined(_WIN32)
   timer->elapse.tv_sec += timer->stop.tv_sec - timer->start.tv_sec;
   timer->elapse.tv_usec += timer->stop.tv_usec - timer->start.tv_usec;
-#  if defined(WIN32_WCE) || (_WIN32_WINNT < 0x0400)
-  THROW_UNIMPLEMENTED;
-#  else
   HANDLE h = GetCurrentThread();
   FILETIME creationTime, exitTime, kernelTime, userTime;
   GetThreadTimes(h, &creationTime, &exitTime, &kernelTime, &userTime);
@@ -377,7 +367,6 @@ void xbt_os_threadtimer_resume(xbt_os_timer_t timer)
   utm /= 10;
   timer->start.tv_sec = (long) (ktm / 1000000L) + (long) (utm / 1000000L);
   timer->start.tv_usec = (long) (ktm % 1000000L) + (long) (utm % 1000000L);
-#  endif                        /* windows version checker */
 #endif
 }
 
@@ -385,10 +374,16 @@ void xbt_os_threadtimer_stop(xbt_os_timer_t timer)
 {
 #ifdef HAVE_POSIX_GETTIME
   clock_gettime(CLOCK_THREAD_CPUTIME_ID, &(timer->stop));
-#elif defined(_XBT_WIN32)
-#  if defined(WIN32_WCE) || (_WIN32_WINNT < 0x0400)
-  THROW_UNIMPLEMENTED;
-#  else
+#elif defined(HAVE_GETTIMEOFDAY) && defined(__MACH__) && defined(__APPLE__)
+  mach_msg_type_number_t count = THREAD_BASIC_INFO_COUNT;
+  thread_basic_info_data_t thi_data;
+  thread_basic_info_t thi = &thi_data;
+  thread_info(mach_thread_self(), THREAD_BASIC_INFO, (thread_info_t)thi, &count);
+  timer->stop.tv_usec =  thi->system_time.microseconds + thi->user_time.microseconds;
+  timer->stop.tv_sec = thi->system_time.seconds + thi->user_time.seconds;
+#elif defined(HAVE_GETTIMEOFDAY)//if nothing else is available, return just time
+  gettimeofday(&(timer->stop), NULL);
+#elif defined(_WIN32)
   HANDLE h = GetCurrentThread();
   FILETIME creationTime, exitTime, kernelTime, userTime;
   GetThreadTimes(h, &creationTime, &exitTime, &kernelTime, &userTime);
@@ -401,6 +396,5 @@ void xbt_os_threadtimer_stop(xbt_os_timer_t timer)
   utm /= 10;
   timer->stop.tv_sec = (long) (ktm / 1000000L) + (long) (utm / 1000000L);
   timer->stop.tv_usec = (long) (ktm % 1000000L) + (long) (utm % 1000000L);
-#  endif                        /* windows version checker */
 #endif
 }