From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] t/run.perl: drop branch for a small set of test cases
Date: Fri, 30 Dec 2022 22:07:28 +0000 [thread overview]
Message-ID: <20221230220728.66248-1-e@80x24.org> (raw)
It's not worth it, since our test count is only going to
increase over time.
---
t/run.perl | 28 ++++++++++++----------------
1 file changed, 12 insertions(+), 16 deletions(-)
diff --git a/t/run.perl b/t/run.perl
index cf80a8a1..b90715a6 100755
--- a/t/run.perl
+++ b/t/run.perl
@@ -1,5 +1,5 @@
#!/usr/bin/perl -w
-# Copyright (C) 2019-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>
#
# Parallel test runner which preloads code and reuses worker processes
@@ -10,8 +10,7 @@
#
# Usage: $PERL -I lib -w t/run.perl -j4
# Or via prove(1): prove -lvw t/run.perl :: -j4
-use strict;
-use v5.10.1;
+use v5.12;
use IO::Handle; # ->autoflush
use PublicInbox::TestCommon;
use PublicInbox::Spawn;
@@ -167,7 +166,7 @@ my $start_worker = sub {
my ($j, $rd, $wr, $todo) = @_;
my $pid = fork // DIE "fork: $!";
if ($pid == 0) {
- close $wr if $wr;
+ close $wr;
$SIG{USR1} = undef; # undo parent $SIG{USR1}
$worker = $$;
while (1) {
@@ -203,15 +202,11 @@ for (my $i = $repeat; $i != 0; $i--) {
pipe(my ($rd, $wr)) or DIE "pipe: $!";
# fill the queue before forking so children can start earlier
- my $n = (POSIX::PIPE_BUF / UINT_SIZE);
- if ($n >= $#todo) {
- print $wr join('', map { pack('I', $_) } (0..$#todo)) or DIE;
- undef $wr;
- } else { # write what we can...
- $wr->autoflush(1);
- print $wr join('', map { pack('I', $_) } (0..$n)) or DIE;
- $n += 1; # and send more ($n..$#todo), later
- }
+ $wr->autoflush(1);
+ $wr->blocking(0);
+ my $todo_buf = join('', map { pack('I', $_) } (0..$#todo));
+ my $woff = syswrite($wr, $todo_buf) // DIE "syswrite: $!";
+ substr($todo_buf, 0, $woff, '');
$eof = undef;
local $SIG{USR1} = sub { $eof = 1 };
my $sigchld = sub {
@@ -243,12 +238,13 @@ for (my $i = $repeat; $i != 0; $i--) {
for (my $j = 0; $j < $jobs; $j++) {
$start_worker->($j, $rd, $wr, \@todo);
}
- if ($wr) {
+ {
local $SIG{CHLD} = $sigchld;
# too many tests to fit in the pipe before starting workers,
# send the rest now the workers are running
- print $wr join('', map { pack('I', $_) } ($n..$#todo)) or DIE;
- undef $wr;
+ $wr->blocking(1);
+ print $wr $todo_buf or DIE;
+ close $wr;
}
$sigchld->(0) while scalar(keys(%pids));
reply other threads:[~2022-12-30 22:05 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221230220728.66248-1-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.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.
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).