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: AS43350 46.166.144.0/21 X-Spam-Status: No, score=-1.2 required=3.0 tests=BAYES_00,RCVD_IN_MSPIKE_BL, RCVD_IN_MSPIKE_ZBI,RCVD_IN_XBL,RDNS_NONE,SPF_FAIL,SPF_HELO_FAIL, TO_EQ_FM_DIRECT_MX,TO_EQ_FM_DOM_SPF_FAIL,TO_EQ_FM_SPF_FAIL shortcircuit=no autolearn=no autolearn_force=no version=3.4.0 Received: from 80x24.org (unknown [46.166.148.177]) by dcvr.yhbt.net (Postfix) with ESMTP id ACF321FC19 for ; Fri, 24 Mar 2017 19:52:57 +0000 (UTC) From: Eric Wong To: yahns-public@yhbt.net Subject: [PATCH] avoid Thread#[] and Thread#[]= across threads Date: Fri, 24 Mar 2017 19:52:55 +0000 Message-Id: <20170324195255.24309-1-yahns-public@yhbt.net> List-Id: Support for it may be removed in future versions of Ruby(*), and we actually do not need to waste time looping when a instance variable will do. (*) https://bugs.ruby-lang.org/issues/13245 --- lib/yahns/acceptor.rb | 6 +++--- lib/yahns/server.rb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/yahns/acceptor.rb b/lib/yahns/acceptor.rb index 7ab9f60..7340a1a 100644 --- a/lib/yahns/acceptor.rb +++ b/lib/yahns/acceptor.rb @@ -24,7 +24,7 @@ def ac_quit close return true end - @thrs.each { |t| t[:yahns_quit] = true } + @quit = true return true if __ac_quit_done? @thrs.each do @@ -42,10 +42,10 @@ def ac_quit end def spawn_acceptor(nr, logger, client_class) + @quit = false @thrs = nr.times.map do Thread.new do queue = client_class.queue - t = Thread.current accept_flags = Kgio::SOCK_NONBLOCK | Kgio::SOCK_CLOEXEC qev_flags = client_class.superclass::QEV_FLAGS begin @@ -64,7 +64,7 @@ def spawn_acceptor(nr, logger, client_class) sleep 1 # let other threads do some work rescue => e Yahns::Log.exception(logger, "accept loop", e) - end until t[:yahns_quit] + end until @quit end end end diff --git a/lib/yahns/server.rb b/lib/yahns/server.rb index 00e5f15..861b919 100644 --- a/lib/yahns/server.rb +++ b/lib/yahns/server.rb @@ -451,7 +451,7 @@ def quit_finish @queues.each(&:close).clear # we must not let quitter get GC-ed if we have any worker threads leftover - @wthr.each { |t| t[:yahns_quitter] = quitter } + @quitter = quitter quitter.close rescue => e -- EW