watch: IMAP and NNTP polling can use the same interval

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

diff --git a/lib/PublicInbox/DS.pm b/lib/PublicInbox/DS.pm
index ef483aacf2724a4bf73a50e64223c1b40374f3f2..9563a1cbbbb5795fc724c9b3d19b8e76dd66a7ab 100644 (file)
--- a/lib/PublicInbox/DS.pm
+++ b/lib/PublicInbox/DS.pm
@@ -32,11 +32,12 @@ use PublicInbox::Syscall qw(:epoll);
 use PublicInbox::Tmpfile;
 use Errno qw(EAGAIN EINVAL);
 use Carp qw(carp croak);
-our @EXPORT_OK = qw(now msg_more dwaitpid add_timer add_uniq_timer);
+our @EXPORT_OK = qw(now msg_more dwaitpid awaitpid add_timer add_uniq_timer);
 
 my %Stack;
 my $nextq; # queue for next_tick
 my $wait_pids; # list of [ pid, callback, callback_arg ]
+my $AWAIT_PIDS; # pid => [ $callback, @args ]
 my $reap_armed;
 my $ToClose; # sockets to close when event loop is done
 our (
@@ -74,11 +75,11 @@ sub Reset {
                # we may be iterating inside one of these on our stack
                my @q = delete @Stack{keys %Stack};
                for my $q (@q) { @$q = () }
-               $wait_pids = $nextq = $ToClose = undef;
+               $AWAIT_PIDS = $wait_pids = $nextq = $ToClose = undef;
                $ep_io = undef; # closes real $Epoll FD
                $Epoll = undef; # may call DSKQXS::DESTROY
        } while (@Timers || keys(%Stack) || $nextq || $wait_pids ||
-               $ToClose || keys(%DescriptorMap) ||
+               $ToClose || keys(%DescriptorMap) || $AWAIT_PIDS ||
                $PostLoopCallback || keys(%UniqTimer));
 
        $reap_armed = undef;
@@ -126,12 +127,11 @@ sub add_uniq_timer { # ($name, $secs, $coderef, @args) = @_;
 
 # caller sets return value to $Epoll
 sub _InitPoller () {
-       if (PublicInbox::Syscall::epoll_defined())  {
+       if (defined $PublicInbox::Syscall::SYS_epoll_create)  {
                my $fd = epoll_create();
                die "epoll_create: $!" if $fd < 0;
                open($ep_io, '+<&=', $fd) or return;
-               my $fl = fcntl($ep_io, F_GETFD, 0);
-               fcntl($ep_io, F_SETFD, $fl | FD_CLOEXEC);
+               fcntl($ep_io, F_SETFD, FD_CLOEXEC);
                $fd;
        } else {
                my $cls;
@@ -202,6 +202,13 @@ sub block_signals () {
        $oldset;
 }
 
+sub await_cb ($;@) {
+       my ($pid, @cb_args) = @_;
+       my $cb = shift @cb_args or return;
+       eval { $cb->($pid, @cb_args) };
+       warn "E: awaitpid($pid): $@" if $@;
+}
+
 # We can't use waitpid(-1) safely here since it can hit ``, system(),
 # and other things.  So we scan the $wait_pids list, which is hopefully
 # not too big.  We keep $wait_pids small by not calling dwaitpid()
@@ -209,10 +216,12 @@ sub block_signals () {
 
 sub reap_pids {
        $reap_armed = undef;
-       my $tmp = $wait_pids or return;
+       my $tmp = $wait_pids // [];
        $wait_pids = undef;
        $Stack{reap_runq} = $tmp;
        my $oldset = block_signals();
+
+       # old API
        foreach my $ary (@$tmp) {
                my ($pid, $cb, $arg) = @$ary;
                my $ret = waitpid($pid, WNOHANG);
@@ -227,6 +236,14 @@ sub reap_pids {
                        warn "waitpid($pid, WNOHANG) = $ret, \$!=$!, \$?=$?";
                }
        }
+
+       # new API TODO: convert to waitpid(-1) in the future as long
+       # as we don't use threads
+       for my $pid (keys %$AWAIT_PIDS) {
+               my $wpid = waitpid($pid, WNOHANG) // next;
+               my $cb_args = delete $AWAIT_PIDS->{$wpid} or next;
+               await_cb($pid, @$cb_args);
+       }
        sig_setmask($oldset);
        delete $Stack{reap_runq};
 }
@@ -648,7 +665,7 @@ sub shutdn ($) {
     }
 }
 
-sub zflush {} # overridden by DSdeflate
+sub dflush {} # overridden by DSdeflate
 sub compressed {} # overridden by DSdeflate
 sub long_response_done {} # overridden by Net::NNTP
 
@@ -660,8 +677,8 @@ sub long_step {
        if ($@ || !$self->{sock}) { # something bad happened...
                delete $self->{long_cb};
                my $elapsed = now() - $t0;
-               $@ and $self->err("%s during long response[$fd] - %0.6f",
-                                   $@, $elapsed);
+               $@ and warn("$@ during long response[$fd] - ",
+                               sprintf('%0.6f', $elapsed),"\n");
                $self->out(" deferred[$fd] aborted - %0.6f", $elapsed);
                $self->close;
        } elsif ($more) { # $self->{wbuf}:
@@ -682,13 +699,13 @@ sub requeue_once {
        my ($self) = @_;
        # COMPRESS users all share the same DEFLATE context.
        # Flush it here to ensure clients don't see each other's data
-       $self->zflush;
+       $self->dflush;
 
        # no recursion, schedule another call ASAP,
        # but only after all pending writes are done.
        # autovivify wbuf.  wbuf may be populated by $cb,
        # no need to rearm if so: (push returns new size of array)
-       requeue($self) if push(@{$self->{wbuf}}, \&long_step) == 1;
+       $self->requeue if push(@{$self->{wbuf}}, \&long_step) == 1;
 }
 
 sub long_response ($$;@) {
@@ -721,6 +738,23 @@ sub dwaitpid ($;$$) {
        }
 }
 
+sub awaitpid {
+       my ($pid, @cb_args) = @_;
+       $AWAIT_PIDS->{$pid} //= @cb_args ? \@cb_args : 0;
+       # provide synchronous API
+       if (defined(wantarray) || (!$in_loop && !@cb_args)) {
+               my $ret = waitpid($pid, 0) // -2;
+               if ($ret == $pid) {
+                       my $cb_args = delete $AWAIT_PIDS->{$pid};
+                       @cb_args = @$cb_args if !@cb_args && $cb_args;
+                       await_cb($pid, @cb_args);
+                       return $ret;
+               }
+       }
+       # We could've just missed our SIGCHLD, cover it, here:
+       enqueue_reap() if $in_loop;
+}
+
 1;
 
 =head1 AUTHORS (Danga::Socket)