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

Addtitional fix for previous commit.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32247 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2011-06-27 02:45:30 +00:00
parent 657e9e2879
commit c32869dfeb
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
thread_pthread.c
View File

@ -1018,7 +1018,7 @@ rb_thread_wakeup_timer_thread(void)
} }
} }
static int static ssize_t
consume_communication_pipe(void) consume_communication_pipe(void)
{ {
const size_t buff_size = 1024; const size_t buff_size = 1024;
@ -1058,7 +1058,6 @@ thread_timer(void *p)
{ {
rb_global_vm_lock_t *gvl = (rb_global_vm_lock_t *)p; rb_global_vm_lock_t *gvl = (rb_global_vm_lock_t *)p;
int result; int result;
int len;
struct timeval timeout; struct timeval timeout;
if (TT_DEBUG) fprintf(stderr, "start timer thread\n"); if (TT_DEBUG) fprintf(stderr, "start timer thread\n");
@ -1091,7 +1090,7 @@ thread_timer(void *p)
/* maybe timeout */ /* maybe timeout */
} }
else if (result > 0) { else if (result > 0) {
len = consume_communication_pipe(); (void)consume_communication_pipe();
} }
else { /* result < 0 */ else { /* result < 0 */
if (errno == EINTR) { if (errno == EINTR) {