diff options
Diffstat (limited to 'lib/PublicInbox/Sigfd.pm')
| -rw-r--r-- | lib/PublicInbox/Sigfd.pm | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/lib/PublicInbox/Sigfd.pm b/lib/PublicInbox/Sigfd.pm index 81e5a1b1..b8a1ddfb 100644 --- a/lib/PublicInbox/Sigfd.pm +++ b/lib/PublicInbox/Sigfd.pm @@ -1,43 +1,35 @@ -# Copyright (C) 2019-2021 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 # fields: (sig: hashref similar to %SIG, but signal numbers as keys) package PublicInbox::Sigfd; -use strict; +use v5.12; use parent qw(PublicInbox::DS); -use PublicInbox::Syscall qw(signalfd EPOLLIN EPOLLET); +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, $nonblock) = @_; + my ($class, $sig) = @_; 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, $signame ]; + ($SIGNUM{$_} // POSIX->can("SIG$_")->()) => [ $sig->{$_}, $_ ] } keys %$sig; my $self = bless { sig => \%signo }, $class; my $io; - my $fd = signalfd([keys %signo], $nonblock); + my $fd = signalfd([keys %signo]); if (defined $fd && $fd >= 0) { open($io, '+<&=', $fd) or die "open: $!"; } elsif (eval { require PublicInbox::DSKQXS }) { - $io = PublicInbox::DSKQXS->signalfd([keys %signo], $nonblock); + $io = PublicInbox::DSKQXS->signalfd([keys %signo]); } else { return; # wake up every second to check for signals } - if ($nonblock) { # it can go into the event loop - $self->SUPER::new($io, EPOLLIN | EPOLLET); - } else { # master main loop - $self->{sock} = $io; - $self; - } + $self->SUPER::new($io, EPOLLIN | EPOLLET); + $self->{is_kq} = 1 if tied(*$io); + $self; } # PublicInbox::Daemon in master main loop (blocking) @@ -50,8 +42,8 @@ sub wait_once ($) { for my $off (0..$nr) { # the first uint32_t of signalfd_siginfo: ssi_signo my $signo = unpack('L', substr($buf, 128 * $off, 4)); - my $cb = $self->{sig}->{$signo}; - $cb->($signo) if $cb ne 'IGNORE'; + my ($cb, $signame) = @{$self->{sig}->{$signo}}; + $cb->($signame) if $cb ne 'IGNORE'; } } $r; |