X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fsigfd.t;h=7eb6b222819b0363416f659957a97dbdea30438d;hb=ba1a1efbcd23ab472b3c5c030082a9064462680b;hp=34f30de8ec36f8d5351bac759517aa1c918a3645;hpb=d6674af04cb74a4efd513d938bed8bf7ab2838eb;p=public-inbox.git
diff --git a/t/sigfd.t b/t/sigfd.t
index 34f30de8..7eb6b222 100644
--- a/t/sigfd.t
+++ b/t/sigfd.t
@@ -1,34 +1,33 @@
-# Copyright (C) 2019 all contributors
+# Copyright (C) 2019-2021 all contributors
use strict;
use Test::More;
use IO::Handle;
use POSIX qw(:signal_h);
use Errno qw(ENOSYS);
-use PublicInbox::Syscall qw(SFD_NONBLOCK);
require_ok 'PublicInbox::Sigfd';
+use PublicInbox::DS;
SKIP: {
if ($^O ne 'linux' && !eval { require IO::KQueue }) {
skip 'signalfd requires Linux or IO::KQueue to emulate', 10;
}
- my $new = POSIX::SigSet->new;
- $new->fillset or die "sigfillset: $!";
- my $old = POSIX::SigSet->new;
- sigprocmask(SIG_SETMASK, $new, $old) or die "sigprocmask $!";
+
+ my $old = PublicInbox::DS::block_signals();
my $hit = {};
my $sig = {};
local $SIG{HUP} = sub { $hit->{HUP}->{normal}++ };
local $SIG{TERM} = sub { $hit->{TERM}->{normal}++ };
local $SIG{INT} = sub { $hit->{INT}->{normal}++ };
- for my $s (qw(HUP TERM INT)) {
+ local $SIG{WINCH} = sub { $hit->{WINCH}->{normal}++ };
+ for my $s (qw(HUP TERM INT WINCH)) {
$sig->{$s} = sub { $hit->{$s}->{sigfd}++ };
}
my $sigfd = PublicInbox::Sigfd->new($sig, 0);
if ($sigfd) {
- require PublicInbox::DS;
ok($sigfd, 'Sigfd->new works');
kill('HUP', $$) or die "kill $!";
kill('INT', $$) or die "kill $!";
+ kill('WINCH', $$) or die "kill $!";
my $fd = fileno($sigfd->{sock});
ok($fd >= 0, 'fileno(Sigfd->{sock}) works');
my $rvec = '';
@@ -42,20 +41,22 @@ SKIP: {
}
$sigfd = undef;
- my $nbsig = PublicInbox::Sigfd->new($sig, SFD_NONBLOCK);
+ my $nbsig = PublicInbox::Sigfd->new($sig, 1);
ok($nbsig, 'Sigfd->new SFD_NONBLOCK works');
is($nbsig->wait_once, undef, 'nonblocking ->wait_once');
ok($! == Errno::EAGAIN, 'got EAGAIN');
kill('HUP', $$) or die "kill $!";
PublicInbox::DS->SetPostLoopCallback(sub {}); # loop once
- PublicInbox::DS->EventLoop;
- is($hit->{HUP}->{sigfd}, 2, 'HUP sigfd fired in event loop');
+ PublicInbox::DS::event_loop();
+ is($hit->{HUP}->{sigfd}, 2, 'HUP sigfd fired in event loop') or
+ diag explain($hit); # sometimes fails on FreeBSD 11.x
kill('TERM', $$) or die "kill $!";
kill('HUP', $$) or die "kill $!";
- PublicInbox::DS->EventLoop;
+ PublicInbox::DS::event_loop();
PublicInbox::DS->Reset;
is($hit->{TERM}->{sigfd}, 1, 'TERM sigfd fired in event loop');
is($hit->{HUP}->{sigfd}, 3, 'HUP sigfd fired in event loop');
+ is($hit->{WINCH}->{sigfd}, 1, 'WINCH sigfd fired in event loop');
} else {
skip('signalfd disabled?', 10);
}