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

thread_pthread: more diagnostics around timer thread creation failures

Browse Source 
However, I don't think EAGAIN on pthread_create can really
be fixed in our code.  I suspect test machines are overloaded.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61716 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
normal 2018-01-09 07:15:44 +00:00
parent aaa18bae72
commit 66e42f4aa6
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
thread_pthread.c
View File

@ -1594,6 +1594,7 @@ static void
rb_thread_create_timer_thread(void) rb_thread_create_timer_thread(void)
{ {
if (!timer_thread.created) { if (!timer_thread.created) {
size_t stack_size = 0;
int err; int err;
#ifdef HAVE_PTHREAD_ATTR_INIT #ifdef HAVE_PTHREAD_ATTR_INIT
pthread_attr_t attr; pthread_attr_t attr;
@ -1621,10 +1622,14 @@ rb_thread_create_timer_thread(void)
THREAD_DEBUG != 0 THREAD_DEBUG != 0
#endif #endif
}; };
size_t stack_size = PTHREAD_STACK_MIN; /* may be dynamic, get only once */ stack_size = PTHREAD_STACK_MIN; /* may be dynamic, get only once */
if (stack_size < min_size) stack_size = min_size; if (stack_size < min_size) stack_size = min_size;
if (needs_more_stack) stack_size += BUFSIZ; if (needs_more_stack) stack_size += BUFSIZ;
pthread_attr_setstacksize(&attr, stack_size); err = pthread_attr_setstacksize(&attr, stack_size);
if (err != 0) {
rb_bug("pthread_attr_setstacksize(.., %"PRIuSIZE") failed: %s",
stack_size, strerror(err));
}
} }
# endif # endif
#endif #endif
@ -1653,6 +1658,7 @@ rb_thread_create_timer_thread(void)
* storage can cause small stack sizes to fail. So lets hope the * storage can cause small stack sizes to fail. So lets hope the
* default stack size is enough for them: * default stack size is enough for them:
*/ */
stack_size = 0;
err = pthread_create(&timer_thread.id, NULL, thread_timer, &vm->gvl); err = pthread_create(&timer_thread.id, NULL, thread_timer, &vm->gvl);
} }
#else #else
@ -1661,6 +1667,12 @@ rb_thread_create_timer_thread(void)
if (err != 0) { if (err != 0) {
rb_warn("pthread_create failed for timer: %s, scheduling broken", rb_warn("pthread_create failed for timer: %s, scheduling broken",
strerror(err)); strerror(err));
if (stack_size) {
rb_warn("timer thread stack size: %"PRIuSIZE, stack_size);
}
else {
rb_warn("timer thread stack size: system default");
}
#if USE_SLEEPY_TIMER_THREAD #if USE_SLEEPY_TIMER_THREAD
CLOSE_INVALIDATE(normal[0]); CLOSE_INVALIDATE(normal[0]);
CLOSE_INVALIDATE(normal[1]); CLOSE_INVALIDATE(normal[1]);