fsx: Generate test parameters in test()

Generate all test parameters in test(), including keep_size.

The code is slightly more complicated than it could be to produce the
same sequence of operations for the same random seed.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
Andreas Gruenbacher
2016-01-11 14:44:51 +11:00
committed by Dave Chinner
parent 6b7be00b07
commit e1598eb840
+18 -14
View File
@@ -914,11 +914,10 @@ do_punch_hole(unsigned offset, unsigned length)
#ifdef FALLOC_FL_ZERO_RANGE #ifdef FALLOC_FL_ZERO_RANGE
void void
do_zero_range(unsigned offset, unsigned length) do_zero_range(unsigned offset, unsigned length, int keep_size)
{ {
unsigned end_offset; unsigned end_offset;
int mode = FALLOC_FL_ZERO_RANGE; int mode = FALLOC_FL_ZERO_RANGE;
int keep_size = 0;
if (length == 0) { if (length == 0) {
if (!quiet && testcalls > simulatedopcount) if (!quiet && testcalls > simulatedopcount)
@@ -927,9 +926,6 @@ do_zero_range(unsigned offset, unsigned length)
return; return;
} }
if (keep_size_calls)
keep_size = random() % 2;
end_offset = keep_size ? 0 : offset + length; end_offset = keep_size ? 0 : offset + length;
if (end_offset > biggest) { if (end_offset > biggest) {
@@ -966,7 +962,7 @@ do_zero_range(unsigned offset, unsigned length)
#else #else
void void
do_zero_range(unsigned offset, unsigned length) do_zero_range(unsigned offset, unsigned length, int keep_size)
{ {
return; return;
} }
@@ -1080,10 +1076,9 @@ do_insert_range(unsigned offset, unsigned length)
#ifdef HAVE_LINUX_FALLOC_H #ifdef HAVE_LINUX_FALLOC_H
/* fallocate is basically a no-op unless extending, then a lot like a truncate */ /* fallocate is basically a no-op unless extending, then a lot like a truncate */
void void
do_preallocate(unsigned offset, unsigned length) do_preallocate(unsigned offset, unsigned length, int keep_size)
{ {
unsigned end_offset; unsigned end_offset;
int keep_size = 0;
if (length == 0) { if (length == 0) {
if (!quiet && testcalls > simulatedopcount) if (!quiet && testcalls > simulatedopcount)
@@ -1092,9 +1087,6 @@ do_preallocate(unsigned offset, unsigned length)
return; return;
} }
if (keep_size_calls)
keep_size = random() % 2;
end_offset = keep_size ? 0 : offset + length; end_offset = keep_size ? 0 : offset + length;
if (end_offset > biggest) { if (end_offset > biggest) {
@@ -1132,7 +1124,7 @@ do_preallocate(unsigned offset, unsigned length)
} }
#else #else
void void
do_preallocate(unsigned offset, unsigned length) do_preallocate(unsigned offset, unsigned length, int keep_size)
{ {
return; return;
} }
@@ -1211,6 +1203,7 @@ test(void)
unsigned long size = maxoplen; unsigned long size = maxoplen;
unsigned long rv = random(); unsigned long rv = random();
unsigned long op; unsigned long op;
int keep_size = 0;
if (simulatedopcount > 0 && testcalls == simulatedopcount) if (simulatedopcount > 0 && testcalls == simulatedopcount)
writefileimage(); writefileimage();
@@ -1236,6 +1229,17 @@ test(void)
else else
op = rv % OP_MAX_FULL; op = rv % OP_MAX_FULL;
switch(op) {
case OP_FALLOCATE:
if (fallocate_calls && size && keep_size_calls)
keep_size = random() % 2;
break;
case OP_ZERO_RANGE:
if (zero_range_calls && size && keep_size_calls)
keep_size = random() % 2;
break;
}
switch (op) { switch (op) {
case OP_MAPREAD: case OP_MAPREAD:
if (!mapped_reads) if (!mapped_reads)
@@ -1306,7 +1310,7 @@ test(void)
case OP_FALLOCATE: case OP_FALLOCATE:
TRIM_OFF_LEN(offset, size, maxfilelen); TRIM_OFF_LEN(offset, size, maxfilelen);
do_preallocate(offset, size); do_preallocate(offset, size, keep_size);
break; break;
case OP_PUNCH_HOLE: case OP_PUNCH_HOLE:
@@ -1315,7 +1319,7 @@ test(void)
break; break;
case OP_ZERO_RANGE: case OP_ZERO_RANGE:
TRIM_OFF_LEN(offset, size, file_size); TRIM_OFF_LEN(offset, size, file_size);
do_zero_range(offset, size); do_zero_range(offset, size, keep_size);
break; break;
case OP_COLLAPSE_RANGE: case OP_COLLAPSE_RANGE:
TRIM_OFF_LEN(offset, size, file_size - 1); TRIM_OFF_LEN(offset, size, file_size - 1);