summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--thread_pthread.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a2ef7e2a3d..9d06849eea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jun 1 21:57:08 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * thread_pthread.c (native_sleep): fix 1000times calculation error.
+ this is a regression since r31457. [Bug #4808] [ruby-dev:43606]
+
Wed Jun 1 17:19:16 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* thread_pthread.c: remove unused macro.
diff --git a/thread_pthread.c b/thread_pthread.c
index 0a55744650..11bf098bf7 100644
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -836,7 +836,7 @@ native_sleep(rb_thread_t *th, struct timeval *timeout_tv)
struct timespec timeout_rel;
timeout_rel.tv_sec = timeout_tv->tv_sec;
- timeout_rel.tv_nsec = timeout_tv->tv_usec;
+ timeout_rel.tv_nsec = timeout_tv->tv_usec * 1000;
timeout = native_cond_timeout(cond, timeout_rel);
}