From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00, URIBL_BLOCKED shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id BDB791FA13 for ; Mon, 31 Aug 2020 04:41:41 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 06/11] watch: block signals before fork on non-signalfd/kevent systems Date: Mon, 31 Aug 2020 04:41:35 +0000 Message-Id: <20200831044140.17027-7-e@80x24.org> In-Reply-To: <20200831044140.17027-1-e@80x24.org> References: <20200831044140.17027-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: In case there's non-Linux or BSD users w/o IO::KQueue, we shouldn't let signal handlers fire in the child processes. The child processes always assumed signals were blocked by the parent, so no changes were necessary, there. --- lib/PublicInbox/Watch.pm | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/lib/PublicInbox/Watch.pm b/lib/PublicInbox/Watch.pm index 0bb92d0a..2698c44a 100644 --- a/lib/PublicInbox/Watch.pm +++ b/lib/PublicInbox/Watch.pm @@ -589,6 +589,7 @@ sub watch_atfork_child ($) { sub watch_atfork_parent ($) { my ($self) = @_; _done_for_now($self); + PublicInbox::Sigfd::block_signals(); } sub imap_idle_requeue ($) { # DS::add_timer callback @@ -628,10 +629,14 @@ sub event_step { return if $self->{quit}; my $idle_todo = $self->{idle_todo}; if ($idle_todo && @$idle_todo) { - watch_atfork_parent($self); - while (my $url_intvl = shift(@$idle_todo)) { - imap_idle_fork($self, $url_intvl); - } + my $oldset = watch_atfork_parent($self); + eval { + while (my $url_intvl = shift(@$idle_todo)) { + imap_idle_fork($self, $url_intvl); + } + }; + PublicInbox::Sigfd::sig_setmask($oldset); + die $@ if $@; } goto(&fs_scan_step) if $self->{mdre}; } @@ -684,9 +689,9 @@ sub watch_nntp_fetch_all ($$) { sub poll_fetch_fork ($) { # DS::add_timer callback my ($self, $intvl, $urls) = @{$_[0]}; return if $self->{quit}; - watch_atfork_parent($self); - defined(my $pid = fork) or die "fork: $!"; - if ($pid == 0) { + my $oldset = watch_atfork_parent($self); + my $pid = fork; + if (defined($pid) && $pid == 0) { watch_atfork_child($self); if ($urls->[0] =~ m!\Aimaps?://!i) { watch_imap_fetch_all($self, $urls); @@ -695,6 +700,8 @@ sub poll_fetch_fork ($) { # DS::add_timer callback } _exit(0); } + PublicInbox::Sigfd::sig_setmask($oldset); + die "fork: $!" unless defined $pid; $self->{poll_pids}->{$pid} = [ $intvl, $urls ]; PublicInbox::DS::dwaitpid($pid, \&poll_fetch_reap, $self); }