* [PATCH 05/12] git|gcf2: switch to awaitpid
2023-01-17 7:18 7% [PATCH 00/12] improve process reaping Eric Wong
@ 2023-01-17 7:19 6% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2023-01-17 7:19 UTC (permalink / raw)
To: meta
This is a trivial change compared to Qspawn in the previous
commit.
---
lib/PublicInbox/Gcf2Client.pm | 5 +++--
lib/PublicInbox/Git.pm | 10 +++++-----
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/lib/PublicInbox/Gcf2Client.pm b/lib/PublicInbox/Gcf2Client.pm
index 09c3aa06..a49e2aad 100644
--- a/lib/PublicInbox/Gcf2Client.pm
+++ b/lib/PublicInbox/Gcf2Client.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2020-2021 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
# connects public-inbox processes to PublicInbox::Gcf2::loop()
@@ -10,6 +10,7 @@ use PublicInbox::Gcf2; # fails if Inline::C or libgit2-dev isn't available
use PublicInbox::Spawn qw(spawn);
use Socket qw(AF_UNIX SOCK_STREAM);
use PublicInbox::Syscall qw(EPOLLIN EPOLLET);
+use PublicInbox::DS qw(awaitpid);
# fields:
# sock => socket to Gcf2::loop
# The rest of these fields are compatible with what PublicInbox::Git
@@ -30,7 +31,7 @@ sub new {
$rdr->{0} = $rdr->{1} = $s2;
my $cmd = [$^X, qw[-MPublicInbox::Gcf2 -e PublicInbox::Gcf2::loop]];
$self->{'pid.owner'} = $$;
- $self->{pid} = spawn($cmd, $env, $rdr);
+ awaitpid($self->{pid} = spawn($cmd, $env, $rdr), undef);
$s1->blocking(0);
$self->{inflight} = [];
$self->{in} = $s1;
diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
index 96627daa..c9ed48be 100644
--- a/lib/PublicInbox/Git.pm
+++ b/lib/PublicInbox/Git.pm
@@ -21,7 +21,7 @@ use PublicInbox::Tmpfile;
use IO::Poll qw(POLLIN);
use Carp qw(croak carp);
use Digest::SHA ();
-use PublicInbox::DS qw(dwaitpid);
+use PublicInbox::DS qw(awaitpid);
our @EXPORT_OK = qw(git_unquote git_quote);
our $PIPE_BUFSIZ = 65536; # Linux default
our $in_cleanup;
@@ -138,7 +138,7 @@ sub _bidi_pipe {
$rdr->{2} = $fh;
}
my ($in_r, $p) = popen_rd(\@cmd, undef, $rdr);
- $self->{$pid} = $p;
+ awaitpid($self->{$pid} = $p, undef);
$self->{"$pid.owner"} = $$;
$out_w->autoflush(1);
if ($^O eq 'linux') { # 1031: F_SETPIPE_SZ
@@ -357,9 +357,9 @@ sub _destroy {
delete @$self{($rbuf, $in, $out)};
delete $self->{$err} if $err; # `err_c'
- # GitAsyncCat::event_step may delete {pid}
- my $p = delete $self->{$pid} or return;
- dwaitpid($p) if $$ == $self->{"$pid.owner"};
+ # GitAsyncCat::event_step may delete {$pid}
+ my $p = delete($self->{$pid}) // return;
+ awaitpid($p) if $$ == $self->{"$pid.owner"};
}
sub async_abort ($) {
^ permalink raw reply related [relevance 6%]
* [PATCH 00/12] improve process reaping
@ 2023-01-17 7:18 7% Eric Wong
2023-01-17 7:19 6% ` [PATCH 05/12] git|gcf2: switch to awaitpid Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2023-01-17 7:18 UTC (permalink / raw)
To: meta
dwaitpid was implemented under the assumption our code could
eventually use a multithreaded Perl 5. Since the threads(3perl)
manpage officially discourages threads, that assumption proved
false. This series saves syscalls and improves ergonomics of
our internal APIs, data structures and code a small bit.
Eric Wong (12):
ipc: remove {-reap_async} field
t/solver_git.t: fix test message
qspawn: drop {psgi_env} deref
ds: introduce awaitpid, switch ProcessPipe users
git|gcf2: switch to awaitpid
watch: switch to awaitpid
watch: simplify internal data structures
eofpipe: drop {arg} support for now
watch: IMAP and NNTP polling can use the same interval
ipc: drop unused $args from ->ipc_worker_stop
ipc+lei: switch to awaitpid
ds: drop dwaitpid, switch to waitpid(-1)
Documentation/technical/ds.txt | 2 +-
lib/PublicInbox/DS.pm | 69 ++++++++++++------------
lib/PublicInbox/Daemon.pm | 2 +-
lib/PublicInbox/EOFpipe.pm | 10 ++--
lib/PublicInbox/Gcf2Client.pm | 5 +-
lib/PublicInbox/Git.pm | 10 ++--
lib/PublicInbox/IPC.pm | 39 +++++++-------
lib/PublicInbox/LEI.pm | 8 ++-
lib/PublicInbox/LeiConvert.pm | 2 +-
lib/PublicInbox/LeiInput.pm | 2 +-
lib/PublicInbox/LeiMirror.pm | 7 ++-
lib/PublicInbox/LeiStore.pm | 7 ++-
lib/PublicInbox/LeiToMail.pm | 11 ++--
lib/PublicInbox/LeiUp.pm | 5 +-
lib/PublicInbox/LeiXSearch.pm | 9 ++--
lib/PublicInbox/ProcessPipe.pm | 42 +++++++--------
lib/PublicInbox/Qspawn.pm | 61 ++++++++++-----------
lib/PublicInbox/Spawn.pm | 6 +--
lib/PublicInbox/Watch.pm | 96 ++++++++++++----------------------
script/public-inbox-clone | 2 +-
t/solver_git.t | 2 +-
t/spawn.t | 12 +++--
22 files changed, 186 insertions(+), 223 deletions(-)
^ permalink raw reply [relevance 7%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2023-01-17 7:18 7% [PATCH 00/12] improve process reaping Eric Wong
2023-01-17 7:19 6% ` [PATCH 05/12] git|gcf2: switch to awaitpid 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).