archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-18 10:03:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

merges r31482 from trunk into ruby_1_9_2.

Browse source 
--
* 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/branches/ruby_1_9_2@31832 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2011-05-31 00:11:44 +00:00
parent eff01662e4
commit d3398c196b
3 changed files with 21 additions and 4 deletions
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.
Fri May 6 15:01:11 2011 URABE Shyouhei <shyouhei@ruby-lang.org> Fri May 6 15:01:11 2011 URABE Shyouhei <shyouhei@ruby-lang.org>
* ext/syck/rubyext.c (mktime_do): avoid buffer overrun, by * ext/syck/rubyext.c (mktime_do): avoid buffer overrun, by

18
thread_pthread.c
View file

@ -133,10 +133,22 @@ native_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex)
static int static int
native_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex, struct timespec *ts) native_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex, struct timespec *ts)
{ {
int r = pthread_cond_timedwait(cond, mutex, ts); int r;
if (r != 0 && r != ETIMEDOUT && r != EINTR /* Linux */) {
/*
* 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, mutex, ts);
} while (r == EINTR);
if (r != 0 && r != ETIMEDOUT) {
rb_bug_errno("pthread_cond_timedwait", r); rb_bug_errno("pthread_cond_timedwait", r);
} }
return r; return r;
} }
@ -789,7 +801,7 @@ thread_timer(void *dummy)
while (system_working > 0) { while (system_working > 0) {
int err = WAIT_FOR_10MS(); int err = WAIT_FOR_10MS();
if (err == ETIMEDOUT); if (err == ETIMEDOUT);
else if (err == 0 || err == EINTR) { else if (err == 0) {
if (rb_signal_buff_size() == 0) break; if (rb_signal_buff_size() == 0) break;
} }
else rb_bug_errno("thread_timer/timedwait", err); else rb_bug_errno("thread_timer/timedwait", err);

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2" #define RUBY_VERSION "1.9.2"
#define RUBY_PATCHLEVEL 249 #define RUBY_PATCHLEVEL 250
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1