1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* thread_pthread.c (native_cond_timeout): wrap conditinally used label.

Browse Source 
* thread_pthread.c (native_sleep): remove unused variable.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31990 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2011-06-11 01:21:10 +00:00
parent 71fdb43e6e
commit fe244c77b0
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Sat Jun 11 10:20:52 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* thread_pthread.c (native_cond_timeout): wrap conditinally used label.
* thread_pthread.c (native_sleep): remove unused variable.
Sat Jun 11 10:15:50 2011 Tanaka Akira <akr@fsij.org> Sat Jun 11 10:15:50 2011 Tanaka Akira <akr@fsij.org>
* thread.c (rb_thread_execute_interrupts): use GetThreadPtr to extract * thread.c (rb_thread_execute_interrupts): use GetThreadPtr to extract

3
thread_pthread.c
View File

@ -349,7 +349,9 @@ native_cond_timeout(rb_thread_cond_t *cond, struct timespec timeout_rel)
now.tv_sec = tv.tv_sec; now.tv_sec = tv.tv_sec;
now.tv_nsec = tv.tv_usec * 1000; now.tv_nsec = tv.tv_usec * 1000;
#if USE_MONOTONIC_COND
out: out:
#endif
timeout.tv_sec = now.tv_sec; timeout.tv_sec = now.tv_sec;
timeout.tv_nsec = now.tv_nsec; timeout.tv_nsec = now.tv_nsec;
timeout.tv_sec += timeout_rel.tv_sec; timeout.tv_sec += timeout_rel.tv_sec;
@ -828,7 +830,6 @@ static void
native_sleep(rb_thread_t *th, struct timeval *timeout_tv) native_sleep(rb_thread_t *th, struct timeval *timeout_tv)
{ {
struct timespec timeout; struct timespec timeout;
struct timeval tvn;
pthread_mutex_t *lock = &th->interrupt_lock; pthread_mutex_t *lock = &th->interrupt_lock;
rb_thread_cond_t *cond = &th->native_thread_data.sleep_cond; rb_thread_cond_t *cond = &th->native_thread_data.sleep_cond;