Permalink
Browse files

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
  • Loading branch information...
1 parent 7ac6b70 commit 471fb33b1a140973a3e3f6168f16b67bee95b4cd @kosaki kosaki committed May 7, 2011
Showing with 7 additions and 1 deletion.
  1. +6 −0 ChangeLog
  2. +1 −1 thread_win32.c
View
@@ -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.
View
@@ -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;

0 comments on commit 471fb33

Please sign in to comment.