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

thread_pthread: remove HAVE_PTHREAD_ATTR_INIT ifdefs

Browse Source 
ifdefs make code confusing for my easily-confused mind :<
These were added for NaCL support in r36022, and we dropped NaCL
in r60374.  There are more #ifdefs to remove...

[ruby-core:84758] [Misc #14342]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61719 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
normal 2018-01-09 08:26:38 +00:00
parent 60bb4fcdf6
commit e8f40bd8f8
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -2963,7 +2963,7 @@ AS_IF([test x"$enable_pthread" = xyes], [
AC_DEFINE(NON_SCALAR_THREAD_ID) AC_DEFINE(NON_SCALAR_THREAD_ID)
]) ])
AC_CHECK_FUNCS(sched_yield pthread_attr_setinheritsched \ AC_CHECK_FUNCS(sched_yield pthread_attr_setinheritsched \
pthread_attr_get_np pthread_attr_getstack pthread_attr_init \ pthread_attr_get_np pthread_attr_getstack \
pthread_get_stackaddr_np pthread_get_stacksize_np \ pthread_get_stackaddr_np pthread_get_stacksize_np \
thr_stksegment pthread_stackseg_np pthread_getthrds_np \ thr_stksegment pthread_stackseg_np pthread_getthrds_np \
pthread_cond_init pthread_condattr_setclock pthread_condattr_init \ pthread_cond_init pthread_condattr_setclock pthread_condattr_init \

15
thread_pthread.c
View File

@ -991,12 +991,8 @@ native_thread_create(rb_thread_t *th)
thread_debug("create (use cached thread): %p\n", (void *)th); thread_debug("create (use cached thread): %p\n", (void *)th);
} }
else { else {
#ifdef HAVE_PTHREAD_ATTR_INIT
pthread_attr_t attr; pthread_attr_t attr;
pthread_attr_t *const attrp = &attr; pthread_attr_t *const attrp = &attr;
#else
pthread_attr_t *const attrp = NULL;
#endif
const size_t stack_size = th->vm->default_params.thread_machine_stack_size; const size_t stack_size = th->vm->default_params.thread_machine_stack_size;
const size_t space = space_size(stack_size); const size_t space = space_size(stack_size);
@ -1006,7 +1002,6 @@ native_thread_create(rb_thread_t *th)
th->ec->machine.register_stack_maxsize = th->ec->machine.stack_maxsize; th->ec->machine.register_stack_maxsize = th->ec->machine.stack_maxsize;
#endif #endif
#ifdef HAVE_PTHREAD_ATTR_INIT
CHECK_ERR(pthread_attr_init(&attr)); CHECK_ERR(pthread_attr_init(&attr));
# ifdef PTHREAD_STACK_MIN # ifdef PTHREAD_STACK_MIN
@ -1018,7 +1013,7 @@ native_thread_create(rb_thread_t *th)
CHECK_ERR(pthread_attr_setinheritsched(&attr, PTHREAD_INHERIT_SCHED)); CHECK_ERR(pthread_attr_setinheritsched(&attr, PTHREAD_INHERIT_SCHED));
# endif # endif
CHECK_ERR(pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED)); CHECK_ERR(pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED));
#endif
#ifdef get_stack_of #ifdef get_stack_of
native_mutex_lock(&th->interrupt_lock); native_mutex_lock(&th->interrupt_lock);
#endif #endif
@ -1034,9 +1029,7 @@ native_thread_create(rb_thread_t *th)
thread_debug("create: %p (%d)\n", (void *)th, err); thread_debug("create: %p (%d)\n", (void *)th, err);
/* should be done in the created thread */ /* should be done in the created thread */
fill_thread_id_str(th); fill_thread_id_str(th);
#ifdef HAVE_PTHREAD_ATTR_INIT
CHECK_ERR(pthread_attr_destroy(&attr)); CHECK_ERR(pthread_attr_destroy(&attr));
#endif
} }
return err; return err;
} }
@ -1596,7 +1589,6 @@ rb_thread_create_timer_thread(void)
if (!timer_thread.created) { if (!timer_thread.created) {
size_t stack_size = 0; size_t stack_size = 0;
int err; int err;
#ifdef HAVE_PTHREAD_ATTR_INIT
pthread_attr_t attr; pthread_attr_t attr;
rb_vm_t *vm = GET_VM(); rb_vm_t *vm = GET_VM();
@ -1631,7 +1623,6 @@ rb_thread_create_timer_thread(void)
} }
} }
# endif # endif
#endif
#if USE_SLEEPY_TIMER_THREAD #if USE_SLEEPY_TIMER_THREAD
err = setup_communication_pipe(); err = setup_communication_pipe();
@ -1646,7 +1637,6 @@ rb_thread_create_timer_thread(void)
if (timer_thread.created) { if (timer_thread.created) {
rb_bug("rb_thread_create_timer_thread: Timer thread was already created\n"); rb_bug("rb_thread_create_timer_thread: Timer thread was already created\n");
} }
#ifdef HAVE_PTHREAD_ATTR_INIT
err = pthread_create(&timer_thread.id, &attr, thread_timer, &vm->gvl); err = pthread_create(&timer_thread.id, &attr, thread_timer, &vm->gvl);
pthread_attr_destroy(&attr); pthread_attr_destroy(&attr);
@ -1660,9 +1650,6 @@ rb_thread_create_timer_thread(void)
stack_size = 0; 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
err = pthread_create(&timer_thread.id, NULL, thread_timer, &vm->gvl);
#endif
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));