From 873dd9bc4568a73202977ee1a5ac1dc2a7ff86fb Mon Sep 17 00:00:00 2001 From: akr Date: Wed, 21 Aug 2013 08:34:48 +0000 Subject: [PATCH] * gc.c (getrusage_time): Fallback clock_gettime to getrusage when clock_gettime fails. Reported by Eric Saxby. [ruby-core:56762] [Bug #8805] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42639 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 +++++ gc.c | 73 ++++++++++++++++++++++++++++++++----------------------- 2 files changed, 48 insertions(+), 31 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5f572485d5..612da39d0b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Aug 21 17:34:27 2013 Tanaka Akira + + * gc.c (getrusage_time): Fallback clock_gettime to getrusage when + clock_gettime fails. + Reported by Eric Saxby. [ruby-core:56762] [Bug #8805] + Wed Aug 21 02:32:32 2013 Koichi Sasada * insns.def: fix regexp's once option behavior. diff --git a/gc.c b/gc.c index 1e4c26a64d..2d469cfcdf 100644 --- a/gc.c +++ b/gc.c @@ -5059,43 +5059,54 @@ static double getrusage_time(void) { #if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_PROCESS_CPUTIME_ID) - struct timespec ts; - - if (clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &ts) == 0) { - return ts.tv_sec + ts.tv_nsec * 1e-9; - } - return 0.0; -#elif defined RUSAGE_SELF - struct rusage usage; - struct timeval time; - getrusage(RUSAGE_SELF, &usage); - time = usage.ru_utime; - return time.tv_sec + time.tv_usec * 1e-6; -#elif defined _WIN32 - FILETIME creation_time, exit_time, kernel_time, user_time; - ULARGE_INTEGER ui; - LONG_LONG q; - double t; - - if (GetProcessTimes(GetCurrentProcess(), - &creation_time, &exit_time, &kernel_time, &user_time) == 0) { - return 0.0; + static int try_clock_gettime = 1; + struct timespec ts; + if (try_clock_gettime && clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &ts) == 0) { + return ts.tv_sec + ts.tv_nsec * 1e-9; + } + else { + try_clock_gettime = 0; + } } - memcpy(&ui, &user_time, sizeof(FILETIME)); - q = ui.QuadPart / 10L; - t = (DWORD)(q % 1000000L) * 1e-6; - q /= 1000000L; +#endif + +#ifdef RUSAGE_SELF + { + struct rusage usage; + struct timeval time; + if (getrusage(RUSAGE_SELF, &usage) == 0) { + time = usage.ru_utime; + return time.tv_sec + time.tv_usec * 1e-6; + } + } +#endif + +#ifdef _WIN32 + { + FILETIME creation_time, exit_time, kernel_time, user_time; + ULARGE_INTEGER ui; + LONG_LONG q; + double t; + + if (GetProcessTimes(GetCurrentProcess(), + &creation_time, &exit_time, &kernel_time, &user_time) != 0) { + memcpy(&ui, &user_time, sizeof(FILETIME)); + q = ui.QuadPart / 10L; + t = (DWORD)(q % 1000000L) * 1e-6; + q /= 1000000L; #ifdef __GNUC__ - t += q; + t += q; #else - t += (double)(DWORD)(q >> 16) * (1 << 16); - t += (DWORD)q & ~(~0 << 16); + t += (double)(DWORD)(q >> 16) * (1 << 16); + t += (DWORD)q & ~(~0 << 16); #endif - return t; -#else + return t; + } + } +#endif + return 0.0; -#endif } static inline void