X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=check;h=0a809e050db819fa19ba00fb5c666c7981c8e225;hb=6c3317c7568682f3bda83a4a3d5713d738389519;hp=a7ae489e6d0f17339317df2232902e04b6fe5c3d;hpb=8562fabbfecb6a9635e90646c1a8b356cec2e375;p=version-charset-test.git

diff --git a/check b/check
index a7ae489..0a809e0 100755
--- a/check
+++ b/check
@@ -2,13 +2,35 @@
 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
+)
+
+uid=`id -u`
+cd /var/run/user/$uid
+mkdir -p version-charset-test
+cd version-charset-test
+
 rm -rf stunt
 mkdir stunt
 cd stunt
 
+for cpu in $cpus; do
+	mkdir c$cpu
+	(cd c$cpu
+	 git init)
+done
+
 #exec 3<&0 </dev/null
 
-git init
 #git commit --allow-empty -m 'Test object'
 #head=`git rev-parse HEAD`
 
@@ -19,21 +41,53 @@ perl -we '
 
     our $file;
     our $count;
+    our $batch=0;
+    our @tasks;
+
+    my @freecpus = qw('"$cpus"');
+
+    print STDERR "check using cpus @freecpus\n";
+
+    sub await_task () {
+	my ($pid, $cpu, $oldbatch) = @{ shift @tasks };
+	waitpid $pid, 0 == $pid or die $!;
+	die "$oldbatch $?" if $?;
+	unlink "b$oldbatch" or die "$oldbatch $!";
+        print STDERR "check completed $oldbatch [$pid] #$cpu\n";
+	push @freecpus, $cpu;
+    }
 
     sub complete_batch () {
-        if ($file) {
-            print STDERR "check completing batch\n";
-            close $file or die $!;
-	    system "git update-ref --stdin <batch"
-                and die $? < 0 ? $! : $?;
-        }
+        return unless $file;
+
+	close $file or die $!;
+
+        print STDERR "check closing $batch ($count)\n";
+
+	await_task unless @freecpus;
+
+	my $cpu = shift @freecpus;
+
+	my $pid = fork // die $!;
+	if (!$pid) {
+	    close STDIN;
+#            seek STDIN,0,1;
+#            flush STDIN;
+	    open STDIN, "<", "b$batch" or die $batch;
+	    chdir "c$cpu" or die "$cpu $!";
+	    exec qw(eatmydata git update-ref --stdin);
+	    die $!;
+	}
+        print STDERR "check spawned $batch ($count) [$pid] #$cpu\n";
+    	push @tasks, [ $pid, $cpu, $batch ];
+	$batch++;
 	$file = undef;
 	$count = 0;
     }
 
     while (<>) {
 #print STDERR ">$_<\n";
-        $file ||= new IO::File "batch", ">" or die $!;
+        $file ||= new IO::File "b$batch", ">" or die $!;
         chomp;
 	print $file "delete refs/tags/$_\n" or die $!;
 	$count++ < 100000 or complete_batch;
@@ -41,4 +95,5 @@ perl -we '
 #print STDERR "FOO\n";
     STDIN->error and die $!;
     complete_batch();
+    await_task while @tasks;
 '