X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/47801f582a7b05f4cd4680f96fb44316fe4e7a89..96963b5500f87e9f39580ddd6b5ef0c9775e5a35:/src/xbt/xbt_os_time.c

diff --git a/src/xbt/xbt_os_time.c b/src/xbt/xbt_os_time.c
index b93b0f1e29..2976a7633e 100644
--- a/src/xbt/xbt_os_time.c
+++ b/src/xbt/xbt_os_time.c
@@ -1,10 +1,8 @@
 /* $Id$ */
 
-/* sysdep.c -- all system dependency                                        */
-/*  no system header should be loaded out of this file so that we have only */
-/*  one file to check when porting to another OS                            */
+/* xbt_os_time.c -- portable interface to time-related functions            */
 
-/* Copyright (c) 2004 Martin Quinson. All rights reserved.                  */
+/* Copyright (c) 2004-2008 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. */
@@ -15,17 +13,44 @@
 #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;
 
-  return (double)(tv.tv_sec + tv.tv_usec / 1000000.0);
-#else
-  /* Poor resolution */
+  _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? */ 	
+#endif /* HAVE_GETTIMEOFDAY? */
+
+  return (double)(tv.tv_sec + tv.tv_usec / 1000000.0);
 }
 
 void xbt_os_sleep(double sec) {
@@ -33,32 +58,22 @@ void xbt_os_sleep(double sec) {
   sleep(sec);
   (void)usleep( (sec - floor(sec)) * 1000000);
 
-#elif _WIN32
+#elif WIN32
+  Sleep((floor(sec) * 1000) +((sec - floor(sec)) * 1000));
 
-     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
 }
 
-/** @brief like free 
-    @hideinitializer */
-XBT_PUBLIC(void) xbt_free_f(void* p)
-{
-	free(p);
-}
-
-
-/* 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
@@ -66,57 +81,41 @@ XBT_PUBLIC(void) xbt_free_f(void* p)
  *  an OS abstraction.
  */
 
-/*
-double xbt_os_time(void) {
-#ifdef HAVE_GETTIMEOFDAY
-  struct timeval tv;
-
-  gettimeofday(&tv, NULL);
-
-  return (double)(tv.tv_sec + tv.tv_usec / 1000000.0);
-#else*/
-  /* Poor resolution */
-/*  return (double)(time(NULL));*/
-//#endif /* HAVE_GETTIMEOFDAY? */ 	
-//}
-
-/*XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sysdep, xbt, "System dependency");*/
-
 
 struct s_xbt_os_timer {
 #ifdef HAVE_GETTIMEOFDAY
-   struct timeval start,stop;
+  struct timeval start,stop;
 #else
-   unsigned long int start,stop;
+  unsigned long int start,stop;
 #endif
 };
 
 xbt_os_timer_t xbt_os_timer_new(void) {
-   return xbt_new0(struct s_xbt_os_timer,1);
+  return xbt_new0(struct s_xbt_os_timer,1);
 }
 void xbt_os_timer_free(xbt_os_timer_t timer) {
-   free (timer);
+  free (timer);
 }
 void xbt_os_timer_start(xbt_os_timer_t timer) {
 #ifdef HAVE_GETTIMEOFDAY
   gettimeofday(&(timer->start), NULL);
-#else 
+#else
   timer->start = (unsigned long int)(time(NULL));
 #endif
 }
 void xbt_os_timer_stop(xbt_os_timer_t timer) {
 #ifdef HAVE_GETTIMEOFDAY
   gettimeofday(&(timer->stop), NULL);
-#else 
+#else
   timer->stop = (unsigned long int)(time(NULL));
 #endif
 }
 double xbt_os_timer_elapsed(xbt_os_timer_t timer) {
 #ifdef 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;
+  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
 }