diff --git a/cmd/zpios/zpios.h b/cmd/zpios/zpios.h index 79fdf8be1e..d88af0b040 100644 --- a/cmd/zpios/zpios.h +++ b/cmd/zpios/zpios.h @@ -82,6 +82,7 @@ typedef struct cmd_args { range_repeat_t S; /* Regionsize */ const char *pool; /* Pool */ + const char *name; /* Name */ uint32_t flags; /* Flags */ uint32_t io_type; /* DMUIO only */ uint32_t verbose; /* Verbose */ @@ -113,7 +114,7 @@ int set_lhi(char *pattern, range_repeat_t *range, char *optarg, int set_noise(uint64_t *noise, char *optarg, char *arg); int set_load_params(cmd_args_t *args, char *optarg); int check_mutual_exclusive_command_lines(uint32_t flag, char *arg); -void print_stats_header(void); +void print_stats_header(cmd_args_t *args); void print_stats(cmd_args_t *args, zpios_cmd_t *cmd); #endif /* _ZPIOS_H */ diff --git a/cmd/zpios/zpios_main.c b/cmd/zpios/zpios_main.c index 662a7b8ecc..f774682ac8 100644 --- a/cmd/zpios/zpios_main.c +++ b/cmd/zpios/zpios_main.c @@ -45,7 +45,7 @@ #include "zpios.h" static const char short_opt[] = "t:l:h:e:n:i:j:k:o:m:q:r:c:a:b:g:s:A:B:C:" - "L:p:xP:R:G:I:N:T:VzOfHv?"; + "L:p:M:xP:R:G:I:N:T:VzOfHv?"; static const struct option long_opt[] = { {"threadcount", required_argument, 0, 't' }, {"threadcount_low", required_argument, 0, 'l' }, @@ -69,6 +69,7 @@ static const struct option long_opt[] = { {"regionsize_incr", required_argument, 0, 'C' }, {"load", required_argument, 0, 'L' }, {"pool", required_argument, 0, 'p' }, + {"name", required_argument, 0, 'M' }, {"cleanup", no_argument, 0, 'x' }, {"prerun", required_argument, 0, 'P' }, {"postrun", required_argument, 0, 'R' }, @@ -118,6 +119,7 @@ usage(void) " --regionsize_incr -C =value\n" " --load -L =dmuio|ssf|fpp\n" " --pool -p =pool name\n" + " --name -M =test name\n" " --cleanup -x\n" " --prerun -P =pre-command\n" " --postrun -R =post-command\n" @@ -255,6 +257,9 @@ args_init(int argc, char **argv) case 'p': /* --pool */ args->pool = optarg; break; + case 'M': + args->name = optarg; + break; case 'x': /* --cleanup */ args->flags |= DMU_REMOVE; break; @@ -615,7 +620,7 @@ main(int argc, char **argv) if (args->verbose) fprintf(stdout, "%s", zpios_version); - print_stats_header(); + print_stats_header(args); rc = run_thread_counts(args); out: if (args != NULL) diff --git a/cmd/zpios/zpios_util.c b/cmd/zpios/zpios_util.c index 407a5522a7..e42d06f111 100644 --- a/cmd/zpios/zpios_util.c +++ b/cmd/zpios/zpios_util.c @@ -293,7 +293,7 @@ check_mutual_exclusive_command_lines(uint32_t flag, char *arg) return 0; } - if ((flag & (FLAG_LOW | FLAG_HIGH | FLAG_INCR)) && !(flag & FLAG_SET)) { + if ((flag & (FLAG_LOW | FLAG_HIGH | FLAG_INCR)) && !(flag & FLAG_SET)){ if (flag != (FLAG_LOW | FLAG_HIGH | FLAG_INCR)) { fprintf(stderr, "Error: One or more values missing " "from --%s_low, --%s_high, --%s_incr.\n", @@ -306,14 +306,24 @@ check_mutual_exclusive_command_lines(uint32_t flag, char *arg) } void -print_stats_header(void) +print_stats_header(cmd_args_t *args) { - printf("ret-code id\tth-cnt\trg-cnt\trg-sz\tch-sz\toffset\trg-no\tch-no\t" - "th-dly\tflags\ttime\tcr-time\trm-time\twr-time\t" - "rd-time\twr-data\twr-ch\twr-bw\trd-data\trd-ch\trd-bw\n"); - printf("------------------------------------------------------------" - "------------------------------------------------------------" - "-----------------------------------------------------------\n"); + if (args->verbose) { + printf("status name id\tth-cnt\trg-cnt\trg-sz\t" + "ch-sz\toffset\trg-no\tch-no\tth-dly\tflags\ttime\t" + "cr-time\trm-time\twr-time\trd-time\twr-data\twr-ch\t" + "wr-bw\trd-data\trd-ch\trd-bw\n"); + printf("------------------------------------------------" + "------------------------------------------------" + "------------------------------------------------" + "----------------------------------------------\n"); + } else { + printf("status name id\t" + "wr-data\twr-ch\twr-bw\t" + "rd-data\trd-ch\trd-bw\n"); + printf("-----------------------------------------" + "--------------------------------------\n"); + } } static void @@ -324,20 +334,24 @@ print_stats_human_readable(cmd_args_t *args, zpios_cmd_t *cmd) char str[KMGT_SIZE]; if (args->rc) - printf("FAILED: %3d ", args->rc); + printf("FAIL: %3d ", args->rc); else - printf("PASSED: %3d ", args->rc); + printf("PASS: "); - printf("%u\t", cmd->cmd_id); - printf("%u\t", cmd->cmd_thread_count); - printf("%u\t", cmd->cmd_region_count); - printf("%s\t", uint64_to_kmgt(str, cmd->cmd_region_size)); - printf("%s\t", uint64_to_kmgt(str, cmd->cmd_chunk_size)); - printf("%s\t", uint64_to_kmgt(str, cmd->cmd_offset)); - printf("%s\t", uint64_to_kmgt(str, cmd->cmd_region_noise)); - printf("%s\t", uint64_to_kmgt(str, cmd->cmd_chunk_noise)); - printf("%s\t", uint64_to_kmgt(str, cmd->cmd_thread_delay)); - printf("%s\t", print_flags(str, cmd->cmd_flags)); + printf("%-12s", args->name ? args->name : ZPIOS_NAME); + printf("%2u\t", cmd->cmd_id); + + if (args->verbose) { + printf("%u\t", cmd->cmd_thread_count); + printf("%u\t", cmd->cmd_region_count); + printf("%s\t", uint64_to_kmgt(str, cmd->cmd_region_size)); + printf("%s\t", uint64_to_kmgt(str, cmd->cmd_chunk_size)); + printf("%s\t", uint64_to_kmgt(str, cmd->cmd_offset)); + printf("%s\t", uint64_to_kmgt(str, cmd->cmd_region_noise)); + printf("%s\t", uint64_to_kmgt(str, cmd->cmd_chunk_noise)); + printf("%s\t", uint64_to_kmgt(str, cmd->cmd_thread_delay)); + printf("%s\t", print_flags(str, cmd->cmd_flags)); + } if (args->rc) { printf("\n"); @@ -351,11 +365,13 @@ print_stats_human_readable(cmd_args_t *args, zpios_cmd_t *cmd) cr_time = zpios_timespec_to_double(summary_stats->cr_time.delta); rm_time = zpios_timespec_to_double(summary_stats->rm_time.delta); - printf("%.2f\t", t_time); - printf("%.3f\t", cr_time); - printf("%.3f\t", rm_time); - printf("%.2f\t", wr_time); - printf("%.2f\t", rd_time); + if (args->verbose) { + printf("%.2f\t", t_time); + printf("%.3f\t", cr_time); + printf("%.3f\t", rm_time); + printf("%.2f\t", wr_time); + printf("%.2f\t", rd_time); + } printf("%s\t", uint64_to_kmgt(str, summary_stats->wr_data)); printf("%s\t", uint64_to_kmgt(str, summary_stats->wr_chunks)); @@ -374,20 +390,24 @@ print_stats_table(cmd_args_t *args, zpios_cmd_t *cmd) double wr_time, rd_time; if (args->rc) - printf("FAILED: %3d ", args->rc); + printf("FAIL: %3d ", args->rc); else - printf("PASSED: %3d ", args->rc); + printf("PASS: "); - printf("%u\t", cmd->cmd_id); - printf("%u\t", cmd->cmd_thread_count); - printf("%u\t", cmd->cmd_region_count); - printf("%llu\t", (long long unsigned)cmd->cmd_region_size); - printf("%llu\t", (long long unsigned)cmd->cmd_chunk_size); - printf("%llu\t", (long long unsigned)cmd->cmd_offset); - printf("%u\t", cmd->cmd_region_noise); - printf("%u\t", cmd->cmd_chunk_noise); - printf("%u\t", cmd->cmd_thread_delay); - printf("0x%x\t", cmd->cmd_flags); + printf("%-12s", args->name ? args->name : ZPIOS_NAME); + printf("%2u\t", cmd->cmd_id); + + if (args->verbose) { + printf("%u\t", cmd->cmd_thread_count); + printf("%u\t", cmd->cmd_region_count); + printf("%llu\t", (long long unsigned)cmd->cmd_region_size); + printf("%llu\t", (long long unsigned)cmd->cmd_chunk_size); + printf("%llu\t", (long long unsigned)cmd->cmd_offset); + printf("%u\t", cmd->cmd_region_noise); + printf("%u\t", cmd->cmd_chunk_noise); + printf("%u\t", cmd->cmd_thread_delay); + printf("0x%x\t", cmd->cmd_flags); + } if (args->rc) { printf("\n"); @@ -398,21 +418,23 @@ print_stats_table(cmd_args_t *args, zpios_cmd_t *cmd) wr_time = zpios_timespec_to_double(summary_stats->wr_time.delta); rd_time = zpios_timespec_to_double(summary_stats->rd_time.delta); - printf("%ld.%02ld\t", - (long)summary_stats->total_time.delta.ts_sec, - (long)summary_stats->total_time.delta.ts_nsec); - printf("%ld.%02ld\t", - (long)summary_stats->cr_time.delta.ts_sec, - (long)summary_stats->cr_time.delta.ts_nsec); - printf("%ld.%02ld\t", - (long)summary_stats->rm_time.delta.ts_sec, - (long)summary_stats->rm_time.delta.ts_nsec); - printf("%ld.%02ld\t", - (long)summary_stats->wr_time.delta.ts_sec, - (long)summary_stats->wr_time.delta.ts_nsec); - printf("%ld.%02ld\t", - (long)summary_stats->rd_time.delta.ts_sec, - (long)summary_stats->rd_time.delta.ts_nsec); + if (args->verbose) { + printf("%ld.%02ld\t", + (long)summary_stats->total_time.delta.ts_sec, + (long)summary_stats->total_time.delta.ts_nsec); + printf("%ld.%02ld\t", + (long)summary_stats->cr_time.delta.ts_sec, + (long)summary_stats->cr_time.delta.ts_nsec); + printf("%ld.%02ld\t", + (long)summary_stats->rm_time.delta.ts_sec, + (long)summary_stats->rm_time.delta.ts_nsec); + printf("%ld.%02ld\t", + (long)summary_stats->wr_time.delta.ts_sec, + (long)summary_stats->wr_time.delta.ts_nsec); + printf("%ld.%02ld\t", + (long)summary_stats->rd_time.delta.ts_sec, + (long)summary_stats->rd_time.delta.ts_nsec); + } printf("%lld\t", (long long unsigned)summary_stats->wr_data); printf("%lld\t", (long long unsigned)summary_stats->wr_chunks); diff --git a/scripts/Makefile.am b/scripts/Makefile.am index b4887afead..48c16c198a 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -7,14 +7,25 @@ ZTEST=${top_builddir}/cmd/ztest/ztest ZPIOS=${top_srcdir}/scripts/zpios.sh check: - $(ZFS) -v - $(ZTEST) -V - $(ZPIOS) -c file-raid0 -t tiny - $(ZPIOS) -c file-raid10 -t tiny - $(ZPIOS) -c file-raidz -t tiny - $(ZPIOS) -c file-raidz2 -t tiny - $(ZPIOS) -c lo-raid0 -t tiny - $(ZPIOS) -c lo-raid10 -t tiny - $(ZPIOS) -c lo-raidz -t tiny - $(ZPIOS) -c lo-raidz2 -t tiny - $(ZFS) -vu + @$(ZFS) -v + @echo + @echo -n "====================================" + @echo -n " ZTEST " + @echo "====================================" + @echo + @$(ZTEST) -V + @echo + @echo -n "====================================" + @echo -n " ZPIOS " + @echo "====================================" + @echo + @$(ZPIOS) -c file-raid0 -t tiny + @$(ZPIOS) -c file-raid10 -t tiny | tail -1 + @$(ZPIOS) -c file-raidz -t tiny | tail -1 + @$(ZPIOS) -c file-raidz2 -t tiny | tail -1 + @$(ZPIOS) -c lo-raid0 -t tiny | tail -1 + @$(ZPIOS) -c lo-raid10 -t tiny | tail -1 + @$(ZPIOS) -c lo-raidz -t tiny | tail -1 + @$(ZPIOS) -c lo-raidz2 -t tiny | tail -1 + @echo + @$(ZFS) -vu diff --git a/scripts/zpios-test/16th-8192rc-4rs-1cs-4off.sh b/scripts/zpios-test/16th-8192rc-4rs-1cs-4off.sh index d80a71fe47..7a1d8feac5 100755 --- a/scripts/zpios-test/16th-8192rc-4rs-1cs-4off.sh +++ b/scripts/zpios-test/16th-8192rc-4rs-1cs-4off.sh @@ -23,6 +23,7 @@ # --regionsize_incr -C =value # --load -L =dmuio|ssf|fpp # --pool -p =pool name +# --name -M =test name # --cleanup -x # --prerun -P =pre-command # --postrun -R =post-command @@ -40,21 +41,25 @@ ZPIOS_CMD="${CMDDIR}/zpios/zpios \ --load=dmuio \ --pool=${ZPOOL_NAME} \ + --name=${ZPOOL_CONFIG} \ --threadcount=16 \ --regioncount=8192 \ --regionsize=4M \ --chunksize=1M \ --offset=4M \ --cleanup \ - --verbose \ --human-readable \ ${ZPIOS_OPTIONS}" zpios_start() { - echo ${ZPIOS_CMD} + if [ ${VERBOSE} ]; then + ZPIOS_CMD="${ZPIOS_CMD} --verbose" + echo ${ZPIOS_CMD} + fi + ${ZPIOS_CMD} || exit 1 } zpios_stop() { - echo + [ ${VERBOSE} ] && echo } diff --git a/scripts/zpios-test/1th-16rc-4rs-1cs-4off.sh b/scripts/zpios-test/1th-16rc-4rs-1cs-4off.sh index 799b6aa4db..2a7bf646f9 100755 --- a/scripts/zpios-test/1th-16rc-4rs-1cs-4off.sh +++ b/scripts/zpios-test/1th-16rc-4rs-1cs-4off.sh @@ -23,6 +23,7 @@ # --regionsize_incr -C =value # --load -L =dmuio|ssf|fpp # --pool -p =pool name +# --name -M =test name # --cleanup -x # --prerun -P =pre-command # --postrun -R =post-command @@ -41,21 +42,25 @@ ZPIOS_CMD="${CMDDIR}/zpios/zpios \ --load=dmuio \ --pool=${ZPOOL_NAME} \ + --name=${ZPOOL_CONFIG} \ --threadcount=1 \ --regioncount=16 \ --regionsize=4M \ --chunksize=1M \ --offset=4M \ --cleanup \ - --verbose \ --human-readable \ ${ZPIOS_OPTIONS}" zpios_start() { - echo ${ZPIOS_CMD} + if [ ${VERBOSE} ]; then + ZPIOS_CMD="${ZPIOS_CMD} --verbose" + echo ${ZPIOS_CMD} + fi + ${ZPIOS_CMD} || exit 1 } zpios_stop() { - echo + [ ${VERBOSE} ] && echo } diff --git a/scripts/zpios-test/1x256th-65536rc-4rs-1cs-4off.sh b/scripts/zpios-test/1x256th-65536rc-4rs-1cs-4off.sh index ddec717acd..51451991d3 100755 --- a/scripts/zpios-test/1x256th-65536rc-4rs-1cs-4off.sh +++ b/scripts/zpios-test/1x256th-65536rc-4rs-1cs-4off.sh @@ -23,6 +23,7 @@ # --regionsize_incr -C =value # --load -L =dmuio|ssf|fpp # --pool -p =pool name +# --name -M =test name # --cleanup -x # --prerun -P =pre-command # --postrun -R =post-command @@ -40,21 +41,25 @@ ZPIOS_CMD="${CMDDIR}/zpios/zpios \ --load=dmuio \ --pool=${ZPOOL_NAME} \ + --name=${ZPOOL_CONFIG} \ --threadcount=1,2,4,8,16,32,64,128,256 \ --regioncount=65536 \ --regionsize=4M \ --chunksize=1M \ --offset=4M \ --cleanup \ - --verbose \ --human-readable \ ${ZPIOS_OPTIONS}" zpios_start() { - echo ${ZPIOS_CMD} + if [ ${VERBOSE} ]; then + ZPIOS_CMD="${ZPIOS_CMD} --verbose" + echo ${ZPIOS_CMD} + fi + ${ZPIOS_CMD} || exit 1 } zpios_stop() { - echo + [ ${VERBOSE} ] && echo } diff --git a/scripts/zpios-test/256th-65536rc-4rs-1cs-4off.sh b/scripts/zpios-test/256th-65536rc-4rs-1cs-4off.sh index 167bdad735..34f7ea64e0 100755 --- a/scripts/zpios-test/256th-65536rc-4rs-1cs-4off.sh +++ b/scripts/zpios-test/256th-65536rc-4rs-1cs-4off.sh @@ -23,6 +23,7 @@ # --regionsize_incr -C =value # --load -L =dmuio|ssf|fpp # --pool -p =pool name +# --name -M =test name # --cleanup -x # --prerun -P =pre-command # --postrun -R =post-command @@ -40,21 +41,25 @@ ZPIOS_CMD="${CMDDIR}/zpios/zpios \ --load=dmuio \ --pool=${ZPOOL_NAME} \ + --name=${ZPOOL_CONFIG} \ --threadcount=256 \ --regioncount=65536 \ --regionsize=4M \ --chunksize=1M \ --offset=4M \ --cleanup \ - --verbose \ --human-readable \ ${ZPIOS_OPTIONS}" zpios_start() { - echo ${ZPIOS_CMD} + if [ ${VERBOSE} ]; then + ZPIOS_CMD="${ZPIOS_CMD} --verbose" + echo ${ZPIOS_CMD} + fi + ${ZPIOS_CMD} || exit 1 } zpios_stop() { - echo + [ ${VERBOSE} ] && echo } diff --git a/scripts/zpios-test/4th-1024rc-4rs-1cs-4off.sh b/scripts/zpios-test/4th-1024rc-4rs-1cs-4off.sh index 910129b16c..740908a439 100755 --- a/scripts/zpios-test/4th-1024rc-4rs-1cs-4off.sh +++ b/scripts/zpios-test/4th-1024rc-4rs-1cs-4off.sh @@ -23,6 +23,7 @@ # --regionsize_incr -C =value # --load -L =dmuio|ssf|fpp # --pool -p =pool name +# --name -M =test name # --cleanup -x # --prerun -P =pre-command # --postrun -R =post-command @@ -40,21 +41,25 @@ ZPIOS_CMD="${CMDDIR}/zpios/zpios \ --load=dmuio \ --pool=${ZPOOL_NAME} \ + --name=${ZPOOL_CONFIG} \ --threadcount=4 \ --regioncount=1024 \ --regionsize=4M \ --chunksize=1M \ --offset=4M \ --cleanup \ - --verbose \ --human-readable \ ${ZPIOS_OPTIONS}" zpios_start() { - echo ${ZPIOS_CMD} + if [ ${VERBOSE} ]; then + ZPIOS_CMD="${ZPIOS_CMD} --verbose" + echo ${ZPIOS_CMD} + fi + ${ZPIOS_CMD} || exit 1 } zpios_stop() { - echo + [ ${VERBOSE} ] && echo } diff --git a/scripts/zpios.sh b/scripts/zpios.sh index fec44f57bb..f98c826073 100755 --- a/scripts/zpios.sh +++ b/scripts/zpios.sh @@ -233,8 +233,6 @@ if [ ${PROFILE} ]; then zpios_profile_start fi -echo -echo "${DATE}" zpios_start zpios_stop