X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e1ef5a6b6a94ddc9d70d61451ad064e367132def..0d2bc3f331786a100a0c79fd05314dba2dd8c06b:/src/xbt/xbt_os_time.c diff --git a/src/xbt/xbt_os_time.c b/src/xbt/xbt_os_time.c index de45dd716d..8187da1e9f 100644 --- 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 @@ -360,7 +360,7 @@ void xbt_os_threadtimer_start(xbt_os_timer_t timer) #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; - int count = THREAD_BASIC_INFO_COUNT; + 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); @@ -371,7 +371,6 @@ void xbt_os_threadtimer_start(xbt_os_timer_t timer) timer->elapse.tv_usec = 0; gettimeofday(&(timer->start), NULL); #elif defined(_XBT_WIN32) - struct timeval tv; # if defined(WIN32_WCE) || (_WIN32_WINNT < 0x0400) THROW_UNIMPLEMENTED; # else @@ -400,7 +399,7 @@ void xbt_os_threadtimer_resume(xbt_os_timer_t timer) #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; - int count = THREAD_BASIC_INFO_COUNT; + 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); @@ -437,7 +436,7 @@ void xbt_os_threadtimer_stop(xbt_os_timer_t timer) #ifdef HAVE_POSIX_GETTIME clock_gettime(CLOCK_THREAD_CPUTIME_ID, &(timer->stop)); #elif defined(HAVE_GETTIMEOFDAY) && defined(__MACH__) && defined(__APPLE__) - int count = THREAD_BASIC_INFO_COUNT; + 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);