From: Eric Wong <e@80x24.org>
To: spew@80x24.org
Subject: [PATCH 18/18] qspawn: simplify argument passing
Date: Mon, 23 Oct 2023 08:48:37 +0000 [thread overview]
Message-ID: <20231023084837.2804687-18-e@80x24.org> (raw)
In-Reply-To: <20231023084837.2804687-1-e@80x24.org>
Now that psgi_return is gone, we can further simplify our
internals to support only psgi_qx and psgi_yield. Internal
argument passing is reduced and we keep the command env and
redirects in the Qspawn object for as long as it's alive.
I wanted to get rid of finalize() entirely, but it seems
trickier to do when having to support generic PSGI.
---
lib/PublicInbox/Qspawn.pm | 50 +++++++++++++++++++--------------------
1 file changed, 24 insertions(+), 26 deletions(-)
diff --git a/lib/PublicInbox/Qspawn.pm b/lib/PublicInbox/Qspawn.pm
index 0bb02081..a03e1b01 100644
--- a/lib/PublicInbox/Qspawn.pm
+++ b/lib/PublicInbox/Qspawn.pm
@@ -47,28 +47,27 @@ my $def_limiter;
# {qsp_err} is an optional error buffer callers may access themselves
sub new {
my ($class, $cmd, $cmd_env, $opt) = @_;
- bless { args => [ $cmd, $cmd_env, $opt ] }, $class;
+ bless { args => [ $cmd, $cmd_env, $opt ? { %$opt } : {} ] }, $class;
}
sub _do_spawn {
my ($self, $start_cb, $limiter) = @_;
- my ($cmd, $cmd_env, $opt) = @{delete $self->{args}};
+ my ($cmd, $cmd_env, $opt) = @{$self->{args}};
my %o = %{$opt || {}};
$self->{limiter} = $limiter;
for my $k (@PublicInbox::Spawn::RLIMITS) {
- $o{$k} = $limiter->{$k} // next;
+ $opt->{$k} = $limiter->{$k} // next;
}
- $self->{cmd} = $cmd;
$self->{-quiet} = 1 if $o{quiet};
$limiter->{running}++;
if ($start_cb) {
eval { # popen_rd may die on EMFILE, ENFILE
- $self->{rpipe} = popen_rd($cmd, $cmd_env, \%o,
- \&waitpid_err, $self, \%o);
+ $self->{rpipe} = popen_rd($cmd, $cmd_env, $opt,
+ \&waitpid_err, $self);
$start_cb->($self); # EPOLL_CTL_ADD may ENOSPC/ENOMEM
};
} else {
- eval { run_await($cmd, $cmd_env, \%o, \&wait_await, $self) };
+ eval { run_await($cmd, $cmd_env, $opt, \&wait_await, $self) };
warn "E: $@" if $@;
}
finish($self, $@) if $@;
@@ -79,8 +78,8 @@ sub psgi_status_err { # Qspawn itself is useful w/o PSGI
PublicInbox::WwwStatic::r($_[0] // 500);
}
-sub finalize ($;$) {
- my ($self, $opt) = @_;
+sub finalize ($) {
+ my ($self) = @_;
# process is done, spawn whatever's in the queue
my $limiter = delete $self->{limiter} or return;
@@ -96,13 +95,13 @@ sub finalize ($;$) {
if (my $dst = $self->{qsp_err}) {
$$dst .= $$dst ? " $err" : "; $err";
}
- warn "@{$self->{cmd}}: $err\n" if !$self->{-quiet};
+ warn "E: @{$self->{args}->[0]}: $err\n" if !$self->{-quiet};
}
my ($env, $qx_cb_arg) = delete @$self{qw(psgi_env qx_cb_arg)};
if ($qx_cb_arg) {
my $cb = shift @$qx_cb_arg;
- eval { $cb->($opt->{1}, @$qx_cb_arg) };
+ eval { $cb->($self->{args}->[2]->{1}, @$qx_cb_arg) };
return unless $@;
warn "E: $@"; # hope qspawn.wcb can handle it
}
@@ -113,23 +112,21 @@ sub finalize ($;$) {
}
}
-sub DESTROY { finalize($_[0]) } # ->finalize is idempotent
-
sub waitpid_err { # callback for awaitpid
- my (undef, $self, $opt) = @_; # $_[0]: pid
+ my (undef, $self) = @_; # $_[0]: pid
$self->{_err} = ''; # for defined check in ->finish
- if ($?) { # FIXME: redundant
+ if ($?) { # XXX this may be redundant
my $status = $? >> 8;
my $sig = $? & 127;
$self->{_err} .= "exit status=$status";
$self->{_err} .= " signal=$sig" if $sig;
}
- finalize($self, $opt) if !$self->{rpipe};
+ finalize($self) if !$self->{rpipe};
}
sub wait_await { # run_await cb
my ($pid, $cmd, $cmd_env, $opt, $self) = @_;
- waitpid_err($pid, $self, $opt);
+ waitpid_err($pid, $self);
}
sub yield_chunk { # $_[-1] is sysread buffer (or undef)
@@ -214,26 +211,24 @@ sub yield_pass {
sub parse_hdr_done ($$) {
my ($self) = @_;
- my $ret;
+ my ($ret, $err);
if (defined $_[-1]) {
my ($bref, $ph_cb, @ph_arg) = @{$self->{yield_parse_hdr}};
$$bref .= $_[-1];
$ret = eval { $ph_cb->(length($_[-1]), $bref, @ph_arg) };
- if ($@) {
- carp "parse_hdr (@{$self->{cmd}}): $@\n";
+ if (($err = $@)) {
$ret = psgi_status_err();
} elsif (!$ret && $_[-1] eq '') {
- carp <<EOM;
-EOF parsing headers from @{$self->{cmd}} ($self->{psgi_env}->{REQUEST_URI})
-EOM
+ $err = 'EOF';
$ret = psgi_status_err();
}
} else {
- carp <<EOM;
-E: parsing headers: $! from @{$self->{cmd}} ($self->{psgi_env}->{REQUEST_URI})
-EOM
+ $err = "$!";
$ret = psgi_status_err();
}
+ carp <<EOM if $err;
+E: $err @{$self->{args}->[0]} ($self->{psgi_env}->{REQUEST_URI})
+EOM
$ret; # undef if headers incomplete
}
@@ -301,4 +296,7 @@ sub psgi_yield {
}
}
+no warnings 'once';
+*DESTROY = \&finalize; # ->finalize is idempotent
+
1;
prev parent reply other threads:[~2023-10-23 8:48 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-23 8:48 [PATCH 01/18] limiter: split out from qspawn Eric Wong
2023-10-23 8:48 ` [PATCH 02/18] spawn: support synchronous run_qx Eric Wong
2023-10-23 8:48 ` [PATCH 03/18] psgi_qx: use a temporary file rather than pipe Eric Wong
2023-10-23 8:48 ` [PATCH 04/18] www_coderepo: capture uses a flattened list Eric Wong
2023-10-23 8:48 ` [PATCH 05/18] qspawn: psgi_return allows list for callback args Eric Wong
2023-10-23 8:48 ` [PATCH 06/18] qspawn: drop unused err arg for ->event_step Eric Wong
2023-10-23 8:48 ` [PATCH 07/18] httpd/async: require IO arg Eric Wong
2023-10-23 8:48 ` [PATCH 08/18] xt/check-run: call DS->Reset after all tests Eric Wong
2023-10-23 8:48 ` [PATCH 09/18] qspawn: introduce new psgi_yield API Eric Wong
2023-10-23 8:48 ` [PATCH 10/18] repo_atom: switch to psgi_yield Eric Wong
2023-10-23 8:48 ` [PATCH 11/18] repo_snapshot: psgi_yield Eric Wong
2023-10-23 8:48 ` [PATCH 12/18] viewvcs: psgi_yield Eric Wong
2023-10-23 8:48 ` [PATCH 13/18] www_altid: switch to psgi_yield Eric Wong
2023-10-23 8:48 ` [PATCH 14/18] cgit: " Eric Wong
2023-10-23 8:48 ` [PATCH 15/18] www_coderepo: psgi_yield Eric Wong
2023-10-23 8:48 ` [PATCH 16/18] drop psgi_return, httpd/async and GetlineBody Eric Wong
2023-10-23 8:48 ` [PATCH 17/18] qspawn: use WwwStatic for fallbacks and error code Eric Wong
2023-10-23 8:48 ` Eric Wong [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231023084837.2804687-18-e@80x24.org \
--to=e@80x24.org \
--cc=spew@80x24.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).