From: navarro Date: Wed, 20 Jun 2012 12:12:43 +0000 (+0200) Subject: Replace usleep for nanosleep X-Git-Tag: v3_8~559^2 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/a94c908b9acf9a86f175c7f1c29b2c52e72eb2d2 Replace usleep for nanosleep --- diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake index 5a0bf0cdee..bf896dd282 100644 --- a/buildtools/Cmake/CompleteInFiles.cmake +++ b/buildtools/Cmake/CompleteInFiles.cmake @@ -131,7 +131,7 @@ CHECK_INCLUDE_FILE("stdio.h" HAVE_STDIO_H) CHECK_INCLUDE_FILE("linux/futex.h" HAVE_FUTEX_H) CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY) -CHECK_FUNCTION_EXISTS(usleep HAVE_USLEEP) +CHECK_FUNCTION_EXISTS(nanosleep HAVE_NANOSLEEP) CHECK_FUNCTION_EXISTS(getdtablesize HAVE_GETDTABLESIZE) CHECK_FUNCTION_EXISTS(sysconf HAVE_SYSCONF) CHECK_FUNCTION_EXISTS(readv HAVE_READV) diff --git a/buildtools/Cmake/PrintArgs.cmake b/buildtools/Cmake/PrintArgs.cmake index 1e06c8537b..8518ffefe9 100644 --- a/buildtools/Cmake/PrintArgs.cmake +++ b/buildtools/Cmake/PrintArgs.cmake @@ -54,7 +54,7 @@ if(enable_print_message) message("") message("HAVE_GETTIMEOFDAY ...........: ${HAVE_GETTIMEOFDAY}") - message("HAVE_USLEEP .................: ${HAVE_USLEEP}") + message("HAVE_NANOSLEEP ..............: ${HAVE_NANOSLEEP}") message("HAVE_GETDTABLESIZE ..........: ${HAVE_GETDTABLESIZE}") message("HAVE_SYSCONF ................: ${HAVE_SYSCONF}") message("HAVE_READV ..................: ${HAVE_READV}") diff --git a/buildtools/Cmake/src/gras_config.h.in b/buildtools/Cmake/src/gras_config.h.in index e637923e2f..7aa25e2461 100644 --- a/buildtools/Cmake/src/gras_config.h.in +++ b/buildtools/Cmake/src/gras_config.h.in @@ -232,8 +232,8 @@ /* Define to 1 if you have the header file. */ #cmakedefine HAVE_UNISTD_H @HAVE_UNISTD_H@ -/* Define to 1 if you have the `usleep' function. */ -#cmakedefine HAVE_USLEEP @HAVE_USLEEP@ +/* Define to 1 if you have the `nanosleep' function. */ +#cmakedefine HAVE_NANOSLEEP @HAVE_NANOSLEEP@ /* Define to 1 if you have the header file. */ #cmakedefine HAVE_VALGRIND_VALGRIND_H @HAVE_VALGRIND_VALGRIND_H@ diff --git a/src/win32/compiler/borland.h b/src/win32/compiler/borland.h index 50d9f02805..d58c6dcde6 100644 --- a/src/win32/compiler/borland.h +++ b/src/win32/compiler/borland.h @@ -180,9 +180,9 @@ #undef HAVE_SYSCONF #endif -/* No `usleep' function. */ -#if defined(HAVE_USLEEP) -#undef HAVE_USLEEP +/* No `nanosleep' function. */ +#if defined(HAVE_NANOSLEEP) +#undef HAVE_NANOSLEEP #endif /* The compiler has the `vsnprintf' function. */ diff --git a/src/win32/compiler/visualc.h b/src/win32/compiler/visualc.h index 2f22ad4668..927349ed19 100644 --- a/src/win32/compiler/visualc.h +++ b/src/win32/compiler/visualc.h @@ -188,9 +188,9 @@ #undef HAVE_SYSCONF #endif -/* No `usleep' function. */ -#if defined(HAVE_USLEEP) -#undef HAVE_USLEEP +/* No `nanosleep' function. */ +#if defined(HAVE_NANOSLEEP) +#undef HAVE_NANOSLEEP #endif /* The compiler has the `vsnprintf' function. */ diff --git a/src/xbt/xbt_os_time.c b/src/xbt/xbt_os_time.c index 7b54af16e1..dc72c91b13 100644 --- a/src/xbt/xbt_os_time.c +++ b/src/xbt/xbt_os_time.c @@ -59,14 +59,14 @@ void xbt_os_sleep(double sec) #ifdef _XBT_WIN32 Sleep((floor(sec) * 1000) + ((sec - floor(sec)) * 1000)); -#elif HAVE_USLEEP - sleep(sec); - (void) usleep((sec - floor(sec)) * 1000000); - -#else /* don't have usleep. Use select to sleep less than one second */ +#elif HAVE_NANOSLEEP + struct timespec ts; + ts.tv_sec = sec; + ts.tv_nsec = (sec - floor(sec)) * 1e9; + nanosleep (&ts, NULL); +#else /* don't have nanosleep. Use select to sleep less than one second */ struct timeval timeout; - timeout.tv_sec = (unsigned long) (sec); timeout.tv_usec = (sec - floor(sec)) * 1000000; diff --git a/tools/tesh/run_context.c b/tools/tesh/run_context.c index 756666d4ef..ea3ec6e47a 100644 --- a/tools/tesh/run_context.c +++ b/tools/tesh/run_context.c @@ -13,6 +13,7 @@ #include #include #include +#include /* floor */ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(tesh); @@ -133,7 +134,10 @@ static void rctx_armageddon_kill_one(rctx_t initiator, const char *filepos, if (!rctx->reader_done) { rctx->interrupted = 1; kill(rctx->pid, SIGTERM); - usleep(100); + struct timespec ts; + ts.tv_sec = 0; + ts.tv_nsec = (100e-6 - floor(100e-6)) * 1e9; + nanosleep (&ts, NULL); kill(rctx->pid, SIGKILL); } xbt_os_mutex_release(rctx->interruption); @@ -169,7 +173,10 @@ void rctx_armageddon(rctx_t initiator, int exitcode) } /* Give runner threads a chance to acknowledge the processes deaths */ - usleep(10000); + struct timespec ts; + ts.tv_sec = 0; + ts.tv_nsec = (10000e-6 - floor(10000e-6)) * 1e9; + nanosleep (&ts, NULL); /* Ensure that nobody is running rctx_wait on exit */ if (fg_job) xbt_os_mutex_acquire(rctx->interruption); @@ -410,8 +417,12 @@ static void *thread_writer(void *r) } XBT_DEBUG("written %d chars so far", posw); - if (got <= 0) - usleep(100); + if (got <= 0){ + struct timespec ts; + ts.tv_sec = 0; + ts.tv_nsec = (100e-6 - floor(100e-6)) * 1e9; + nanosleep (&ts, NULL); + } } rctx->input->data[0] = '\0'; rctx->input->used = 0; @@ -438,7 +449,10 @@ static void *thread_reader(void *r) buffout[posr] = '\0'; xbt_strbuff_append(rctx->output_got, buffout); } else { - usleep(100); + struct timespec ts; + ts.tv_sec = 0; + ts.tv_nsec = (100e-6 - floor(100e-6)) * 1e9; + nanosleep (&ts, NULL); } } while (!rctx->timeout && posr != 0); free(buffout); @@ -697,7 +711,10 @@ void *rctx_wait(void *r) /* Wait for the child to die or the timeout to happen (or an armageddon to happen) */ while (!rctx->reader_done && (rctx->end_time < 0 || rctx->end_time >= now)) { - usleep(100); + struct timespec ts; + ts.tv_sec = 0; + ts.tv_nsec = (100e-6 - floor(100e-6)) * 1e9; + nanosleep (&ts, NULL); now = time(NULL); } @@ -706,7 +723,10 @@ void *rctx_wait(void *r) XBT_INFO("<%s> timeouted. Kill the process.", rctx->filepos); rctx->timeout = 1; kill(rctx->pid, SIGTERM); - usleep(100); + struct timespec ts; + ts.tv_sec = 0; + ts.tv_nsec = (100e-6 - floor(100e-6)) * 1e9; + nanosleep (&ts, NULL); kill(rctx->pid, SIGKILL); }