On Wed, May 18, 2011 at 01:58:36PM -0700, Allison Henderson wrote:
> This patch adds punch hole tests to the fsx
> stress test. The test is performed through
> the fallocate call by randomly choosing to
> use the punch hole flag when running the
> fallocate test. Regions that have
> been punched out should contain zeros, so
> the expected file contents buffer is updated
> to contain zeros when a hole is punched out.
>
> Signed-off-by: Allison Henderson <achender@xxxxxxxxxx>
> ---
> v0 -> v1:
> Corrections to the Makefile have been backed out.
> This patch needs to be applied on top of
> the "xfstests: clean up fallocate configuration tests"
> patch
>
> The punch hole tests can be disabled with the
> -H flag, and will also be disabled if it is
> detected that the filesystem does not support
> punch hole
>
>
> :100644 100644 fe072d3... 8978ef1... M ltp/fsx.c
> ltp/fsx.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------
> 1 files changed, 96 insertions(+), 15 deletions(-)
>
> diff --git a/ltp/fsx.c b/ltp/fsx.c
> index fe072d3..8978ef1 100644
> --- a/ltp/fsx.c
> +++ b/ltp/fsx.c
> @@ -110,6 +110,7 @@ int randomoplen = 1; /* -O flag disables it */
> int seed = 1; /* -S flag */
> int mapped_writes = 1; /* -W flag disables */
> int fallocate_calls = 1; /* -F flag disables */
> +int punch_hole_calls = 1; /* -H flag disables */
> int mapped_reads = 1; /* -R flag disables it */
> int fsxgoodfd = 0;
> int o_direct; /* -Z */
> @@ -207,7 +208,8 @@ logdump(void)
> {
> int i, count, down;
> struct log_entry *lp;
> - char *falloc_type[3] = {"PAST_EOF", "EXTENDING", "INTERIOR"};
> + char *falloc_type[4] = {"PAST_EOF", "EXTENDING", "INTERIOR",
> + "PUNCH_HOLE"};
>
> prt("LOG DUMP (%d total operations):\n", logcount);
> if (logcount < LOGSIZE) {
> @@ -791,6 +793,11 @@ dofallocate(unsigned offset, unsigned length)
> {
> unsigned end_offset;
> int keep_size;
> + int max_offset = 0;
> + int max_len = 0;
> + int mode = 0;
> + char *op_name;
> + int punch_hole = 0;
>
> if (length == 0) {
> if (!quiet && testcalls > simulatedopcount)
> @@ -799,11 +806,37 @@ dofallocate(unsigned offset, unsigned length)
> return;
> }
>
> +#ifdef FALLOC_FL_PUNCH_HOLE
> + if (fallocate_calls && !punch_hole_calls)
> + punch_hole = 0;
> + else if (!fallocate_calls && punch_hole_calls)
> + punch_hole = 1;
> + else
> + punch_hole = random() % 2;
> +
> + /* Keep size must be set for punch hole */
> + if (punch_hole) {
> + keep_size = 1;
> + mode = FALLOC_FL_PUNCH_HOLE;
> + } else
> + keep_size = random() % 2;
> +#else
> keep_size = random() % 2;
> +#endif
Ugh. Can you please separate hole punching out into it's own
function? i.e. do_fallocate() gets renamed to do_preallocate(), and
this new functionality goes into do_hole_punch()? The fact that they
both use the fallocate() system call is no reason for complicating
the logic like this....
> @@ -1426,8 +1489,26 @@ main(int argc, char **argv)
> if (fallocate(fd, 0, 0, 1) && errno == EOPNOTSUPP) {
> warn("main: filesystem does not support fallocate, disabling");
> fallocate_calls = 0;
> - } else
> + /*
> + * punch hole depends on fallocate,
> + * so turn punch hole off too
> + */
> + punch_hole_calls = 0;
> + } else {
> +#ifdef FALLOC_FL_PUNCH_HOLE
> + if (fallocate(fd,
> + FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE,
> + 0, 1) && errno == EOPNOTSUPP) {
> + warn("main: filesystem does not support"
> + " fallocate punch hole, disabling");
> + punch_hole_calls = 0;
> + }
> +#else
> + punch_hole_calls = 0;
> +#endif
> +
> ftruncate(fd, 0);
> + }
> }
> #else /* ! FALLOCATE */
> fallocate_calls = 0;
And these functionality tests would probably be better in their own
function, too.
Cheers,
Dave.
--
Dave Chinner
david@xxxxxxxxxxxxx
_______________________________________________
xfs mailing list
xfs@xxxxxxxxxxx
http://oss.sgi.com/mailman/listinfo/xfs
