X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FHTTPD%2FAsync.pm;h=842aaf62e93fbfd22ceabc25269857c9282d1c99;hb=3d41aa23f35501ca92aab8aa42980fa73f7fa74f;hp=8f3a6a0907c72d00aadcb69b09a651197032dd31;hpb=6b5e35ca6dc6a505d26f129627b5eb7ff8476539;p=public-inbox.git

diff --git a/lib/PublicInbox/HTTPD/Async.pm b/lib/PublicInbox/HTTPD/Async.pm
index 8f3a6a09..842aaf62 100644
--- a/lib/PublicInbox/HTTPD/Async.pm
+++ b/lib/PublicInbox/HTTPD/Async.pm
@@ -1,4 +1,4 @@
-# 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
@@ -9,48 +9,73 @@ package PublicInbox::HTTPD::Async;
 use strict;
 use warnings;
 use base qw(Danga::Socket);
-use fields qw(cb);
+use fields qw(cb cleanup);
+require PublicInbox::EvCleanup;
 
 sub new {
-	my ($class, $io, $cb) = @_;
+	my ($class, $io, $cb, $cleanup) = @_;
 	my $self = fields::new($class);
 	IO::Handle::blocking($io, 0);
 	$self->SUPER::new($io);
 	$self->{cb} = $cb;
+	$self->{cleanup} = $cleanup;
 	$self->watch_read(1);
 	$self;
 }
 
-sub async_pass { $_[0]->{cb} = $_[1] }
-sub event_read { $_[0]->{cb}->() }
-sub event_hup { $_[0]->{cb}->() }
-sub event_err { $_[0]->{cb}->() }
-sub sysread { shift->{sock}->sysread(@_) }
-
-sub getline {
+sub restart_read_cb ($) {
 	my ($self) = @_;
-	die 'getline called without $/ ref' unless ref $/;
-	while (1) {
-		my $ret = $self->read(8192); # Danga::Socket::read
-		return $$ret if defined $ret;
-
-		return unless $!{EAGAIN} || $!{EINTR};
-
-		# in case of spurious wakeup, hopefully we never hit this
-		my $vin = '';
-		vec($vin, $self->{fd}, 1) = 1;
-		my $n;
-		do { $n = select($vin, undef, undef, undef) } until $n;
+	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);
+			return if $http->{closed};
+			if ($http->{write_buf_size}) {
+				$self->watch_read(0);
+				$http->write(restart_read_cb($self));
+			}
+			# stay in watch_read, but let other clients
+			# get some work done, too.
+			return;
+		} elsif (!defined $r) {
+			return if $!{EAGAIN} || $!{EINTR};
+		}
+
+		# Done! Error handling will happen in $fh->close
+		# called by the {cleanup} handler
+		$http->{forward} = undef;
+		$self->close;
 	}
 }
 
+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 event_hup { $_[0]->{cb}->(@_) }
+sub event_err { $_[0]->{cb}->(@_) }
+sub sysread { shift->{sock}->sysread(@_) }
+
 sub close {
 	my $self = shift;
-	$self->{cb} = undef;
+	my $cleanup = $self->{cleanup};
+	$self->{cleanup} = $self->{cb} = undef;
 	$self->SUPER::close(@_);
-}
 
-# do not let ourselves be closed during graceful termination
-sub busy () { $_[0]->{cb} }
+	# we defer this to the next timer loop since close is deferred
+	PublicInbox::EvCleanup::next_tick($cleanup) if $cleanup;
+}
 
 1;