-# Copyright (C) 2019-2020 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
# Wraps a signalfd (or similar) for PublicInbox::DS
package PublicInbox::Sigfd;
use strict;
use parent qw(PublicInbox::DS);
-use PublicInbox::Syscall qw(signalfd EPOLLIN EPOLLET $SFD_NONBLOCK);
-use POSIX qw(:signal_h);
-use IO::Handle ();
+use PublicInbox::Syscall qw(signalfd EPOLLIN EPOLLET %SIGNUM);
+use POSIX ();
# returns a coderef to unblock signals if neither signalfd or kqueue
# are available.
sub new {
- my ($class, $sig, $flags) = @_;
+ my ($class, $sig, $nonblock) = @_;
my %signo = map {;
- my $cb = $sig->{$_};
- # SIGWINCH is 28 on FreeBSD, NetBSD, OpenBSD
- my $num = ($_ eq 'WINCH' && $^O =~ /linux|bsd/i) ? 28 : do {
- my $m = "SIG$_";
- POSIX->$m;
- };
- $num => $cb;
+ # $num => $cb;
+ ($SIGNUM{$_} // POSIX->can("SIG$_")->()) => $sig->{$_}
} keys %$sig;
my $self = bless { sig => \%signo }, $class;
my $io;
- my $fd = signalfd(-1, [keys %signo], $flags);
+ my $fd = signalfd([keys %signo], $nonblock);
if (defined $fd && $fd >= 0) {
- $io = IO::Handle->new_from_fd($fd, 'r+');
+ open($io, '+<&=', $fd) or die "open: $!";
} elsif (eval { require PublicInbox::DSKQXS }) {
- $io = PublicInbox::DSKQXS->signalfd([keys %signo], $flags);
+ $io = PublicInbox::DSKQXS->signalfd([keys %signo], $nonblock);
} else {
return; # wake up every second to check for signals
}
- if ($flags & $SFD_NONBLOCK) { # it can go into the event loop
+ if ($nonblock) { # it can go into the event loop
$self->SUPER::new($io, EPOLLIN | EPOLLET);
} else { # master main loop
$self->{sock} = $io;
while (wait_once($_[0])) {} # non-blocking
}
-sub sig_setmask { sigprocmask(SIG_SETMASK, @_) or die "sigprocmask: $!" }
-
-sub block_signals () {
- my $oldset = POSIX::SigSet->new;
- my $newset = POSIX::SigSet->new;
- $newset->fillset or die "fillset: $!";
- sig_setmask($newset, $oldset);
- $oldset;
-}
-
1;