X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a01e72b3aab192e7f8a4e2f26e9cde6ecc9a94ec..40b9540a553006e50628eb13c451c354a0671d3e:/src/xbt/xbt_os_time.c diff --git a/src/xbt/xbt_os_time.c b/src/xbt/xbt_os_time.c index 6e63660a63..2976a7633e 100644 --- a/src/xbt/xbt_os_time.c +++ b/src/xbt/xbt_os_time.c @@ -20,37 +20,37 @@ double xbt_os_time(void) { #ifdef HAVE_GETTIMEOFDAY - struct timeval tv; - gettimeofday(&tv, NULL); + struct timeval tv; + gettimeofday(&tv, NULL); #elif defined(WIN32) - struct timeval tv; + struct timeval tv; # if defined(WIN32_WCE) || (_WIN32_WINNT < 0x0400) - struct _timeb tm; + struct _timeb tm; - _ftime (&tm); + _ftime (&tm); - tv.tv_sec = tm.time; - tv.tv_usec = tm.millitm * 1000; + tv.tv_sec = tm.time; + tv.tv_usec = tm.millitm * 1000; # else - FILETIME ft; - unsigned __int64 tm; + FILETIME ft; + unsigned __int64 tm; - GetSystemTimeAsFileTime (&ft); - tm = (unsigned __int64)ft.dwHighDateTime << 32; - tm |= ft.dwLowDateTime; - tm /=10; - tm -= 11644473600000000ULL; + 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); + 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)); + return (double)(time(NULL)); #endif /* HAVE_GETTIMEOFDAY? */ - return (double)(tv.tv_sec + tv.tv_usec / 1000000.0); + return (double)(tv.tv_sec + tv.tv_usec / 1000000.0); } void xbt_os_sleep(double sec) { @@ -59,21 +59,21 @@ void xbt_os_sleep(double sec) { (void)usleep( (sec - floor(sec)) * 1000000); #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 } -/* 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 @@ -84,38 +84,38 @@ void xbt_os_sleep(double sec) { 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 }