avoid relying on IO::Handle/IO::File autoload

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

diff --git a/lib/PublicInbox/Qspawn.pm b/lib/PublicInbox/Qspawn.pm
index d1a34beac89ffd89c38083a0526be6e534395b8d..3425e5e4558ba3911d0979ab01ea534c47434f86 100644 (file)
--- a/lib/PublicInbox/Qspawn.pm
+++ b/lib/PublicInbox/Qspawn.pm
@@ -45,27 +45,28 @@ sub new ($$$;) {
 sub _do_spawn {
        my ($self, $start_cb, $limiter) = @_;
        my $err;
-       my ($cmd, $cmd_env, $opts) = @{$self->{args}};
-       my %opts = %{$opts || {}};
+       my ($cmd, $cmd_env, $opt) = @{$self->{args}};
+       my %o = %{$opt || {}};
        $self->{limiter} = $limiter;
        foreach my $k (PublicInbox::Spawn::RLIMITS()) {
                if (defined(my $rlimit = $limiter->{$k})) {
-                       $opts{$k} = $rlimit;
+                       $o{$k} = $rlimit;
                }
        }
+       eval {
+               # popen_rd may die on EMFILE, ENFILE
+               ($self->{rpipe}, $self->{pid}) = popen_rd($cmd, $cmd_env, \%o);
+               $self->{args} = $o{quiet} ? undef : $cmd;
 
-       ($self->{rpipe}, $self->{pid}) = popen_rd($cmd, $cmd_env, \%opts);
+               die "E: $!" unless defined($self->{pid});
 
-       # 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 {
-               $self->{err} = $!;
+               $start_cb->($self); # EPOLL_CTL_ADD may ENOSPC/ENOMEM
+       };
+       if ($@) {
+               $self->{err} = $@;
+               finish($self);
        }
-       $start_cb->($self);
 }
 
 sub child_err ($) {
@@ -107,8 +108,12 @@ sub waitpid_err ($$) {
        }
 
        if ($err) {
-               $self->{err} = $err;
-               if ($env && !$env->{'qspawn.quiet'}) {
+               if ($self->{err}) {
+                       $self->{err} .= "; $err";
+               } else {
+                       $self->{err} = $err;
+               }
+               if ($env && $self->{args}) {
                        log_err($env, join(' ', @{$self->{args}}) . ": $err");
                }
        }
@@ -159,7 +164,7 @@ reread:
                $async->async_pass($self->{psgi_env}->{'psgix.io'},
                                        $qx_fh, \$buf);
        } elsif (defined $r) {
-               $r ? $qx_fh->write($buf) : event_step($self, undef);
+               $r ? (print $qx_fh $buf) : event_step($self, undef);
        } else {
                return if $! == EAGAIN; # try again when notified
                goto reread if $! == EINTR;
@@ -215,12 +220,13 @@ sub rd_hdr ($) {
        my $ret;
        my $total_rd = 0;
        my $hdr_buf = $self->{hdr_buf};
+       my ($ph_cb, $ph_arg) = @{$self->{parse_hdr}};
        do {
                my $r = sysread($self->{rpipe}, $$hdr_buf, 4096,
                                length($$hdr_buf));
                if (defined($r)) {
                        $total_rd += $r;
-                       $ret = $self->{parse_hdr}->($total_rd, $hdr_buf);
+                       $ret = $ph_cb->($total_rd, $hdr_buf, $ph_arg);
                } else {
                        # caller should notify us when it's ready:
                        return if $! == EAGAIN;
@@ -298,10 +304,10 @@ sub psgi_return_start { # may run later, much later...
 #              psgix.io.  3-element arrays means the body is available
 #              immediately (or streamed via ->getline (pull-based)).
 sub psgi_return {
-       my ($self, $env, $limiter, $parse_hdr) = @_;
+       my ($self, $env, $limiter, $parse_hdr, $hdr_arg) = @_;
        $self->{psgi_env} = $env;
        $self->{hdr_buf} = \(my $hdr_buf = '');
-       $self->{parse_hdr} = $parse_hdr;
+       $self->{parse_hdr} = [ $parse_hdr, $hdr_arg ];
        $limiter ||= $def_limiter ||= PublicInbox::Qspawn::Limiter->new(32);
 
        # the caller already captured the PSGI write callback from