Commit 8f26b74e authored by Ziye Yang's avatar Ziye Yang Committed by Changpeng Liu
Browse files

examples: make debug flag option consistent 



Will change -t to -L

Change-Id: Ie04edf1fd3877b36fde1bae66a84de29f6617bbf
Signed-off-by: default avatarZiye Yang <ziye.yang@intel.com>
Reviewed-on: https://review.gerrithub.io/415947


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
parent 696d9eae

examples/nvme/identify/identify.c

+8 −7
Original line number Diff line number Diff line
@@ -1439,7 +1439,7 @@ usage(const char *program_name) 
	printf("     subnqn      Subsystem NQN (default: %s)\n", SPDK_NVMF_DISCOVERY_NQN);

	printf("    Example: -r 'trtype:RDMA adrfam:IPv4 traddr:192.168.100.8 trsvcid:4420'\n");



	spdk_tracelog_usage(stdout, "-t");

	spdk_tracelog_usage(stdout, "-L");



	printf(" -i         shared memory group ID\n");

	printf(" -p         core number in decimal to run this application which started from 0\n");
@@ -1457,7 +1457,7 @@ parse_args(int argc, char **argv) 
	g_trid.trtype = SPDK_NVME_TRANSPORT_PCIE;

	snprintf(g_trid.subnqn, sizeof(g_trid.subnqn), "%s", SPDK_NVMF_DISCOVERY_NQN);



	while ((op = getopt(argc, argv, "d:i:p:r:t:xH")) != -1) {

	while ((op = getopt(argc, argv, "d:i:p:r:xHL:")) != -1) {

		switch (op) {

		case 'd':

			g_dpdk_mem = atoi(optarg);
@@ -1479,7 +1479,10 @@ parse_args(int argc, char **argv) 
				return 1;

			}

			break;

		case 't':

		case 'x':

			g_hex_dump = true;

			break;

		case 'L':

			rc = spdk_log_set_trace_flag(optarg);

			if (rc < 0) {

				fprintf(stderr, "unknown flag\n");
@@ -1488,15 +1491,13 @@ parse_args(int argc, char **argv) 
			}

			spdk_log_set_print_level(SPDK_LOG_DEBUG);

#ifndef DEBUG

			fprintf(stderr, "%s must be rebuilt with CONFIG_DEBUG=y for -t flag.\n",

			fprintf(stderr, "%s must be rebuilt with CONFIG_DEBUG=y for -L flag.\n",

				argv[0]);

			usage(argv[0]);

			return 0;

#endif

			break;

		case 'x':

			g_hex_dump = true;

			break;



		case 'H':

		default:

			usage(argv[0]);

test/nvme/aer/aer.c

+10 −10
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ usage(const char *program_name) 
	printf("     subnqn      Subsystem NQN (default: %s)\n", SPDK_NVMF_DISCOVERY_NQN);

	printf("    Example: -r 'trtype:RDMA adrfam:IPv4 traddr:192.168.100.8 trsvcid:4420'\n");



	spdk_tracelog_usage(stdout, "-t");

	spdk_tracelog_usage(stdout, "-L");



	printf(" -v         verbose (enable warnings)\n");

	printf(" -H         show this usage\n");
@@ -307,12 +307,18 @@ parse_args(int argc, char **argv) 
	g_trid.trtype = SPDK_NVME_TRANSPORT_PCIE;

	snprintf(g_trid.subnqn, sizeof(g_trid.subnqn), "%s", SPDK_NVMF_DISCOVERY_NQN);



	while ((op = getopt(argc, argv, "n:r:t:H:T")) != -1) {

	while ((op = getopt(argc, argv, "n:r:HL:T")) != -1) {

		switch (op) {

		case 'n':

			expected_ns_test = atoi(optarg);

			break;

		case 't':

		case 'r':

			if (spdk_nvme_transport_id_parse(&g_trid, optarg) != 0) {

				fprintf(stderr, "Error parsing transport address\n");

				return 1;

			}

			break;

		case 'L':

			rc = spdk_log_set_trace_flag(optarg);

			if (rc < 0) {

				fprintf(stderr, "unknown flag\n");
@@ -321,18 +327,12 @@ parse_args(int argc, char **argv) 
			}

			spdk_log_set_print_level(SPDK_LOG_DEBUG);

#ifndef DEBUG

			fprintf(stderr, "%s must be rebuilt with CONFIG_DEBUG=y for -t flag.\n",

			fprintf(stderr, "%s must be rebuilt with CONFIG_DEBUG=y for -L flag.\n",

				argv[0]);

			usage(argv[0]);

			return 0;

#endif

			break;

		case 'r':

			if (spdk_nvme_transport_id_parse(&g_trid, optarg) != 0) {

				fprintf(stderr, "Error parsing transport address\n");

				return 1;

			}

			break;

		case 'T':

			enable_temp_test = 1;

			break;

test/nvmf/host/identify.sh

+2 −2
Original line number Diff line number Diff line
@@ -49,13 +49,13 @@ $rootdir/examples/nvme/identify/identify -r "\ 
        adrfam:IPv4 \

        traddr:$NVMF_FIRST_TARGET_IP \

        trsvcid:$NVMF_PORT \

        subnqn:nqn.2014-08.org.nvmexpress.discovery" -t all

        subnqn:nqn.2014-08.org.nvmexpress.discovery" -L all

$rootdir/examples/nvme/identify/identify -r "\

        trtype:RDMA \

        adrfam:IPv4 \

        traddr:$NVMF_FIRST_TARGET_IP \

        trsvcid:$NVMF_PORT \

        subnqn:nqn.2016-06.io.spdk:cnode1" -t all

        subnqn:nqn.2016-06.io.spdk:cnode1" -L all

sync

$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1