#!/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
#
# 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;
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) {
my $r = sysread($rd, my $buf, UINT_SIZE);
$tb->reset;
}
kill 'USR1', $producer if !$eof; # sets $eof in $producer
- DIE join('', map { "E: $_\n" } @err) if @err;
+ if (@err) { # write to run_log for $sigchld handler
+ syswrite($run_log, "$$ @err\n");
+ DIE join('', map { "E: $_\n" } @err);
+ }
exit(0);
} else {
$pids{$pid} = $j;
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 {
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));
print $OLDOUT "1..".($repeat * scalar(@tests))."\n" if $repeat >= 0;
if ($lei_env && $$ == $owner_pid) {
my $opt = { 1 => $OLDOUT, 2 => $OLDERR };
+ my $cur_daemon_pid;
+ run_script([qw(lei daemon-pid)], $lei_env, { 1 => \$cur_daemon_pid });
run_script([qw(lei daemon-kill)], $lei_env, $opt);
+ DIE "lei daemon restarted\n" if $cur_daemon_pid != $lei_daemon_pid;
}