/* xbt_os_time.c -- portable interface to time-related functions */
-/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2007-2010, 2012-2013. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
struct s_xbt_os_timer {
#ifdef HAVE_POSIX_GETTIME
struct timespec start, stop, elapse;
-#elif defined(HAVE_GETTIMEOFDAY)
+#elif defined(HAVE_GETTIMEOFDAY) || defined(_XBT_WIN32)
struct timeval start, stop, elapse;
#else
unsigned long int start, stop, elapse;
clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &(timer->start));
#elif defined(_XBT_WIN32)
timer->elapse.tv_sec = 0;
- timer->elapse.tv_nsec = 0;
+ timer->elapse.tv_usec = 0;
# if defined(WIN32_WCE) || (_WIN32_WINNT < 0x0400)
THROW_UNIMPLEMENTED;
# else
clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &(timer->start));
#elif defined(_XBT_WIN32)
timer->elapse.tv_sec += timer->stop.tv_sec - timer->start.tv_sec;
- timer->elapse.tv_nsec += timer->stop.tv_nsec - timer->start.tv_nsec;
+ timer->elapse.tv_usec += timer->stop.tv_usec - timer->start.tv_usec;
# if defined(WIN32_WCE) || (_WIN32_WINNT < 0x0400)
THROW_UNIMPLEMENTED;
# else
clock_gettime(CLOCK_THREAD_CPUTIME_ID, &(timer->start));
#elif defined(_XBT_WIN32)
timer->elapse.tv_sec += timer->stop.tv_sec - timer->start.tv_sec;
- timer->elapse.tv_nsec += timer->stop.tv_nsec - timer->start.tv_nsec;
+ timer->elapse.tv_usec += timer->stop.tv_usec - timer->start.tv_usec;
# if defined(WIN32_WCE) || (_WIN32_WINNT < 0x0400)
THROW_UNIMPLEMENTED;
# else