config: do not implicitly set coderepo.*.cgiturl

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

diff --git a/lib/PublicInbox/DS.pm b/lib/PublicInbox/DS.pm
index f0181b5461cfc4111574af2991d3522a57aba174..e4629e97acc461aaa2debbe1687db8f0aecab796 100644 (file)
--- a/lib/PublicInbox/DS.pm
+++ b/lib/PublicInbox/DS.pm
@@ -126,12 +126,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;
@@ -648,20 +647,58 @@ sub shutdn ($) {
     }
 }
 
-sub zflush {} # overridden by NNTPdeflate and IMAPdeflate
+sub dflush {} # overridden by DSdeflate
+sub compressed {} # overridden by DSdeflate
+sub long_response_done {} # overridden by Net::NNTP
+
+sub long_step {
+       my ($self) = @_;
+       # wbuf is unset or empty, here; {long} may add to it
+       my ($fd, $cb, $t0, @args) = @{$self->{long_cb}};
+       my $more = eval { $cb->($self, @args) };
+       if ($@ || !$self->{sock}) { # something bad happened...
+               delete $self->{long_cb};
+               my $elapsed = now() - $t0;
+               $@ 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}:
+               # control passed to ibx_async_cat if $more == \undef
+               requeue_once($self) if !ref($more);
+       } else { # all done!
+               delete $self->{long_cb};
+               $self->long_response_done;
+               my $elapsed = now() - $t0;
+               my $fd = fileno($self->{sock});
+               $self->out(" deferred[$fd] done - %0.6f", $elapsed);
+               my $wbuf = $self->{wbuf}; # do NOT autovivify
+               requeue($self) unless $wbuf && @$wbuf;
+       }
+}
 
 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;
+       # Flush it here to ensure clients don't see each other's data
+       $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}}, $self->can('long_step')) == 1;
+       $self->requeue if push(@{$self->{wbuf}}, \&long_step) == 1;
+}
+
+sub long_response ($$;@) {
+       my ($self, $cb, @args) = @_; # cb returns true if more, false if done
+       my $sock = $self->{sock} or return;
+       # make sure we disable reading during a long response,
+       # clients should not be sending us stuff and making us do more
+       # work while we are stream a response to them
+       $self->{long_cb} = [ fileno($sock), $cb, now(), @args ];
+       long_step($self); # kick off!
+       undef;
 }
 
 sub dwaitpid ($;$$) {