-# Copyright (C) 2016 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2018 all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
#
# XXX This is a totally unstable API for public-inbox internal use only
package PublicInbox::HTTPD::Async;
use strict;
use warnings;
-use base qw(Danga::Socket);
+use base qw(PublicInbox::DS);
use fields qw(cb cleanup);
+require PublicInbox::EvCleanup;
sub new {
my ($class, $io, $cb, $cleanup) = @_;
+
+ # no $io? call $cb at the top of the next event loop to
+ # avoid recursion:
+ unless (defined($io)) {
+ PublicInbox::EvCleanup::asap($cb) if $cb;
+ PublicInbox::EvCleanup::next_tick($cleanup) if $cleanup;
+ return;
+ }
+
my $self = fields::new($class);
IO::Handle::blocking($io, 0);
$self->SUPER::new($io);
$self;
}
-sub async_pass {
- my ($self, $io, $fh, $bref) = @_;
- my $restart_read = sub { $self->watch_read(1) };
- # In case the client HTTP connection ($io) dies, it
- # will automatically close this ($self) object.
- $io->{forward} = $self;
- $fh->write($$bref);
- $self->{cb} = sub {
+# fires after pending writes are complete:
+sub restart_read_cb ($) {
+ my ($self) = @_;
+ sub { $self->watch_read(1) }
+}
+
+sub main_cb ($$$) {
+ my ($http, $fh, $bref) = @_;
+ sub {
+ my ($self) = @_;
my $r = sysread($self->{sock}, $$bref, 8192);
if ($r) {
$fh->write($$bref);
- if ($io->{write_buf_size}) {
- $self->watch_read(0);
- $io->write($restart_read); # D::S::write
+ unless ($http->{closed}) { # PublicInbox::DS sets this
+ if (scalar @{$http->{wbuf}}) {
+ $self->watch_read(0);
+ $http->write(restart_read_cb($self));
+ }
+ # stay in watch_read, but let other clients
+ # get some work done, too.
+ return;
}
- return; # stay in watch_read
+ # fall through to close below...
} elsif (!defined $r) {
return if $!{EAGAIN} || $!{EINTR};
}
# Done! Error handling will happen in $fh->close
# called by the {cleanup} handler
- $io->{forward} = undef;
+ $http->{forward} = undef;
$self->close;
}
}
-sub event_read { $_[0]->{cb}->() }
-sub event_hup { $_[0]->{cb}->() }
-sub event_err { $_[0]->{cb}->() }
-sub sysread { shift->{sock}->sysread(@_) }
+sub async_pass {
+ my ($self, $http, $fh, $bref) = @_;
+ # In case the client HTTP connection ($http) dies, it
+ # will automatically close this ($self) object.
+ $http->{forward} = $self;
+ $fh->write($$bref); # PublicInbox:HTTP::{chunked,identity}_wcb
+ $self->{cb} = main_cb($http, $fh, $bref);
+}
+
+sub event_read { $_[0]->{cb}->(@_) }
sub close {
my $self = shift;
$self->SUPER::close(@_);
# we defer this to the next timer loop since close is deferred
- Danga::Socket->AddTimer(0, $cleanup) if $cleanup;
+ PublicInbox::EvCleanup::next_tick($cleanup) if $cleanup;
}
-# do not let ourselves be closed during graceful termination
-sub busy () { $_[0]->{cb} }
-
1;