diff options
author | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-06-01 13:03:25 +0000 |
---|---|---|
committer | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-06-01 13:03:25 +0000 |
commit | 859da834551657478bec39e55058e987780fcc54 (patch) | |
tree | bd418f1b6d29126b35aa443cfd94fe49abcad3db | |
parent | dcc1f64cb0372de4a05ecc3989f07a3460d6ba6a (diff) |
* thread_pthread.c (native_sleep): fix 1000times calculation error.
this is a regression since r31457. [Bug #4808] [ruby-dev:43606]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31893 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | thread_pthread.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -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); } |