kotovalexarian-likes-github
/
ruby--ruby
mirror of https://github.com/ruby/ruby.git
1
0
Fork 0
Code Releases Activity

* thread_pthread.c (native_cond_timedwait): add to care EINTR. 

* thread_pthread.c (thread_timer): remove EINTR check.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31482 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
kosaki 2011-05-08 10:46:27 +00:00
parent 0999333732
commit 19f52b8740
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sun May 8 19:39:16 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* thread_pthread.c (native_cond_timedwait): add to care EINTR.
* thread_pthread.c (thread_timer): remove EINTR check.
Sun May 8 19:04:15 2011 Tadayoshi Funaba <tadf@dotrb.org>
* lib/time.rb (xmlschema): avoid passing any negative numbers.

18
thread_pthread.c
View File

@ -292,10 +292,22 @@ native_cond_wait(rb_thread_cond_t *cond, pthread_mutex_t *mutex)
static int
native_cond_timedwait(rb_thread_cond_t *cond, pthread_mutex_t *mutex, struct timespec *ts)
{
int r = pthread_cond_timedwait(&cond->cond, mutex, ts);
if (r != 0 && r != ETIMEDOUT && r != EINTR /* Linux */) {
int r;
/*
* An old Linux may return EINTR. Even though POSIX says
* "These functions shall not return an error code of [EINTR]".
* http://pubs.opengroup.org/onlinepubs/009695399/functions/pthread_cond_timedwait.html
* Let's hide it from arch generic code.
*/
do {
r = pthread_cond_timedwait(&cond->cond, mutex, ts);
} while (r == EINTR);
if (r != 0 && r != ETIMEDOUT) {
rb_bug_errno("pthread_cond_timedwait", r);
}
return r;
}
@ -997,7 +1009,7 @@ thread_timer(void *dummy)
err = native_cond_timedwait(&timer_thread_cond, &timer_thread_lock,
&timeout);
if (err == ETIMEDOUT);
else if (err == 0 || err == EINTR) {
else if (err == 0) {
if (rb_signal_buff_size() == 0) break;
}
else rb_bug_errno("thread_timer/timedwait", err);