diff options
author | kouji <kouji@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-12 09:55:06 +0000 |
---|---|---|
committer | kouji <kouji@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-12 09:55:06 +0000 |
commit | 741cc678003a82df9afaca60c8027f84170460bb (patch) | |
tree | a3310375e71095275b4b09dd3eb1102f24869b7a | |
parent | 608cb2ed32549cb7fd8fa33033c3482d1465acfc (diff) |
* gc.c (getrusage_time): Returned effective value on Windows.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18536 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | gc.c | 21 |
2 files changed, 25 insertions, 0 deletions
@@ -1,3 +1,7 @@ +Tue Aug 12 18:51:29 2008 TAKAO Kouji <kouji@takao7.net> + + * gc.c (getrusage_time): Returned effective value on Windows. + Tue Aug 12 18:51:11 2008 Tanaka Akira <akr@fsij.org> * transcode.c (rb_trans_open): free ts before raise. @@ -119,6 +119,27 @@ getrusage_time(void) 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; + } + memcpy(&ui, &user_time, sizeof(FILETIME)); + q = ui.QuadPart / 10L; + t = (DWORD)(q % 1000000L) * 1e-6; + q /= 1000000L; +#ifdef __GNUC__ + t += q; +#else + t += (double)(DWORD)(q >> 16) * (1 << 16); + t += (DWORD)q & ~(~0 << 16); +#endif #else return 0.0; #endif |