parallel in invoke

diff --git a/README b/README
index 053aea41a588a9b2b3ff27ed2132e2116eb0a7eb..09c1b19c8464916b8e46ef41f1f24d007b1633f6 100644 (file)
--- a/README
+++ b/README
@@ -1,3 +1,5 @@
+./invoke
+
 Copyright 2016 Ian Jackson
 Consider all of this GPLv2-or-later
 There is NO WARRANTY

diff --git a/check b/check
index 7ffa2da33ecc73a00cd89101b966f95d728148a4..7ebdda0b7ef0db620bfa05f7351003d8e1acd086 100755 (executable)
--- a/check
+++ b/check
@@ -2,31 +2,22 @@
 set -e
 set -o pipefail
 
-cpus=$(
-       perl -we '
-           use strict;
-           require Sys::CPU;
-           my $ncpus = Sys::CPU::cpu_count();
-           $ncpus *= 1.5;
-            print join " ", (0 .. $ncpus-1) or die $!;
-           print "\n" or die $!;
-       ' ||
-       echo 0 1 2
-)
+cpus='0 1'
 
 uid=`id -u`
 cd /var/run/user/$uid
 mkdir -p version-charset-test
 cd version-charset-test
 
-rm -rf stunt
-mkdir stunt
-cd stunt
+stunt=stunt$1
+rm -rf $stunt
+mkdir $stunt
+cd $stunt
 
 for cpu in $cpus; do
        mkdir c$cpu
        (cd c$cpu
-        git init)
+        git init -q)
 done
 
 #exec 3<&0 </dev/null

diff --git a/invoke b/invoke
index fc67da9063f752764a623bbf7aed84d0d7735228..589c577f5eb357ba92e389384d8cb7fe7f851938 100755 (executable)
--- a/invoke
+++ b/invoke
@@ -2,7 +2,40 @@
 set -o pipefail
 set -ex
 
-./generate "$@" | ../dpkg/src/dpkg --filter-valid-versions | ./escape | ./check 
+cpus=$(
+       perl -we '
+           use strict;
+           require Sys::CPU;
+           my $ncpus = Sys::CPU::cpu_count();
+           $ncpus *= 1.5;
+           print $ncpus, " " or die $!;
+            print join " ", (0 .. $ncpus-1) or die $!;
+           print "\n" or die $!;
+       ' ||
+       echo 3 0 1 2
+)
+
+ncpus=${cpus%% *}
+cpus=${cpus#* }
+
+echo >&2 "ncpus=$ncpus cpus=($cpus)"
+
+pids=()
+
+for cpu in $cpus; do
+       (
+       ./generate $cpu/$ncpus "$@"                             | \
+       ../dpkg/src/dpkg --filter-valid-versions                | \
+       ./escape                                                | \
+       ./check $cpu
+       echo >&2 "cpu $cpu ok"
+       ) &
+       pids+=( $! )
+done
+
+for pid in ${pids[*]}; do
+       wait $pid
+done
 
 echo '*** OK EVERYTHING IS FINE ***'