* [PATCH v2 2/2] test_common: avoid needless fcntl in start_script
2022-12-24 7:17 7% ` [PATCH 2/2] test_common: avoid needless fcntl in start_script Eric Wong
@ 2022-12-24 10:40 6% ` Eric Wong
0 siblings, 0 replies; 3+ results
From: Eric Wong @ 2022-12-24 10:40 UTC (permalink / raw)
To: meta
POSIX::dup2 does not do anything in addition to dup2(2) and is
thus immune to Perl automatically setting FD_CLOEXEC on FDs it
makes into IO objects/globs. We only need to account for the
case when both args for dup2 are identical, in which case the
kernel treats it as a no-op and then thus we need to clear
FD_CLOEXEC ourselves.
---
v2 now accounts for oldfd == newfd for dup2(2).
Interdiff:
diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm
index 179f8bae..b36c71a6 100644
--- a/lib/PublicInbox/TestCommon.pm
+++ b/lib/PublicInbox/TestCommon.pm
@@ -6,7 +6,7 @@ package PublicInbox::TestCommon;
use strict;
use parent qw(Exporter);
use v5.10.1;
-use Fcntl qw(FD_CLOEXEC F_SETFD F_GETFD :seek);
+use Fcntl qw(F_SETFD :seek);
use POSIX qw(dup2);
use IO::Socket::INET;
use File::Spec;
@@ -481,7 +481,12 @@ sub start_script {
my $fd;
for ($fd = 0; $fd < 3 || defined($opt->{$fd}); $fd++) {
my $io = $opt->{$fd} // next;
- dup2(fileno($io), $fd) or die "dup2($io, $fd): $!";
+ my $old = fileno($io);
+ if ($old == $fd) {
+ fcntl($io, F_SETFD, 0) // die "F_SETFD: $!";
+ } else {
+ dup2($old, $fd) // die "dup2($old, $fd): $!";
+ }
}
%ENV = (%ENV, %$env) if $env;
my $fds = $fd - 3;
lib/PublicInbox/TestCommon.pm | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm
index 888c1f1e..b36c71a6 100644
--- a/lib/PublicInbox/TestCommon.pm
+++ b/lib/PublicInbox/TestCommon.pm
@@ -6,7 +6,7 @@ package PublicInbox::TestCommon;
use strict;
use parent qw(Exporter);
use v5.10.1;
-use Fcntl qw(FD_CLOEXEC F_SETFD F_GETFD :seek);
+use Fcntl qw(F_SETFD :seek);
use POSIX qw(dup2);
use IO::Socket::INET;
use File::Spec;
@@ -479,16 +479,14 @@ sub start_script {
# pretend to be systemd (cf. sd_listen_fds(3))
# 3 == SD_LISTEN_FDS_START
my $fd;
- for ($fd = 0; 1; $fd++) {
- my $s = $opt->{$fd};
- last if $fd >= 3 && !defined($s);
- next unless $s;
- my $fl = fcntl($s, F_GETFD, 0);
- if (($fl & FD_CLOEXEC) != FD_CLOEXEC) {
- warn "got FD:".fileno($s)." w/o CLOEXEC\n";
+ for ($fd = 0; $fd < 3 || defined($opt->{$fd}); $fd++) {
+ my $io = $opt->{$fd} // next;
+ my $old = fileno($io);
+ if ($old == $fd) {
+ fcntl($io, F_SETFD, 0) // die "F_SETFD: $!";
+ } else {
+ dup2($old, $fd) // die "dup2($old, $fd): $!";
}
- fcntl($s, F_SETFD, $fl &= ~FD_CLOEXEC);
- dup2(fileno($s), $fd) or die "dup2 failed: $!\n";
}
%ENV = (%ENV, %$env) if $env;
my $fds = $fd - 3;
^ permalink raw reply related [relevance 6%]
* [PATCH 2/2] test_common: avoid needless fcntl in start_script
2022-12-24 7:17 6% [PATCH 0/2] spawning-related cleanups Eric Wong
@ 2022-12-24 7:17 7% ` Eric Wong
2022-12-24 10:40 6% ` [PATCH v2 " Eric Wong
0 siblings, 1 reply; 3+ results
From: Eric Wong @ 2022-12-24 7:17 UTC (permalink / raw)
To: meta
POSIX::dup2 does not do anything in addition to dup2(2) and is
thus immune to Perl automatically setting FD_CLOEXEC on FDs it
makes into IO objects/globs.
---
lib/PublicInbox/TestCommon.pm | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm
index 888c1f1e..179f8bae 100644
--- a/lib/PublicInbox/TestCommon.pm
+++ b/lib/PublicInbox/TestCommon.pm
@@ -479,16 +479,9 @@ sub start_script {
# pretend to be systemd (cf. sd_listen_fds(3))
# 3 == SD_LISTEN_FDS_START
my $fd;
- for ($fd = 0; 1; $fd++) {
- my $s = $opt->{$fd};
- last if $fd >= 3 && !defined($s);
- next unless $s;
- my $fl = fcntl($s, F_GETFD, 0);
- if (($fl & FD_CLOEXEC) != FD_CLOEXEC) {
- warn "got FD:".fileno($s)." w/o CLOEXEC\n";
- }
- fcntl($s, F_SETFD, $fl &= ~FD_CLOEXEC);
- dup2(fileno($s), $fd) or die "dup2 failed: $!\n";
+ for ($fd = 0; $fd < 3 || defined($opt->{$fd}); $fd++) {
+ my $io = $opt->{$fd} // next;
+ dup2(fileno($io), $fd) or die "dup2($io, $fd): $!";
}
%ENV = (%ENV, %$env) if $env;
my $fds = $fd - 3;
^ permalink raw reply related [relevance 7%]
* [PATCH 0/2] spawning-related cleanups
@ 2022-12-24 7:17 6% Eric Wong
2022-12-24 7:17 7% ` [PATCH 2/2] test_common: avoid needless fcntl in start_script Eric Wong
0 siblings, 1 reply; 3+ results
From: Eric Wong @ 2022-12-24 7:17 UTC (permalink / raw)
To: meta
Eric Wong (2):
spawn_pp: cleanup, error check and more descriptive errors
test_common: avoid needless fcntl in start_script
lib/PublicInbox/SpawnPP.pm | 32 +++++++++++---------------------
lib/PublicInbox/TestCommon.pm | 13 +++----------
2 files changed, 14 insertions(+), 31 deletions(-)
^ permalink raw reply [relevance 6%]
Results 1-3 of 3 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2022-12-24 7:17 6% [PATCH 0/2] spawning-related cleanups Eric Wong
2022-12-24 7:17 7% ` [PATCH 2/2] test_common: avoid needless fcntl in start_script Eric Wong
2022-12-24 10:40 6% ` [PATCH v2 " 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).