watch: remove redundant signal mask manipulation

[public-inbox.git] / lib / PublicInbox / Watch.pm

diff --git a/lib/PublicInbox/Watch.pm b/lib/PublicInbox/Watch.pm
index c6bebce32edb3ea3a919065d4cf0a8f72dbc2341..3f6fe21b726f30d3d185032e45ca7e20d358a561 100644 (file)
--- a/lib/PublicInbox/Watch.pm
+++ b/lib/PublicInbox/Watch.pm
@@ -282,7 +282,8 @@ sub watch_fs_init ($) {
        };
        require PublicInbox::DirIdle;
        # inotify_create + EPOLL_CTL_ADD
-       PublicInbox::DirIdle->new([keys %{$self->{mdmap}}], $cb);
+       my $dir_idle = PublicInbox::DirIdle->new($cb);
+       $dir_idle->add_watches([keys %{$self->{mdmap}}]);
 }
 
 sub net_cb { # NetReader::(nntp|imap)_each callback
@@ -329,6 +330,7 @@ sub imap_idle_once ($$$$) {
        my $end = now() + $intvl;
        warn "I: $uri idling for ${intvl}s\n";
        local $0 = "IDLE $0";
+       return if $self->{quit};
        unless ($mic->idle) {
                return if $self->{quit};
                return "E: IDLE failed on $uri: $!";
@@ -389,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) = @_;
@@ -447,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};
@@ -490,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) {
@@ -506,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]);