From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.2 required=3.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 31E691F56E for ; Wed, 4 Oct 2023 03:49:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1696391375; bh=YaAFSorcRtzrw95kg3rw405EMb7SVDQ0bQI00u+reHE=; h=From:To:Subject:Date:In-Reply-To:References:From; b=k7++5bVNmMmvu3nx/o7nUlB7KCTAlPjijselAkF/Cr6ckcsD8DmwVPQOKwPsctuoO OUTo2YV5ZTWxP0NyzIuzYn2VlbSrtC3uXbUWejgZuoHXXe1QB5hiXEPGQT2U1DGLiw Sm6r8gJ2IFA0Nsxh5arTZG+hmyvZvFlKIHrGcN58= From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 11/21] lei: keep signals blocked on daemon shutdown Date: Wed, 4 Oct 2023 03:49:23 +0000 Message-ID: <20231004034933.3343930-12-e@80x24.org> In-Reply-To: <20231004034933.3343930-1-e@80x24.org> References: <20231004034933.3343930-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: Since we completely shut down all workers before exiting, we no longer have to care about missing SIGCHLD wakeups during shutdown. --- lib/PublicInbox/LEI.pm | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm index c9ad46e2..d611f5c3 100644 --- a/lib/PublicInbox/LEI.pm +++ b/lib/PublicInbox/LEI.pm @@ -1365,9 +1365,6 @@ sub lazy_start { my $sig = { CHLD => \&PublicInbox::DS::enqueue_reap }; $sig->{$_} = $quit for qw(QUIT INT TERM); $sig->{$_} = \&PublicInbox::Config::noop for qw(HUP USR1 USR2); - # for EVFILT_SIGNAL and signalfd behavioral difference: - my @kq_ign = eval { require PublicInbox::DSKQXS } ? keys(%$sig) : (); - require PublicInbox::DirIdle; local $dir_idle = PublicInbox::DirIdle->new(sub { # just rely on wakeup to hit post_loop_do @@ -1390,16 +1387,6 @@ sub lazy_start { # $daemon pipe to `lei' closed, main loop begins: eval { PublicInbox::DS::event_loop($sig, $oldset) }; warn "event loop error: $@\n" if $@; - - # EVFILT_SIGNAL will get a duplicate of all the signals it was sent - local @SIG{@kq_ign} = map 'IGNORE', @kq_ign; - PublicInbox::DS::sig_setmask($oldset) if @kq_ign; - - # exit() may trigger waitpid via various DESTROY, ensure interruptible - local $SIG{TERM} = sub { exit(POSIX::SIGTERM + 128) }; - local $SIG{INT} = sub { exit(POSIX::SIGINT + 128) }; - local $SIG{QUIT} = sub { exit(POSIX::SIGQUIT + 128) }; - PublicInbox::DS::sig_setmask($oldset) if !@kq_ign; dump_and_clear_log(); exit($exit_code // 0); }