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

examples: make debug flag option consistent

Browse Source 
Will change -t to -L

Change-Id: Ie04edf1fd3877b36fde1bae66a84de29f6617bbf
Signed-off-by: Ziye Yang <ziye.yang@intel.com>
Reviewed-on: https://review.gerrithub.io/415947
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
This commit is contained in:
Ziye Yang 2018-06-20 02:00:41 +08:00 committed by Changpeng Liu
parent 696d9eaed0
commit 8f26b74e02
3 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
examples/nvme/identify/identify.c
View File

@ -1439,7 +1439,7 @@ usage(const char *program_name)
printf(" subnqn Subsystem NQN (default: %s)\n", SPDK_NVMF_DISCOVERY_NQN); 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"); 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(" -i shared memory group ID\n");
printf(" -p core number in decimal to run this application which started from 0\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; g_trid.trtype = SPDK_NVME_TRANSPORT_PCIE;
snprintf(g_trid.subnqn, sizeof(g_trid.subnqn), "%s", SPDK_NVMF_DISCOVERY_NQN); 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) { switch (op) {
case 'd': case 'd':
g_dpdk_mem = atoi(optarg); g_dpdk_mem = atoi(optarg);
@ -1479,7 +1479,10 @@ parse_args(int argc, char **argv)
return 1; return 1;
} }
break; break;
case 't': case 'x':
g_hex_dump = true;
break;
case 'L':
rc = spdk_log_set_trace_flag(optarg); rc = spdk_log_set_trace_flag(optarg);
if (rc < 0) { if (rc < 0) {
fprintf(stderr, "unknown flag\n"); fprintf(stderr, "unknown flag\n");
@ -1488,15 +1491,13 @@ parse_args(int argc, char **argv)
} }
spdk_log_set_print_level(SPDK_LOG_DEBUG); spdk_log_set_print_level(SPDK_LOG_DEBUG);
#ifndef 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]); argv[0]);
usage(argv[0]); usage(argv[0]);
return 0; return 0;
#endif #endif
break; break;
case 'x':
g_hex_dump = true;
break;
case 'H': case 'H':
default: default:
usage(argv[0]); usage(argv[0]);

20
test/nvme/aer/aer.c
View File

@ -293,7 +293,7 @@ usage(const char *program_name)
printf(" subnqn Subsystem NQN (default: %s)\n", SPDK_NVMF_DISCOVERY_NQN); 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"); 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(" -v verbose (enable warnings)\n");
printf(" -H show this usage\n"); printf(" -H show this usage\n");
@ -307,12 +307,18 @@ parse_args(int argc, char **argv)
g_trid.trtype = SPDK_NVME_TRANSPORT_PCIE; g_trid.trtype = SPDK_NVME_TRANSPORT_PCIE;
snprintf(g_trid.subnqn, sizeof(g_trid.subnqn), "%s", SPDK_NVMF_DISCOVERY_NQN); 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) { switch (op) {
case 'n': case 'n':
expected_ns_test = atoi(optarg); expected_ns_test = atoi(optarg);
break; 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); rc = spdk_log_set_trace_flag(optarg);
if (rc < 0) { if (rc < 0) {
fprintf(stderr, "unknown flag\n"); fprintf(stderr, "unknown flag\n");
@ -321,18 +327,12 @@ parse_args(int argc, char **argv)
} }
spdk_log_set_print_level(SPDK_LOG_DEBUG); spdk_log_set_print_level(SPDK_LOG_DEBUG);
#ifndef 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]); argv[0]);
usage(argv[0]); usage(argv[0]);
return 0; return 0;
#endif #endif
break; 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': case 'T':
enable_temp_test = 1; enable_temp_test = 1;
break; break;

4
test/nvmf/host/identify.sh
View File

@ -49,13 +49,13 @@ $rootdir/examples/nvme/identify/identify -r "\
adrfam:IPv4 \ adrfam:IPv4 \
traddr:$NVMF_FIRST_TARGET_IP \ traddr:$NVMF_FIRST_TARGET_IP \
trsvcid:$NVMF_PORT \ 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 "\ $rootdir/examples/nvme/identify/identify -r "\
trtype:RDMA \ trtype:RDMA \
adrfam:IPv4 \ adrfam:IPv4 \
traddr:$NVMF_FIRST_TARGET_IP \ traddr:$NVMF_FIRST_TARGET_IP \
trsvcid:$NVMF_PORT \ trsvcid:$NVMF_PORT \
subnqn:nqn.2016-06.io.spdk:cnode1" -t all subnqn:nqn.2016-06.io.spdk:cnode1" -L all
sync sync
$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1 $rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1