sigfd: fix typos and scoping on systems w/o epoll+kqueue

Unfortunately, I'm not sure how easy catching these at
compile-time, is.  Prototypes do not seem to check these
at compile time when crossing packages (not even with
exported subroutines).

diff --git a/lib/PublicInbox/Daemon.pm b/lib/PublicInbox/Daemon.pm
index e5798a4bf2276abd3e9e6c1aa7c1bff5cd055e99..b929ec2aa17e1cb83549a41d27035fd578cb8515 100644 (file)
--- a/lib/PublicInbox/Daemon.pm
+++ b/lib/PublicInbox/Daemon.pm
@@ -75,7 +75,7 @@ sub accept_tls_opt ($) {
 sub daemon_prepare ($) {
        my ($default_listen) = @_;
        my $listener_names = {}; # sockname => IO::Handle
 sub daemon_prepare ($) {
        my ($default_listen) = @_;
        my $listener_names = {}; # sockname => IO::Handle

-       my $oldset = PublicInbox::Sigfd::block_signals();
+       $oldset = PublicInbox::Sigfd::block_signals();

        @CMD = ($0, @ARGV);
        my ($prog) = ($CMD[0] =~ m!([^/]+)\z!g);
        my $help = <<EOF;
        @CMD = ($0, @ARGV);
        my ($prog) = ($CMD[0] =~ m!([^/]+)\z!g);
        my $help = <<EOF;


@@ -523,7 +523,7 @@ EOF
        };
        my $sigfd = PublicInbox::Sigfd->new($sig, 0);
        local %SIG = (%SIG, %$sig) if !$sigfd;
        };
        my $sigfd = PublicInbox::Sigfd->new($sig, 0);
        local %SIG = (%SIG, %$sig) if !$sigfd;

-       PublicInbox::restore_signals($oldset) if !$sigfd;
+       PublicInbox::Sigfd::sig_setmask($oldset) if !$sigfd;

        while (1) { # main loop
                my $n = scalar keys %pids;
                unless (@listeners) {
        while (1) { # main loop
                my $n = scalar keys %pids;
                unless (@listeners) {


@@ -552,7 +552,7 @@ EOF
                                        $pids{$pid} = $i;
                                }
                        }
                                        $pids{$pid} = $i;
                                }
                        }

-                       PubliInbox::Sigfd::set_sigmask($oldset) if !$sigfd;
+                       PublicInbox::Sigfd::sig_setmask($oldset) if !$sigfd;

                }
 
                if ($sigfd) { # Linux and IO::KQueue users:
                }
 
                if ($sigfd) { # Linux and IO::KQueue users:


@@ -640,7 +640,7 @@ sub daemon_loop ($$$$) {
        if (!$sigfd) {
                # wake up every second to accept signals if we don't
                # have signalfd or IO::KQueue:
        if (!$sigfd) {
                # wake up every second to accept signals if we don't
                # have signalfd or IO::KQueue:

-               PublicInbox::Sigfd::set_sigmask($oldset);
+               PublicInbox::Sigfd::sig_setmask($oldset);

                PublicInbox::DS->SetLoopTimeout(1000);
        }
        PublicInbox::DS->EventLoop;
                PublicInbox::DS->SetLoopTimeout(1000);
        }
        PublicInbox::DS->EventLoop;

diff --git a/script/public-inbox-watch b/script/public-inbox-watch
index 1d164aa39ab2df0b77c765ec60378ad087a0d8d8..55183ef26b49582ad0e9e2fb2c770ba6ccc725c8 100755 (executable)
--- a/script/public-inbox-watch
+++ b/script/public-inbox-watch
@@ -60,7 +60,7 @@ if ($watch) {
        my $sigfd = PublicInbox::Sigfd->new($sig, $SFD_NONBLOCK);
        local %SIG = (%SIG, %$sig) if !$sigfd;
        if (!$sigfd) {
        my $sigfd = PublicInbox::Sigfd->new($sig, $SFD_NONBLOCK);
        local %SIG = (%SIG, %$sig) if !$sigfd;
        if (!$sigfd) {

-               PublicInbox::Sigfd::set_sigmask($oldset);
+               PublicInbox::Sigfd::sig_setmask($oldset);

                PublicInbox::DS->SetLoopTimeout(1000);
        }
        $watch->watch($sig, $oldset) while ($watch);
                PublicInbox::DS->SetLoopTimeout(1000);
        }
        $watch->watch($sig, $oldset) while ($watch);