No ext_urls

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

diff --git a/lib/PublicInbox/DSKQXS.pm b/lib/PublicInbox/DSKQXS.pm
index aa2c91680e7dd2b6ab3ba283e76472358fc86def..7bd7773e7225ae639c55e7d2f0811bc33c6a1dba 100644 (file)
--- a/lib/PublicInbox/DSKQXS.pm
+++ b/lib/PublicInbox/DSKQXS.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2019-2020 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
 # Licensed the same as Danga::Socket (and Perl5)
 # License: GPL-1.0+ or Artistic-1.0-Perl
 #  <https://www.gnu.org/licenses/gpl-1.0.txt>
@@ -11,14 +11,13 @@
 #
 # It also implements signalfd(2) emulation via "tie".
 package PublicInbox::DSKQXS;
-use strict;
-use warnings;
+use v5.12;
 use parent qw(Exporter);
 use Symbol qw(gensym);
 use IO::KQueue;
 use Errno qw(EAGAIN);
 use PublicInbox::Syscall qw(EPOLLONESHOT EPOLLIN EPOLLOUT EPOLLET
-       EPOLL_CTL_ADD EPOLL_CTL_MOD EPOLL_CTL_DEL $SFD_NONBLOCK);
+       EPOLL_CTL_ADD EPOLL_CTL_MOD EPOLL_CTL_DEL);
 our @EXPORT_OK = qw(epoll_ctl epoll_wait);
 
 sub EV_DISPATCH () { 0x0080 }
@@ -48,16 +47,16 @@ sub new {
 # It's wasteful in that it uses another FD, but it simplifies
 # our epoll-oriented code.
 sub signalfd {
-       my ($class, $signo, $flags) = @_;
+       my ($class, $signo, $nonblock) = @_;
        my $sym = gensym;
-       tie *$sym, $class, $signo, $flags; # calls TIEHANDLE
+       tie *$sym, $class, $signo, $nonblock; # calls TIEHANDLE
        $sym
 }
 
 sub TIEHANDLE { # similar to signalfd()
-       my ($class, $signo, $flags) = @_;
+       my ($class, $signo, $nonblock) = @_;
        my $self = $class->new;
-       $self->{timeout} = ($flags & $SFD_NONBLOCK) ? 0 : -1;
+       $self->{timeout} = $nonblock ? 0 : -1;
        my $kq = $self->{kq};
        $kq->EV_SET($_, EVFILT_SIGNAL, EV_ADD) for @$signo;
        $self;
@@ -71,7 +70,7 @@ sub READ { # called by sysread() for signalfd compatibility
        my $nr = $len / 128;
        my $r = 0;
        $_[1] = '';
-       do {
+       while (1) {
                while ($nr--) {
                        my $signo = shift(@$sigbuf) or last;
                        # caller only cares about signalfd_siginfo.ssi_signo:
@@ -94,7 +93,7 @@ sub READ { # called by sysread() for signalfd compatibility
                # field shows coalesced signals, and maybe we'll use it
                # in the future...
                @$sigbuf = map { $_->[0] } @events;
-       } while (1);
+       }
 }
 
 # for fileno() calls in PublicInbox::DS
@@ -107,6 +106,8 @@ sub epoll_ctl {
                $kq->EV_SET($fd, EVFILT_READ, kq_flag(EPOLLIN, $ev));
                eval { $kq->EV_SET($fd, EVFILT_WRITE, kq_flag(EPOLLOUT, $ev)) };
        } elsif ($op == EPOLL_CTL_DEL) {
+               use Carp ();
+               $kq // Carp::confess("nokq $fd");
                $kq->EV_SET($fd, EVFILT_READ, EV_DISABLE);
                eval { $kq->EV_SET($fd, EVFILT_WRITE, EV_DISABLE) };
        } else { # EPOLL_CTL_ADD