From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS28753 185.17.144.0/22 X-Spam-Status: No, score=-2.9 required=3.0 tests=AWL,BAYES_00,RCVD_IN_XBL, RDNS_NONE,SPF_FAIL,SPF_HELO_FAIL,TO_EQ_FM_DOM_SPF_FAIL shortcircuit=no autolearn=no autolearn_force=no version=3.4.1 Received: from 80x24.org (unknown [185.17.146.119]) by dcvr.yhbt.net (Postfix) with ESMTP id 078E51F954 for ; Sun, 19 Aug 2018 19:39:56 +0000 (UTC) From: Eric Wong To: spew@80x24.org Subject: [PATCH] thread_sync.c (rb_mutex_sleep): disable interrupt checking in ensure Date: Sun, 19 Aug 2018 19:39:54 +0000 Message-Id: <20180819193954.13807-1-e@80x24.org> List-Id: --- thread_sync.c | 47 +++++++++++++++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/thread_sync.c b/thread_sync.c index 19f14fa958..79eb1768c4 100644 --- a/thread_sync.c +++ b/thread_sync.c @@ -221,15 +221,8 @@ rb_mutex_trylock(VALUE self) */ static const rb_thread_t *patrol_thread = NULL; -/* - * call-seq: - * mutex.lock -> self - * - * Attempts to grab the lock and waits if it isn't available. - * Raises +ThreadError+ if +mutex+ was locked by the current thread. - */ -VALUE -rb_mutex_lock(VALUE self) +static VALUE +do_mutex_lock(VALUE self, int interruptible_p) { rb_thread_t *th = GET_THREAD(); rb_mutex_t *mutex; @@ -290,16 +283,37 @@ rb_mutex_lock(VALUE self) th->vm->sleeper--; if (mutex->th == th) mutex_locked(th, self); - RUBY_VM_CHECK_INTS_BLOCKING(th->ec); /* may release mutex */ - if (!mutex->th) { - mutex->th = th; - mutex_locked(th, self); - } + if (interruptible_p) { + RUBY_VM_CHECK_INTS_BLOCKING(th->ec); /* may release mutex */ + if (!mutex->th) { + mutex->th = th; + mutex_locked(th, self); + } + } } } return self; } +static VALUE +mutex_lock_uninterruptible(VALUE self) +{ + return do_mutex_lock(self, 0); +} + +/* + * call-seq: + * mutex.lock -> self + * + * Attempts to grab the lock and waits if it isn't available. + * Raises +ThreadError+ if +mutex+ was locked by the current thread. + */ +VALUE +rb_mutex_lock(VALUE self) +{ + return do_mutex_lock(self, 1); +} + /* * call-seq: * mutex.owned? -> true or false @@ -462,14 +476,15 @@ rb_mutex_sleep(VALUE self, VALUE timeout) rb_mutex_unlock(self); beg = time(0); if (NIL_P(timeout)) { - rb_ensure(rb_mutex_sleep_forever, Qnil, rb_mutex_lock, self); + rb_ensure(rb_mutex_sleep_forever, Qnil, mutex_lock_uninterruptible, self); } else { struct timespec ts; VALUE tsp = (VALUE)timespec_for(&ts, &t); - rb_ensure(rb_mutex_wait_for, tsp, rb_mutex_lock, self); + rb_ensure(rb_mutex_wait_for, tsp, mutex_lock_uninterruptible, self); } + RUBY_VM_CHECK_INTS_BLOCKING(GET_EC()); end = time(0) - beg; return INT2FIX(end); } -- EW