} else {
$self->{err} = $!;
}
- $start_cb->($self->{rpipe});
+ $start_cb->($self);
}
sub child_err ($) {
}
}
-sub start {
+sub start ($$$) {
my ($self, $limiter, $start_cb) = @_;
if ($limiter->{running} < $limiter->{max}) {
_do_spawn($self, $start_cb, $limiter);
$wcb = undef;
}
+sub psgi_return_start { # may run later, much later...
+ my ($self) = @_;
+ if (my $async = $self->{psgi_env}->{'pi-httpd.async'}) {
+ # PublicInbox::HTTPD::Async->new(rpipe, $cb, $cb_arg, $end_obj)
+ $self->{async} = $async->($self->{rpipe},
+ \&psgi_return_init_cb, $self, $self);
+ } else { # generic PSGI
+ psgi_return_init_cb($self) while $self->{parse_hdr};
+ }
+}
+
# Used for streaming the stdout of one process as a PSGI response.
#
# $env is the PSGI env.
$self->{hdr_buf} = \(my $hdr_buf = '');
$self->{parse_hdr} = $parse_hdr;
$limiter ||= $def_limiter ||= PublicInbox::Qspawn::Limiter->new(32);
- my $start_cb = sub { # may run later, much later...
- if (my $async = $env->{'pi-httpd.async'}) {
- # PublicInbox::HTTPD::Async->new(rpipe, $cb, $cb_arg,
- # $end_obj)
- $self->{async} = $async->($self->{rpipe},
- \&psgi_return_init_cb, $self,
- $self);
- } else { # generic PSGI
- psgi_return_init_cb($self) while $self->{parse_hdr};
- }
- };
# the caller already captured the PSGI write callback from
# the PSGI server, so we can call ->start, here:
- return $self->start($limiter, $start_cb) if $env->{'qspawn.wcb'};
+ $env->{'qspawn.wcb'} and
+ return start($self, $limiter, \&psgi_return_start);
# the caller will return this sub to the PSGI server, so
- # it can set the response callback (that is, for PublicInbox::HTTP,
- # the chunked_wcb or identity_wcb callback), but other HTTP servers
- # are supported:
+ # it can set the response callback (that is, for
+ # PublicInbox::HTTP, the chunked_wcb or identity_wcb callback),
+ # but other HTTP servers are supported:
sub {
- $self->{psgi_env}->{'qspawn.wcb'} = $_[0];
- $self->start($limiter, $start_cb);
- };
+ $env->{'qspawn.wcb'} = $_[0];
+ start($self, $limiter, \&psgi_return_start);
+ }
}
package PublicInbox::Qspawn::Limiter;
my $x = PublicInbox::Qspawn->new([qw(true)]);
my $run = 0;
$x->start($limiter, sub {
- my ($rpipe) = @_;
- is(0, sysread($rpipe, my $buf, 1), 'read zero bytes');
- ok(!finish_err($x), 'no error on finish');
+ my ($self) = @_;
+ is(0, sysread($self->{rpipe}, my $buf, 1), 'read zero bytes');
+ ok(!finish_err($self), 'no error on finish');
$run = 1;
});
is($run, 1, 'callback ran alright');
my $x = PublicInbox::Qspawn->new([qw(false)]);
my $run = 0;
$x->start($limiter, sub {
- my ($rpipe) = @_;
- is(0, sysread($rpipe, my $buf, 1), 'read zero bytes from false');
- ok(finish_err($x), 'error on finish');
+ my ($self) = @_;
+ is(0, sysread($self->{rpipe}, my $buf, 1),
+ 'read zero bytes from false');
+ ok(finish_err($self), 'error on finish');
$run = 1;
});
is($run, 1, 'callback ran alright');
my $s = PublicInbox::Qspawn->new($cmd);
my @run;
$s->start($limiter, sub {
- my ($rpipe) = @_;
+ my ($self) = @_;
push @run, 'sleep';
- is(0, sysread($rpipe, my $buf, 1), 'read zero bytes');
+ is(0, sysread($self->{rpipe}, my $buf, 1), 'read zero bytes');
});
my $n = 0;
my @t = map {
my $i = $n++;
my $x = PublicInbox::Qspawn->new([qw(true)]);
$x->start($limiter, sub {
- my ($rpipe) = @_;
+ my ($self) = @_;
push @run, $i;
});
[$x, $i]