use strict;
use warnings;
use PublicInbox::Spawn qw(popen_rd);
-use POSIX qw(WNOHANG);
require Plack::Util;
# n.b.: we get EAGAIN with public-inbox-httpd, and EINTR on other PSGI servers
}
($self->{rpipe}, $self->{pid}) = popen_rd($cmd, $env, \%opts);
+
+ # drop any IO handles opt was holding open via $opt->{hold}
+ # No need to hold onto the descriptor once the child process has it.
+ $self->{args} = $cmd; # keep this around for logging
+
if (defined $self->{pid}) {
$limiter->{running}++;
} else {
$msg;
}
+sub log_err ($$) {
+ my ($env, $msg) = @_;
+ $env->{'psgi.errors'}->print($msg, "\n");
+}
+
# callback for dwaitpid
sub waitpid_err ($$) {
my ($self, $pid) = @_;
$self->{err} = $err;
my $env = $self->{env} or return;
if (!$env->{'qspawn.quiet'}) {
- $err = join(' ', @{$self->{args}->[0]}).": $err\n";
- $env->{'psgi.errors'}->print($err);
+ log_err($env, join(' ', @{$self->{args}}) . ": $err");
}
}
sub do_waitpid ($;$) {
my ($self, $env) = @_;
my $pid = $self->{pid};
- eval { # PublicInbox::DS may not be loaded
- PublicInbox::DS::dwaitpid($pid, \&waitpid_err, $self);
- $self->{env} = $env;
- };
+ $self->{env} = $env;
+ # PublicInbox::DS may not be loaded
+ eval { PublicInbox::DS::dwaitpid($pid, \&waitpid_err, $self) };
# done if we're running in PublicInbox::DS::EventLoop
if ($@) {
# non public-inbox-{httpd,nntpd} callers may block:
_do_spawn(@$next);
}
}
- $self->{err}; # may be meaningless if non-blocking
}
sub start {
# and safe to slurp.
sub psgi_qx {
my ($self, $env, $limiter, $qx_cb) = @_;
- my $qx = PublicInbox::Qspawn::Qx->new;
+ my $scalar = '';
+ open(my $qx, '+>', \$scalar) or die; # PerlIO::scalar
my $end = sub {
+ my $err = $_[0]; # $!
+ log_err($env, "psgi_qx: $err") if defined($err);
finish($self, $env);
- eval { $qx_cb->($qx) };
- $qx = undef;
+ eval { $qx_cb->(\$scalar) };
+ $qx = $scalar = undef;
};
my $rpipe; # comes from popen_rd
my $async = $env->{'pi-httpd.async'};
my $cb = sub {
- my $r = sysread($rpipe, my $buf, 65536);
+ my ($r, $buf);
+reread:
+ $r = sysread($rpipe, $buf, 65536);
if ($async) {
$async->async_pass($env->{'psgix.io'}, $qx, \$buf);
} elsif (defined $r) {
$r ? $qx->write($buf) : $end->();
} else {
- return if $! == EAGAIN || $! == EINTR; # loop again
- $end->();
+ return if $! == EAGAIN; # try again when notified
+ goto reread if $! == EINTR;
+ $end->($!);
}
};
$limiter ||= $def_limiter ||= PublicInbox::Qspawn::Limiter->new(32);
my ($self, $env, $limiter, $parse_hdr) = @_;
my ($fh, $rpipe);
my $end = sub {
+ my $err = $_[0]; # $!
+ log_err($env, "psgi_return: $err") if defined($err);
finish($self, $env);
$fh->close if $fh; # async-only
};
my $buf = '';
my $rd_hdr = sub {
+ # typically used for reading CGI headers
# we must loop until EAGAIN for EPOLLET in HTTPD/Async.pm
# We also need to check EINTR for generic PSGI servers.
my $ret;
- my $n = 0;
+ my $total_rd = 0;
do {
my $r = sysread($rpipe, $buf, 4096, length($buf));
- return if !defined($r) && $! == EAGAIN || $! == EINTR;
-
- # $r may be undef, here:
- $n += $r if $r;
- $ret = $parse_hdr->($r ? $n : $r, \$buf);
+ if (defined($r)) {
+ $total_rd += $r;
+ $ret = $parse_hdr->($r ? $total_rd : 0, \$buf);
+ } else {
+ # caller should notify us when it's ready:
+ return if $! == EAGAIN;
+ next if $! == EINTR; # immediate retry
+ log_err($env, "error reading header: $!");
+ $ret = [ 500, [], [ "Internal error\n" ] ];
+ }
} until (defined $ret);
$ret;
};
my $cb = sub {
my $r = $rd_hdr->() or return;
- $rd_hdr = undef;
+ $rd_hdr = undef; # done reading headers
my $filter = delete $env->{'qspawn.filter'};
if (scalar(@$r) == 3) { # error
if ($async) {
}
$wcb->($r);
} elsif ($async) {
+ # done reading headers, handoff to read body
$fh = $wcb->($r); # scalar @$r == 2
$fh = filter_fh($fh, $filter) if $filter;
$async->async_pass($env->{'psgix.io'}, $fh, \$buf);
}
}
-# captures everything into a buffer and executes a callback when done
-package PublicInbox::Qspawn::Qx;
-use strict;
-use warnings;
-
-sub new {
- my ($class) = @_;
- my $buf = '';
- bless \$buf, $class;
-}
-
-# called by PublicInbox::HTTPD::Async ($fh->write)
-sub write {
- ${$_[0]} .= $_[1];
- undef;
-}
-
1;