X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7236b52536dbdf823a94fef2a07536f548ddcc21..59c3feb27d1b34145342c079833725efc5dac5c5:/src/xbt/xbt_os_time.c

diff --git a/src/xbt/xbt_os_time.c b/src/xbt/xbt_os_time.c
index bcdf8adfff..1aa4faf49c 100644
--- a/src/xbt/xbt_os_time.c
+++ b/src/xbt/xbt_os_time.c
@@ -4,7 +4,7 @@
 /*  no system header should be loaded out of this file so that we have only */
 /*  one file to check when porting to another OS                            */
 
-/* Copyright (c) 2004 Martin Quinson. All rights reserved.                  */
+/* Copyright (c) 2004-2007 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. */
@@ -18,58 +18,41 @@
 
 #ifdef WIN32
 #include <sys\timeb.h>
-#include <errno.h>
+#endif
 
-int 
-gettimeofday(struct timeval *tv, struct timezone *tz)
-{
-	
-	#if defined(WIN32_WCE) || (_WIN32_WINNT < 0x0400)
+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;
-	#else
+
+	_ftime (&tm);
+
+	tv.tv_sec = tm.time;
+	tv.tv_usec = tm.millitm * 1000;
+
+#  else
 	FILETIME  ft;
 	unsigned __int64 tm;
-	#endif
-	
-	if (!tv) 
-	{
-		errno = EINVAL;
-		return -1;
-	}
-	
-	#if defined(WIN32_WCE) || (_WIN32_WINNT < 0x0400)
-	_ftime (&tm);
-	
-    tv->tv_sec = tm.time;
-    tv->tv_usec = tm.millitm * 1000;
-	#else
+
 	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
-	
-	
-	
-	return 0;
-}
-#endif
 
-double xbt_os_time(void) {
-#ifdef HAVE_GETTIMEOFDAY
-  struct timeval tv;
+	tv.tv_sec  = (long) (tm / 1000000L);
+	tv.tv_usec = (long) (tm % 1000000L);
+#  endif /* windows version checker */
 
-  gettimeofday(&tv, NULL);
+#else  /* not windows, no gettimeofday => poor resolution */
+return (double)(time(NULL));
+#endif /* HAVE_GETTIMEOFDAY? */
 
-  return (double)(tv.tv_sec + tv.tv_usec / 1000000.0);
-#else
-  /* 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) {