From: Eric Wong <e@80x24.org>
To: spew@80x24.org
Subject: [PATCH 01/18] spawn: croak directly in C pi_fork_exec
Date: Fri, 27 Oct 2023 09:40:22 +0000 [thread overview]
Message-ID: <20231027094039.3788289-1-e@80x24.org> (raw)
This saves us some Perl code in the wrapper, since the SpawnPP
implementation also dies directly.
---
lib/PublicInbox/Spawn.pm | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/lib/PublicInbox/Spawn.pm b/lib/PublicInbox/Spawn.pm
index 1fa7a41f..5740ee58 100644
--- a/lib/PublicInbox/Spawn.pm
+++ b/lib/PublicInbox/Spawn.pm
@@ -89,7 +89,7 @@ int pi_fork_exec(SV *redirref, SV *file, SV *cmdref, SV *envref, SV *rlimref,
AV *env = (AV *)SvRV(envref);
AV *rlim = (AV *)SvRV(rlimref);
const char *filename = SvPV_nolen(file);
- pid_t pid;
+ pid_t pid = -1;
char **argv, **envp;
sigset_t set, old;
int ret, perrnum;
@@ -100,17 +100,17 @@ int pi_fork_exec(SV *redirref, SV *file, SV *cmdref, SV *envref, SV *rlimref,
AV2C_COPY(argv, cmd);
AV2C_COPY(envp, env);
- if (sigfillset(&set)) return -1;
- if (sigdelset(&set, SIGABRT)) return -1;
- if (sigdelset(&set, SIGBUS)) return -1;
- if (sigdelset(&set, SIGFPE)) return -1;
- if (sigdelset(&set, SIGILL)) return -1;
- if (sigdelset(&set, SIGSEGV)) return -1;
+ if (sigfillset(&set)) goto out;
+ if (sigdelset(&set, SIGABRT)) goto out;
+ if (sigdelset(&set, SIGBUS)) goto out;
+ if (sigdelset(&set, SIGFPE)) goto out;
+ if (sigdelset(&set, SIGILL)) goto out;
+ if (sigdelset(&set, SIGSEGV)) goto out;
/* no XCPU/XFSZ here */
- if (sigprocmask(SIG_SETMASK, &set, &old)) return -1;
+ if (sigprocmask(SIG_SETMASK, &set, &old)) goto out;
chld_is_member = sigismember(&old, SIGCHLD);
- if (chld_is_member < 0) return -1;
- if (chld_is_member > 0 && sigdelset(&old, SIGCHLD)) return -1;
+ if (chld_is_member < 0) goto out;
+ if (chld_is_member > 0 && sigdelset(&old, SIGCHLD)) goto out;
pid = vfork();
if (pid == 0) {
@@ -171,6 +171,8 @@ int pi_fork_exec(SV *redirref, SV *file, SV *cmdref, SV *envref, SV *rlimref,
} else if (perrnum) {
errno = perrnum;
}
+out:
+ if (pid < 0) croak("E: fork_exec %s: %s\n", filename, strerror(errno));
return (int)pid;
}
@@ -369,9 +371,7 @@ sub spawn ($;$$) {
}
my $cd = $opt->{'-C'} // ''; # undef => NULL mapping doesn't work?
my $pgid = $opt->{pgid} // -1;
- my $pid = pi_fork_exec(\@rdr, $f, $cmd, \@env, $rlim, $cd, $pgid);
- die "fork_exec @$cmd failed: $!\n" unless $pid > 0;
- $pid;
+ pi_fork_exec(\@rdr, $f, $cmd, \@env, $rlim, $cd, $pgid);
}
sub popen_rd {
next reply other threads:[~2023-10-27 9:40 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-27 9:40 Eric Wong [this message]
2023-10-27 9:40 ` [PATCH 02/18] spawnpp: use autodie for syscall failures Eric Wong
2023-10-27 9:40 ` [PATCH 03/18] spawn: avoid alloca in C pi_fork_exec Eric Wong
2023-10-27 9:40 ` [PATCH 04/18] git: use run_qx to read `git --version' Eric Wong
2023-10-27 9:40 ` [PATCH 05/18] git: avoid extra stat(2) for git version Eric Wong
2023-10-27 9:40 ` [PATCH 06/18] import: use run_qx Eric Wong
2023-10-27 9:40 ` [PATCH 07/18] treewide: use ->close method rather than CORE::close Eric Wong
2023-10-27 9:40 ` [PATCH 08/18] fetch: use run_qx Eric Wong
2023-10-27 9:40 ` [PATCH 09/18] git_credential: use IO::Handle->close Eric Wong
2023-10-27 9:40 ` [PATCH 10/18] cindex: drop redundant close on regular FH Eric Wong
2023-10-27 9:40 ` [PATCH 11/18] admin: run_qx Eric Wong
2023-10-27 9:40 ` [PATCH 12/18] config: use ->close for popen_rd pipe Eric Wong
2023-10-27 9:40 ` [PATCH 13/18] import: use ->close for fast-import socket Eric Wong
2023-10-27 9:40 ` [PATCH 14/18] lei_mirror: use run_qx Eric Wong
2023-10-27 9:40 ` [PATCH 15/18] lei_rediff: ->close for popen_wr Eric Wong
2023-10-27 9:40 ` [PATCH 16/18] spamcheck/spamc: use run_qx Eric Wong
2023-10-27 9:40 ` [PATCH 17/18] lei_xsearch: use ->close Eric Wong
2023-10-27 9:40 ` [PATCH 18/18] searchidx: ->close Eric Wong
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=20231027094039.3788289-1-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).