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

* thread_pthread.c (thread_timer): add to care a spurious wakeup.

Browse Source 
When native_cond_timedwait() return 0 by spurious wakeup, we
  don't have to neither 1) call timer_thread_function and 2)
  exit the timer thread.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31926 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
kosaki 2011-06-05 12:48:23 +00:00
parent 64097bd733
commit 4010bc1e84
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Sun Jun 5 21:38:51 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* thread_pthread.c (thread_timer): add to care a spurious wakeup.
When native_cond_timedwait() return 0 by spurious wakeup, we
don't have to neither 1) call timer_thread_function and 2)
exit the timer thread.
Sun Jun 5 17:50:01 2011 Tadayoshi Funaba <tadf@dotrb.org> Sun Jun 5 17:50:01 2011 Tadayoshi Funaba <tadf@dotrb.org>
* ext/date/date_core.c (m_real_cwyear): new. derived from m_cwyear. * ext/date/date_core.c (m_real_cwyear): new. derived from m_cwyear.

24
thread_pthread.c
View File

@ -993,27 +993,33 @@ static void *
thread_timer(void *dummy) thread_timer(void *dummy)
{ {
struct timespec timeout_10ms; struct timespec timeout_10ms;
struct timespec timeout;
timeout_10ms.tv_sec = 0; timeout_10ms.tv_sec = 0;
timeout_10ms.tv_nsec = 10 * 1000 * 1000; timeout_10ms.tv_nsec = 10 * 1000 * 1000;
native_mutex_lock(&timer_thread_lock); native_mutex_lock(&timer_thread_lock);
native_cond_broadcast(&timer_thread_cond); native_cond_broadcast(&timer_thread_cond);
timeout = native_cond_timeout(&timer_thread_cond, timeout_10ms);
while (system_working > 0) { while (system_working > 0) {
int err; int err;
struct timespec timeout;
timeout = native_cond_timeout(&timer_thread_cond, timeout_10ms);
err = native_cond_timedwait(&timer_thread_cond, &timer_thread_lock, err = native_cond_timedwait(&timer_thread_cond, &timer_thread_lock,
&timeout); &timeout);
if (err == ETIMEDOUT); if (err == 0) {
else if (err == 0) { /*
if (rb_signal_buff_size() == 0) break; * Spurious wakeup or native_stop_timer_thread() was called.
* We need to recheck a system_working state.
*/
} }
else rb_bug_errno("thread_timer/timedwait", err); else if (err == ETIMEDOUT) {
ping_signal_thread_list();
ping_signal_thread_list(); timer_thread_function(dummy);
timer_thread_function(dummy); timeout = native_cond_timeout(&timer_thread_cond, timeout_10ms);
}
else
rb_bug_errno("thread_timer/timedwait", err);
} }
native_mutex_unlock(&timer_thread_lock); native_mutex_unlock(&timer_thread_lock);
return NULL; return NULL;