Commit 83977d27 authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

rcutorture: Add batch number to script printout 



Currently, the scripts print "----Start batch" at the beginning of each
batch, which does serve as a good visual delimiter between batches.
Unfortunately, if there are a lot of batches, it is hard to quickly
estimate test runtime from the output of "--dryrun sched".  This commit
therefore adds a batch number, so that the beginning-of-batch output
looks like this "----Start batch 10" for the tenth batch.

Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: default avatarJosh Triplett <josh@joshtriplett.org>
parent 6cf10081

tools/testing/selftests/rcutorture/bin/kvm.sh

+9 −6
Original line number Diff line number Diff line
@@ -307,10 +307,10 @@ awk < $T/cfgcpu.pack \ 
}



# Dump out the scripting required to run one test batch.

function dump(first, pastlast)

function dump(first, pastlast, batchnum)

{

	print "echo ----Start batch: `date`";

	print "echo ----Start batch: `date` >> " rd "/log";

	print "echo ----Start batch " batchnum ": `date`";

	print "echo ----Start batch " batchnum ": `date` >> " rd "/log";

	jn=1

	for (j = first; j < pastlast; j++) {

		builddir=KVM "/b" jn
@@ -371,25 +371,28 @@ END { 
	njobs = i;

	nc = ncpus;

	first = 0;

	batchnum = 1;



	# Each pass through the following loop considers one test.

	for (i = 0; i < njobs; i++) {

		if (ncpus == 0) {

			# Sequential test specified, each test its own batch.

			dump(i, i + 1);

			dump(i, i + 1, batchnum);

			first = i;

			batchnum++;

		} else if (nc < cpus[i] && i != 0) {

			# Out of CPUs, dump out a batch.

			dump(first, i);

			dump(first, i, batchnum);

			first = i;

			nc = ncpus;

			batchnum++;

		}

		# Account for the CPUs needed by the current test.

		nc -= cpus[i];

	}

	# Dump the last batch.

	if (ncpus != 0)

		dump(first, i);

		dump(first, i, batchnum);

}' >> $T/script



cat << ___EOF___ >> $T/script

CRA Git | Maintained and supported by SUSTech CRA and CCSE