From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS63949 64.71.152.0/24 X-Spam-Status: No, score=-2.2 required=3.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE, RDNS_NONE,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=no autolearn_force=no version=3.4.0 Received: from 80x24.org (unknown [64.71.152.64]) by dcvr.yhbt.net (Postfix) with ESMTP id 3E2B11F404 for ; Tue, 9 Jan 2018 07:37:59 +0000 (UTC) From: Eric Wong To: spew@80x24.org Subject: [PATCH] thread_pthread: remove HAVE_PTHREAD_ATTR_INIT ifdefs Date: Tue, 9 Jan 2018 07:37:59 +0000 Message-Id: <20180109073759.7206-1-e@80x24.org> List-Id: 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... --- configure.ac | 2 +- thread_pthread.c | 15 +-------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index 90ce91bf7c..37e50fe47d 100644 --- a/configure.ac +++ b/configure.ac @@ -2963,7 +2963,7 @@ AS_IF([test x"$enable_pthread" = xyes], [ AC_DEFINE(NON_SCALAR_THREAD_ID) ]) 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 \ thr_stksegment pthread_stackseg_np pthread_getthrds_np \ pthread_cond_init pthread_condattr_setclock pthread_condattr_init \ diff --git a/thread_pthread.c b/thread_pthread.c index 13d6dcb04d..5248285dd7 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -991,12 +991,8 @@ native_thread_create(rb_thread_t *th) thread_debug("create (use cached thread): %p\n", (void *)th); } else { -#ifdef HAVE_PTHREAD_ATTR_INIT pthread_attr_t 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 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; #endif -#ifdef HAVE_PTHREAD_ATTR_INIT CHECK_ERR(pthread_attr_init(&attr)); # ifdef PTHREAD_STACK_MIN @@ -1018,7 +1013,7 @@ native_thread_create(rb_thread_t *th) CHECK_ERR(pthread_attr_setinheritsched(&attr, PTHREAD_INHERIT_SCHED)); # endif CHECK_ERR(pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED)); -#endif + #ifdef get_stack_of native_mutex_lock(&th->interrupt_lock); #endif @@ -1034,9 +1029,7 @@ native_thread_create(rb_thread_t *th) thread_debug("create: %p (%d)\n", (void *)th, err); /* should be done in the created thread */ fill_thread_id_str(th); -#ifdef HAVE_PTHREAD_ATTR_INIT CHECK_ERR(pthread_attr_destroy(&attr)); -#endif } return err; } @@ -1596,7 +1589,6 @@ rb_thread_create_timer_thread(void) if (!timer_thread.created) { size_t stack_size = 0; int err; -#ifdef HAVE_PTHREAD_ATTR_INIT pthread_attr_t attr; rb_vm_t *vm = GET_VM(); @@ -1632,7 +1624,6 @@ rb_thread_create_timer_thread(void) } } # endif -#endif #if USE_SLEEPY_TIMER_THREAD err = setup_communication_pipe(); @@ -1647,7 +1638,6 @@ rb_thread_create_timer_thread(void) if (timer_thread.created) { 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); pthread_attr_destroy(&attr); @@ -1661,9 +1651,6 @@ rb_thread_create_timer_thread(void) stack_size = 0; 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) { rb_warn("pthread_create failed for timer: %s, scheduling broken", strerror(err)); -- EW