* [PATCH 04/30] qspawn: disambiguate command vs PSGI env
2019-12-25 7:50 6% [PATCH 00/30] www: eliminate most per-request closures Eric Wong
@ 2019-12-25 7:50 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2019-12-25 7:50 UTC (permalink / raw)
To: meta
Make things easier-to-follow and paves the way for future work
to reduce dependencies on anonymous subs capturing local variables.
---
lib/PublicInbox/Qspawn.pm | 27 ++++++++++++++-------------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/lib/PublicInbox/Qspawn.pm b/lib/PublicInbox/Qspawn.pm
index 22603ca7..ba980e73 100644
--- a/lib/PublicInbox/Qspawn.pm
+++ b/lib/PublicInbox/Qspawn.pm
@@ -36,17 +36,17 @@ my $def_limiter;
# declares a command to spawn (but does not spawn it).
# $cmd is the command to spawn
-# $env is the environ for the child process
+# $cmd_env is the environ for the child process (not PSGI env)
# $opt can include redirects and perhaps other process spawning options
sub new ($$$;) {
- my ($class, $cmd, $env, $opt) = @_;
- bless { args => [ $cmd, $env, $opt ] }, $class;
+ my ($class, $cmd, $cmd_env, $opt) = @_;
+ bless { args => [ $cmd, $cmd_env, $opt ] }, $class;
}
sub _do_spawn {
my ($self, $start_cb, $limiter) = @_;
my $err;
- my ($cmd, $env, $opts) = @{$self->{args}};
+ my ($cmd, $cmd_env, $opts) = @{$self->{args}};
my %opts = %{$opts || {}};
$self->{limiter} = $limiter;
foreach my $k (PublicInbox::Spawn::RLIMITS()) {
@@ -55,7 +55,7 @@ sub _do_spawn {
}
}
- ($self->{rpipe}, $self->{pid}) = popen_rd($cmd, $env, \%opts);
+ ($self->{rpipe}, $self->{pid}) = popen_rd($cmd, $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.
@@ -94,7 +94,7 @@ sub waitpid_err ($$) {
$err = "W: waitpid($xpid, 0) => $pid: $!";
} # else should not be called with pid == 0
- my $env = delete $self->{env};
+ my $env = delete $self->{psgi_env};
# done, spawn whatever's in the queue
my $limiter = $self->{limiter};
@@ -118,9 +118,8 @@ sub waitpid_err ($$) {
}
sub do_waitpid ($;$$) {
- my ($self, $env, $fin_cb) = @_;
+ my ($self, $fin_cb) = @_;
my $pid = $self->{pid};
- $self->{env} = $env;
$self->{fin_cb} = $fin_cb;
# PublicInbox::DS may not be loaded
eval { PublicInbox::DS::dwaitpid($pid, \&waitpid_err, $self) };
@@ -132,10 +131,10 @@ sub do_waitpid ($;$$) {
}
}
-sub finish ($;$$) {
- my ($self, $env, $fin_cb) = @_;
+sub finish ($;$) {
+ my ($self, $fin_cb) = @_;
if (delete $self->{rpipe}) {
- do_waitpid($self, $env, $fin_cb);
+ do_waitpid($self, $fin_cb);
} elsif ($fin_cb) {
eval { $fin_cb->() };
}
@@ -156,12 +155,13 @@ sub start {
# and safe to slurp.
sub psgi_qx {
my ($self, $env, $limiter, $qx_cb, $cb_arg) = @_;
+ $self->{psgi_env} = $env;
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, sub { $qx_cb->(\$scalar, $cb_arg) });
+ finish($self, sub { $qx_cb->(\$scalar, $cb_arg) });
$qx = undef;
};
my $rpipe; # comes from popen_rd
@@ -230,11 +230,12 @@ sub filter_fh ($$) {
# immediately (or streamed via ->getline (pull-based)).
sub psgi_return {
my ($self, $env, $limiter, $parse_hdr) = @_;
+ $self->{psgi_env} = $env;
my ($fh, $rpipe);
my $end = sub {
my $err = $_[0]; # $!
log_err($env, "psgi_return: $err") if defined($err);
- finish($self, $env);
+ finish($self);
$fh->close if $fh; # async-only
};
^ permalink raw reply related [relevance 7%]
* [PATCH 00/30] www: eliminate most per-request closures
@ 2019-12-25 7:50 6% Eric Wong
2019-12-25 7:50 7% ` [PATCH 04/30] qspawn: disambiguate command vs PSGI env Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2019-12-25 7:50 UTC (permalink / raw)
To: meta
Closures (aka "anonymous subs") tack several KB of memory onto
every WWW request/response, decreasing scalability and
performance of our WWW endpoints. They also increase human
review time to check for reference cycles.
Similar changes to -nntpd and the generic parts of -httpd were
also done recently:
https://public-inbox.org/meta/20191221235319.27082-1-e@80x24.org/
https://public-inbox.org/meta/20191221080007.27810-1-e@80x24.org/
These could still use some naming improvements, and it's been
pretty tiring writing the same-ish commit message over and over.
All these changes around eliminating closures also make it
easier to port our codebase to languages which lack closures.
Fwiw, I've been brainstorming ideas to create a new, refcounted
language where cyclic references are impossible by design. Such
a design would not be possible if closures were implemented; but
doable otherwise by taking a hint from *nix FSes.
Eric Wong (30):
git: allow async_cat to pass arg to callback
httpd/async: support passing arg to callbacks
qspawn: remove some anonymous subs for psgi_qx
qspawn: disambiguate command vs PSGI env
qspawn: replace anonymous $end callbacks w/ event_step
msg_iter: provide means to stop using anonymous subs
qspawn: reduce local vars, de-anonymize rd_hdr
httpd/async: get rid of ephemeral main_cb
qspawn: psgi_return: initial cb can be named
qspawn: psgi_return_start: hoist out from psgi_return
qspawn: psgi_qx: eliminate anonymous subs
qspawn: drop "qspawn.filter" support, for now
qspawn: psgi_return: allow non-anon parse_hdr callback
githttpbackend: split out wwwstatic
www: lazy load Plack::Util
mboxgz: pass $ctx to callback to avoid anon subs
feed: avoid anonymous subs
config: each_inbox: pass user arg to callback
view: avoid anon sub in stream_thread
view: msg_html: stop using an anonymous sub
contentid: no anonymous sub
wwwtext: avoid anonymous sub in response
searchview: pass named subs to Www*Stream
view: thread_html: pass named sub to WwwStream
searchview: remove anonymous sub when sorting threads by relevance
view: msg_iter calls add_body_text directly
wwwattach: avoid anonymous sub for msg_iter
viewvcs: avoid anonymous sub for HTML response
solvergit: allow passing arg to user-supplied callback
search: retry_reopen passes user arg to callback
MANIFEST | 1 +
lib/PublicInbox/Cgit.pm | 19 +-
lib/PublicInbox/Config.pm | 11 +-
lib/PublicInbox/ContentId.pm | 53 +++---
lib/PublicInbox/ExtMsg.pm | 58 +++---
lib/PublicInbox/Feed.pm | 51 +++--
lib/PublicInbox/GetlineBody.pm | 12 +-
lib/PublicInbox/Git.pm | 14 +-
lib/PublicInbox/GitHTTPBackend.pm | 99 +---------
lib/PublicInbox/HTTPD/Async.pm | 56 +++---
lib/PublicInbox/Mbox.pm | 131 +++++++------
lib/PublicInbox/MboxGz.pm | 2 +-
lib/PublicInbox/MsgIter.pm | 8 +-
lib/PublicInbox/NewsWWW.pm | 16 +-
lib/PublicInbox/Qspawn.pm | 296 +++++++++++++++---------------
lib/PublicInbox/Search.pm | 16 +-
lib/PublicInbox/SearchMsg.pm | 9 +-
lib/PublicInbox/SearchView.pm | 100 +++++-----
lib/PublicInbox/SolverGit.pm | 149 ++++++++-------
lib/PublicInbox/View.pm | 187 ++++++++++---------
lib/PublicInbox/ViewVCS.pm | 111 ++++++-----
lib/PublicInbox/WWW.pm | 2 +-
lib/PublicInbox/WwwAtomStream.pm | 2 +-
lib/PublicInbox/WwwAttach.pm | 49 ++---
lib/PublicInbox/WwwListing.pm | 37 ++--
lib/PublicInbox/WwwStatic.pm | 105 +++++++++++
lib/PublicInbox/WwwText.pm | 20 +-
t/git.t | 21 +++
t/qspawn.t | 19 +-
29 files changed, 882 insertions(+), 772 deletions(-)
create mode 100644 lib/PublicInbox/WwwStatic.pm
^ permalink raw reply [relevance 6%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2019-12-25 7:50 6% [PATCH 00/30] www: eliminate most per-request closures Eric Wong
2019-12-25 7:50 7% ` [PATCH 04/30] qspawn: disambiguate command vs PSGI env 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).