diff options
| author | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-07 03:43:27 +0000 |
|---|---|---|
| committer | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-07 03:43:27 +0000 |
| commit | 471fb33b1a140973a3e3f6168f16b67bee95b4cd (patch) | |
| tree | 9f518ed21a6ecc1452ad38962aa07df5fa0df5a7 | |
| parent | 7ac6b706b418db4311ce64219c6156ec628453de (diff) | |
fix mutex deadlock test hang-up.
* thread_win32.c (abs_timespec_to_timeout_ms): fix 1000x calculation
mistake. (ie fix hang-up native_cond_timedwait())
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31458 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | thread_win32.c | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Sat May 7 12:41:04 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com> + fix mutex deadlock test hang-up. + + * thread_win32.c (abs_timespec_to_timeout_ms): fix 1000x calculation + mistake. (ie fix hang-up native_cond_timedwait()) + Sat May 7 03:14:13 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com> sleep_cond use monotonic time if possible. diff --git a/thread_win32.c b/thread_win32.c index 80c3890975..6c7e0d2669 100644 --- a/thread_win32.c +++ b/thread_win32.c @@ -471,7 +471,7 @@ abs_timespec_to_timeout_ms(struct timespec *ts) gettimeofday(&now, NULL); tv.tv_sec = ts->tv_sec; - tv.tv_usec = ts->tv_nsec; + tv.tv_usec = ts->tv_nsec / 1000; if (!rb_w32_time_subtract(&tv, &now)) return 0; |