ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvme/perf: simplify parse args.

Browse Source 
the workload parsing didn't need to be that complex.

Change-Id: I28627a430834eb48a7c3921ac655d80e348c66ea
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/755
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Seth Howell 2020-02-10 16:49:03 -07:00 committed by Tomasz Zawadzki
parent 806d411693
commit f6e682af75
1 changed files with 11 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
examples/nvme/perf/perf.c
View File

@ -206,7 +206,7 @@ static uint32_t g_max_io_size_blocks;
static uint32_t g_metacfg_pract_flag; static uint32_t g_metacfg_pract_flag;
static uint32_t g_metacfg_prchk_flags; static uint32_t g_metacfg_prchk_flags;
static int g_rw_percentage; static int g_rw_percentage;
static int g_is_random; static int g_is_random = 0;
static int g_queue_depth; static int g_queue_depth;
static int g_nr_io_queues_per_ns = 1; static int g_nr_io_queues_per_ns = 1;
static int g_nr_unused_io_queues = 0; static int g_nr_unused_io_queues = 0;
@ -1733,54 +1733,29 @@ parse_args(int argc, char **argv)
return 1; return 1;
} }
if (strcmp(workload_type, "read") && if (strncmp(workload_type, "rand", 4) == 0) {
strcmp(workload_type, "write") && g_is_random = 1;
strcmp(workload_type, "randread") && workload_type = &workload_type[4];
strcmp(workload_type, "randwrite") &&
strcmp(workload_type, "rw") &&
strcmp(workload_type, "randrw")) {
fprintf(stderr,
"io pattern type must be one of\n"
"(read, write, randread, randwrite, rw, randrw)\n");
return 1;
} }
if (!strcmp(workload_type, "read") || if (strcmp(workload_type, "read") == 0 || strcmp(workload_type, "write") == 0) {
!strcmp(workload_type, "randread")) { g_rw_percentage = strcmp(workload_type, "read") == 0 ? 100 : 0;
g_rw_percentage = 100;
}
if (!strcmp(workload_type, "write") ||
!strcmp(workload_type, "randwrite")) {
g_rw_percentage = 0;
}
if (!strcmp(workload_type, "read") ||
!strcmp(workload_type, "randread") ||
!strcmp(workload_type, "write") ||
!strcmp(workload_type, "randwrite")) {
if (mix_specified) { if (mix_specified) {
fprintf(stderr, "Ignoring -M option... Please use -M option" fprintf(stderr, "Ignoring -M option... Please use -M option"
" only when using rw or randrw.\n"); " only when using rw or randrw.\n");
} }
} } else if (strcmp(workload_type, "rw") == 0) {
if (!strcmp(workload_type, "rw") ||
!strcmp(workload_type, "randrw")) {
if (g_rw_percentage < 0 || g_rw_percentage > 100) { if (g_rw_percentage < 0 || g_rw_percentage > 100) {
fprintf(stderr, fprintf(stderr,
"-M must be specified to value from 0 to 100 " "-M must be specified to value from 0 to 100 "
"for rw or randrw.\n"); "for rw or randrw.\n");
return 1; return 1;
} }
}
if (!strcmp(workload_type, "read") ||
!strcmp(workload_type, "write") ||
!strcmp(workload_type, "rw")) {
g_is_random = 0;
} else { } else {
g_is_random = 1; fprintf(stderr,
"io pattern type must be one of\n"
"(read, write, randread, randwrite, rw, randrw)\n");
return 1;
} }
if (TAILQ_EMPTY(&g_trid_list)) { if (TAILQ_EMPTY(&g_trid_list)) {