about summary refs log tree commit homepage
path: root/lib/PublicInbox/Watch.pm
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2021-10-21 21:10:26 +0000
committerEric Wong <e@80x24.org>2021-10-22 00:54:44 +0000
commit950485f0da0b79832e7ef100ac419f40c8bd30e0 (patch)
treed16ee0c598ba9400962b82bb5c44581e92cc103d /lib/PublicInbox/Watch.pm
parent8c9e20805d1e2a9245ae35ed6c5b737731513be8 (diff)
downloadpublic-inbox-950485f0da0b79832e7ef100ac419f40c8bd30e0.tar.gz
The top-level daemon process already blocks all signals,
so there's no reason to block them around fork() calls.
Diffstat (limited to 'lib/PublicInbox/Watch.pm')
-rw-r--r--lib/PublicInbox/Watch.pm12
1 files changed, 3 insertions, 9 deletions
diff --git a/lib/PublicInbox/Watch.pm b/lib/PublicInbox/Watch.pm
index e80bbdec..3f6fe21b 100644
--- a/lib/PublicInbox/Watch.pm
+++ b/lib/PublicInbox/Watch.pm
@@ -391,11 +391,7 @@ sub watch_atfork_child ($) {
         PublicInbox::DS::sig_setmask($self->{oldset});
 }
 
-sub watch_atfork_parent ($) {
-        my ($self) = @_;
-        _done_for_now($self);
-        PublicInbox::DS::block_signals();
-}
+sub watch_atfork_parent ($) { _done_for_now($_[0]) }
 
 sub imap_idle_requeue { # DS::add_timer callback
         my ($self, $uri_intvl) = @_;
@@ -449,13 +445,12 @@ sub event_step {
         return if $self->{quit};
         my $idle_todo = $self->{idle_todo};
         if ($idle_todo && @$idle_todo) {
-                my $oldset = watch_atfork_parent($self);
+                watch_atfork_parent($self);
                 eval {
                         while (my $uri_intvl = shift(@$idle_todo)) {
                                 imap_idle_fork($self, $uri_intvl);
                         }
                 };
-                PublicInbox::DS::sig_setmask($oldset);
                 die $@ if $@;
         }
         fs_scan_step($self) if $self->{mdre};
@@ -492,7 +487,7 @@ sub poll_fetch_fork { # DS::add_timer callback
         my ($self, $intvl, $uris) = @_;
         return if $self->{quit};
         pipe(my ($r, $w)) or die "pipe: $!";
-        my $oldset = watch_atfork_parent($self);
+        watch_atfork_parent($self);
         my $seed = rand(0xffffffff);
         my $pid = fork;
         if (defined($pid) && $pid == 0) {
@@ -508,7 +503,6 @@ sub poll_fetch_fork { # DS::add_timer callback
                 close $w;
                 _exit(0);
         }
-        PublicInbox::DS::sig_setmask($oldset);
         die "fork: $!"  unless defined $pid;
         $self->{poll_pids}->{$pid} = [ $intvl, $uris ];
         PublicInbox::EOFpipe->new($r, \&reap, [$pid, \&poll_fetch_reap, $self]);