* [PATCH 02/14] qspawn: implement psgi_return and use it for githttpbackend
@ 2019-01-27 4:03 7% ` Eric Wong
0 siblings, 0 replies; 1+ results
From: Eric Wong @ 2019-01-27 4:03 UTC (permalink / raw)
To: meta
Was: ("repobrowse: port patch generation over to qspawn")
We'll be using it for githttpbackend and maybe other things.
---
lib/PublicInbox/GitHTTPBackend.pm | 64 +++----------------------------
lib/PublicInbox/Qspawn.pm | 58 ++++++++++++++++++++++++++++
2 files changed, 63 insertions(+), 59 deletions(-)
diff --git a/lib/PublicInbox/GitHTTPBackend.pm b/lib/PublicInbox/GitHTTPBackend.pm
index 54ccfa0..ab43a00 100644
--- a/lib/PublicInbox/GitHTTPBackend.pm
+++ b/lib/PublicInbox/GitHTTPBackend.pm
@@ -200,69 +200,15 @@ sub serve_smart {
$env{$name} = $val if defined $val;
}
my $limiter = $git->{-httpbackend_limiter} || $default_limiter;
- my $git_dir = $git->{git_dir};
$env{GIT_HTTP_EXPORT_ALL} = '1';
- $env{PATH_TRANSLATED} = "$git_dir/$path";
+ $env{PATH_TRANSLATED} = "$git->{git_dir}/$path";
my $rdr = { 0 => fileno($in) };
my $qsp = PublicInbox::Qspawn->new([qw(git http-backend)], \%env, $rdr);
- my ($fh, $rpipe);
- my $end = sub {
- if (my $err = $qsp->finish) {
- err($env, "git http-backend ($git_dir): $err");
- }
- $fh->close if $fh; # async-only
- };
-
- # Danga::Socket users, we queue up the read_enable callback to
- # fire after pending writes are complete:
- my $buf = '';
- my $rd_hdr = sub {
- my $r = sysread($rpipe, $buf, 1024, length($buf));
- return if !defined($r) && ($!{EINTR} || $!{EAGAIN});
- return r(500, 'http-backend error') unless $r;
- $r = parse_cgi_headers(\$buf) or return; # incomplete headers
+ $qsp->psgi_return($env, $limiter, sub {
+ my ($r, $bref) = @_;
+ $r = parse_cgi_headers($bref) or return; # incomplete headers
$r->[0] == 403 ? serve_dumb($env, $git, $path) : $r;
- };
- my $res;
- my $async = $env->{'pi-httpd.async'}; # XXX unstable API
- my $cb = sub {
- my $r = $rd_hdr->() or return;
- $rd_hdr = undef;
- if (scalar(@$r) == 3) { # error:
- if ($async) {
- $async->close; # calls rpipe->close
- } else {
- $rpipe->close;
- $end->();
- }
- $res->($r);
- } elsif ($async) {
- $fh = $res->($r);
- $async->async_pass($env->{'psgix.io'}, $fh, \$buf);
- } else { # for synchronous PSGI servers
- require PublicInbox::GetlineBody;
- $r->[2] = PublicInbox::GetlineBody->new($rpipe, $end,
- $buf);
- $res->($r);
- }
- };
- sub {
- ($res) = @_;
-
- # hopefully this doesn't break any middlewares,
- # holding the input here is a waste of FDs and memory
- $env->{'psgi.input'} = undef;
-
- $qsp->start($limiter, sub { # may run later, much later...
- ($rpipe) = @_;
- $in = undef;
- if ($async) {
- $async = $async->($rpipe, $cb, $end);
- } else { # generic PSGI
- $cb->() while $rd_hdr;
- }
- });
- };
+ });
}
sub input_to_file {
diff --git a/lib/PublicInbox/Qspawn.pm b/lib/PublicInbox/Qspawn.pm
index 3500f8a..b80dac1 100644
--- a/lib/PublicInbox/Qspawn.pm
+++ b/lib/PublicInbox/Qspawn.pm
@@ -9,6 +9,7 @@ package PublicInbox::Qspawn;
use strict;
use warnings;
use PublicInbox::Spawn qw(popen_rd);
+my $def_limiter;
sub new ($$$;) {
my ($class, $cmd, $env, $opt) = @_;
@@ -59,6 +60,63 @@ sub start {
}
}
+sub psgi_return {
+ my ($self, $env, $limiter, $parse_hdr) = @_;
+ my ($fh, $rpipe);
+ my $end = sub {
+ if (my $err = $self->finish) {
+ $err = join(' ', @{$self->{args}->[0]}).": $err\n";
+ $env->{'psgi.errors'}->print($err);
+ }
+ $fh->close if $fh; # async-only
+ };
+
+ # Danga::Socket users, we queue up the read_enable callback to
+ # fire after pending writes are complete:
+ my $buf = '';
+ my $rd_hdr = sub {
+ my $r = sysread($rpipe, $buf, 1024, length($buf));
+ return if !defined($r) && ($!{EINTR} || $!{EAGAIN});
+ $parse_hdr->($r, \$buf);
+ };
+ my $res;
+ my $async = $env->{'pi-httpd.async'};
+ my $cb = sub {
+ my $r = $rd_hdr->() or return;
+ $rd_hdr = undef;
+ if (scalar(@$r) == 3) { # error
+ if ($async) {
+ $async->close; # calls rpipe->close
+ } else {
+ $rpipe->close;
+ $end->();
+ }
+ $res->($r);
+ } elsif ($async) {
+ $fh = $res->($r); # scalar @$r == 2
+ $async->async_pass($env->{'psgix.io'}, $fh, \$buf);
+ } else { # for synchronous PSGI servers
+ require PublicInbox::GetlineBody;
+ $r->[2] = PublicInbox::GetlineBody->new($rpipe, $end,
+ $buf);
+ $res->($r);
+ }
+ };
+ $limiter ||= $def_limiter ||= PublicInbox::Qspawn::Limiter->new(32);
+ sub {
+ ($res) = @_;
+ $self->start($limiter, sub { # may run later, much later...
+ ($rpipe) = @_;
+ if ($async) {
+ # PublicInbox::HTTPD::Async->new($rpipe, $cb, $end)
+ $async = $async->($rpipe, $cb, $end);
+ } else { # generic PSGI
+ $cb->() while $rd_hdr;
+ }
+ });
+ };
+}
+
package PublicInbox::Qspawn::Limiter;
use strict;
use warnings;
--
EW
^ permalink raw reply related [relevance 7%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2019-01-27 4:03 [PATCH 00/14] convert solver to use pi-httpd.async Eric Wong
2019-01-27 4:03 7% ` [PATCH 02/14] qspawn: implement psgi_return and use it for githttpbackend Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).