From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <e@80x24.org>
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net
X-Spam-Level: 
X-Spam-ASN:  
X-Spam-Status: No, score=-4.2 required=3.0 tests=ALL_TRUSTED,BAYES_00,
	DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no
	autolearn=ham autolearn_force=no version=3.4.6
Received: from localhost (dcvr.yhbt.net [127.0.0.1])
	by dcvr.yhbt.net (Postfix) with ESMTP id 094D41F698
	for <meta@public-inbox.org>; Fri, 30 Dec 2022 22:05:55 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org;
	s=selector1; t=1672437955;
	bh=jdDEPLZsWE0pUmdJawAMv3MLkoVb+PzuBvrjIkVmNX4=;
	h=From:To:Subject:Date:From;
	b=0lxSSkt1hiez2ye3WaQbkS7e3fvluTUmXy1gjI9i8Mwz8hxfJBd9KyNKH1vXiRzOM
	 FXRt3YBsW5Ix5L1DtKG+gNGBwORH4osgk+Sm6eo1hqGES8Ny9cqrnnsE/kP4njgaPV
	 +iDiMKr/vK1LbZyulYSUCL1h7PHlNRTtExgE0W6M=
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
Message-Id: <20221230220728.66248-1-e@80x24.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
List-Id: <meta.public-inbox.org>

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));