aboutsummaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2019-09-25 00:24:57 +0000
committerWarner Losh <imp@FreeBSD.org>2019-09-25 00:24:57 +0000
commit087d0e0b5e75b5d4bbe23fcd0e6f74be3c904fd3 (patch)
tree9758f6c6d5744b3e49ba822af20252da6601c907 /sbin
parentb662b41e62ce9bd9b2b61388f9087abc0c415402 (diff)
downloadsrc-087d0e0b5e75b5d4bbe23fcd0e6f74be3c904fd3.tar.gz
src-087d0e0b5e75b5d4bbe23fcd0e6f74be3c904fd3.zip
Notes
Diffstat (limited to 'sbin')
-rw-r--r--sbin/nvmecontrol/perftest.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/sbin/nvmecontrol/perftest.c b/sbin/nvmecontrol/perftest.c
index 907acbbf49e5..74a4bd18f75f 100644
--- a/sbin/nvmecontrol/perftest.c
+++ b/sbin/nvmecontrol/perftest.c
@@ -143,9 +143,9 @@ perftest(const struct cmd *f, int argc, char *argv[])
if (arg_parse(argc, argv, f))
return;
- if (opt.flags == NULL || opt.op == NULL)
+ if (opt.op == NULL)
arg_help(argc, argv, f);
- if (strcmp(opt.flags, "refthread") == 0)
+ if (opt.flags != NULL && strcmp(opt.flags, "refthread") == 0)
io_test.flags |= NVME_TEST_FLAG_REFTHREAD;
if (opt.intr != NULL) {
if (strcmp(opt.intr, "bio") == 0 ||
@@ -163,6 +163,7 @@ perftest(const struct cmd *f, int argc, char *argv[])
fprintf(stderr, "Bad number of threads %d\n", opt.threads);
arg_help(argc, argv, f);
}
+ io_test.num_threads = opt.threads;
if (strcasecmp(opt.op, "read") == 0)
io_test.opc = NVME_OPC_READ;
else if (strcasecmp(opt.op, "write") == 0)
@@ -176,6 +177,11 @@ perftest(const struct cmd *f, int argc, char *argv[])
arg_help(argc, argv, f);
}
io_test.time = opt.time;
+ if (opt.size < 0) {
+ fprintf(stderr, "Invalid size.\n");
+ arg_help(argc, argv, f);
+ }
+ io_test.size = opt.size;
open_dev(opt.dev, &fd, 1, 1);
if (ioctl(fd, ioctl_cmd, &io_test) < 0)
err(1, "ioctl NVME_IO_TEST failed");