Commit 959cfa0f authored by Jim Harris's avatar Jim Harris Committed by Tomasz Zawadzki
Browse files

event: add "A" to SPDK_APP_GETOPT_STRING 



-A is equivalent to --pci-allowed, which recently
replaced -W/--pci-whitelist.  But we missed adding
"A" to SPDK_APP_GETOPT_STRING, so -A was not actually
working.

Note that bdevperf was using -A to specify that timed
out I/O should be aborted. This patch changes it to
-X to avoid a conflict. It appears that something
broke with this option earlier this year though,
setting it has no actual effect. This should be
investigated separately from this patch.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: I2f1aaf0af4e82ba3d08e91e6f9046d485cf04549

Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5645


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
parent 62f81a9e

include/spdk/event.h

+1 −1
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ int spdk_app_parse_core_mask(const char *mask, struct spdk_cpuset *cpumask); 
 */

const struct spdk_cpuset *spdk_app_get_core_mask(void);



#define SPDK_APP_GETOPT_STRING "c:de:ghi:m:n:p:r:s:uvB:L:RW:"

#define SPDK_APP_GETOPT_STRING "c:de:ghi:m:n:p:r:s:uvA:B:L:RW:"



enum spdk_app_parse_args_rvals {

	SPDK_APP_PARSE_ARGS_HELP = 0,

test/bdev/bdevperf/bdevperf.c

+3 −3
Original line number Diff line number Diff line
@@ -1930,7 +1930,7 @@ bdevperf_parse_arg(int ch, char *arg) 
		g_wait_for_tests = true;

	} else if (ch == 'Z') {

		g_zcopy = true;

	} else if (ch == 'A') {

	} else if (ch == 'X') {

		g_abort = true;

	} else if (ch == 'C') {

		g_multithread_mode = true;
@@ -1997,7 +1997,7 @@ bdevperf_usage(void) 
	printf(" -f                        continue processing I/O even after failures\n");

	printf(" -Z                        enable using zcopy bdev API for read or write I/O\n");

	printf(" -z                        start bdevperf, but wait for RPC to start tests\n");

	printf(" -A                        abort the timeout I/O\n");

	printf(" -X                        abort timed out I/O\n");

	printf(" -C                        enable every core to send I/Os to each bdev\n");

	printf(" -j                        use job config file\n");

}
@@ -2105,7 +2105,7 @@ main(int argc, char **argv) 
	opts.rpc_addr = NULL;

	opts.shutdown_cb = spdk_bdevperf_shutdown_cb;



	if ((rc = spdk_app_parse_args(argc, argv, &opts, "Zzfq:o:t:w:k:ACM:P:S:T:j:", NULL,

	if ((rc = spdk_app_parse_args(argc, argv, &opts, "Zzfq:o:t:w:k:CM:P:S:T:Xj:", NULL,

				      bdevperf_parse_arg, bdevperf_usage)) !=

	    SPDK_APP_PARSE_ARGS_SUCCESS) {

		return rc;