From: Ibtisam Tariq <ibtisam.tariq@emumba.com>
To: maxime.coquelin@redhat.com, chenbo.xia@intel.com,
cristian.dumitrescu@intel.com, jasvinder.singh@intel.com,
john.mcnamara@intel.com, reshma.pattan@intel.com,
konstantin.ananyev@intel.com, marko.kovacevic@intel.com
Cc: dev@dpdk.org, Ibtisam Tariq <ibtisam.tariq@emumba.com>,
jiayu.hu@intel.com, huawei.xie@intel.com
Subject: [dpdk-dev] [PATCH 6/7] examples/vhost: enhance getopt_long usage
Date: Wed, 11 Nov 2020 08:15:06 +0000 [thread overview]
Message-ID: <20201111081507.19913-6-ibtisam.tariq@emumba.com> (raw)
In-Reply-To: <20201111081507.19913-1-ibtisam.tariq@emumba.com>
Instead of using getopt_long return value, strcmp was used to
compare the input parameters with the struct option array. This
patch get rid of all those strcmp by directly binding each longopt
with an int enum. This is to improve readability and consistency in
all examples.
Bugzilla ID: 238
Cc: jiayu.hu@intel.com
Cc: huawei.xie@intel.com
Reported-by: David Marchand <david.marchand@redhat.com>
Signed-off-by: Ibtisam Tariq <ibtisam.tariq@emumba.com>
---
v2
* Remove extra indentations.
* Remove extra block brackets in switch statement.
* Change enum names to start with OPT_ and remove KEYWORD from enum names.
v1
* enhance getopt_long usage
---
examples/vhost/main.c | 273 ++++++++++++++++++++++--------------------
1 file changed, 145 insertions(+), 128 deletions(-)
diff --git a/examples/vhost/main.c b/examples/vhost/main.c
index 59a1aff07..c517afe96 100644
--- a/examples/vhost/main.c
+++ b/examples/vhost/main.c
@@ -466,6 +466,33 @@ us_vhost_usage(const char *prgname)
prgname);
}
+enum {
+#define OPT_VM2VM "vm2vm"
+ OPT_VM2VM_NUM = 256,
+#define OPT_RX_RETRY "rx-retry"
+ OPT_RX_RETRY_NUM,
+#define OPT_RX_RETRY_DELAY "rx-retry-delay"
+ OPT_RX_RETRY_DELAY_NUM,
+#define OPT_RX_RETRY_NUMB "rx-retry-num"
+ OPT_RX_RETRY_NUMB_NUM,
+#define OPT_MERGEABLE "mergeable"
+ OPT_MERGEABLE_NUM,
+#define OPT_STATS "stats"
+ OPT_STATS_NUM,
+#define OPT_SOCKET_FILE "socket-file"
+ OPT_SOCKET_FILE_NUM,
+#define OPT_TX_CSUM "tx-csum"
+ OPT_TX_CSUM_NUM,
+#define OPT_TSO "tso"
+ OPT_TSO_NUM,
+#define OPT_CLIENT "client"
+#define OPT_BUILTIN_NET_DRIVER "builtin-net-driver"
+#define OPT_DMA_TYPE "dma-type"
+ OPT_DMA_TYPE_NUM,
+#define OPT_DMAS "dmas"
+ OPT_DMAS_NUM,
+};
+
/*
* Parse the arguments given in the command line of the application.
*/
@@ -477,19 +504,31 @@ us_vhost_parse_args(int argc, char **argv)
unsigned i;
const char *prgname = argv[0];
static struct option long_option[] = {
- {"vm2vm", required_argument, NULL, 0},
- {"rx-retry", required_argument, NULL, 0},
- {"rx-retry-delay", required_argument, NULL, 0},
- {"rx-retry-num", required_argument, NULL, 0},
- {"mergeable", required_argument, NULL, 0},
- {"stats", required_argument, NULL, 0},
- {"socket-file", required_argument, NULL, 0},
- {"tx-csum", required_argument, NULL, 0},
- {"tso", required_argument, NULL, 0},
- {"client", no_argument, &client_mode, 1},
- {"builtin-net-driver", no_argument, &builtin_net_driver, 1},
- {"dma-type", required_argument, NULL, 0},
- {"dmas", required_argument, NULL, 0},
+ {OPT_VM2VM, required_argument,
+ NULL, OPT_VM2VM_NUM},
+ {OPT_RX_RETRY, required_argument,
+ NULL, OPT_RX_RETRY_NUM},
+ {OPT_RX_RETRY_DELAY, required_argument,
+ NULL, OPT_RX_RETRY_DELAY_NUM},
+ {OPT_RX_RETRY_NUMB, required_argument,
+ NULL, OPT_RX_RETRY_NUMB_NUM},
+ {OPT_MERGEABLE, required_argument,
+ NULL, OPT_MERGEABLE_NUM},
+ {OPT_STATS, required_argument,
+ NULL, OPT_STATS_NUM},
+ {OPT_SOCKET_FILE, required_argument,
+ NULL, OPT_SOCKET_FILE_NUM},
+ {OPT_TX_CSUM, required_argument,
+ NULL, OPT_TX_CSUM_NUM},
+ {OPT_TSO, required_argument,
+ NULL, OPT_TSO_NUM},
+ {OPT_CLIENT, no_argument, &client_mode, 1},
+ {OPT_BUILTIN_NET_DRIVER, no_argument,
+ &builtin_net_driver, 1},
+ {OPT_DMA_TYPE, required_argument,
+ NULL, OPT_DMA_TYPE_NUM},
+ {OPT_DMAS, required_argument,
+ NULL, OPT_DMAS_NUM},
{NULL, 0, 0, 0},
};
@@ -512,145 +551,123 @@ us_vhost_parse_args(int argc, char **argv)
vmdq_conf_default.rx_adv_conf.vmdq_rx_conf.rx_mode =
ETH_VMDQ_ACCEPT_BROADCAST |
ETH_VMDQ_ACCEPT_MULTICAST;
-
break;
- case 0:
- /* Enable/disable vm2vm comms. */
- if (!strncmp(long_option[option_index].name, "vm2vm",
- MAX_LONG_OPT_SZ)) {
- ret = parse_num_opt(optarg, (VM2VM_LAST - 1));
- if (ret == -1) {
- RTE_LOG(INFO, VHOST_CONFIG,
- "Invalid argument for "
- "vm2vm [0|1|2]\n");
- us_vhost_usage(prgname);
- return -1;
- } else {
- vm2vm_mode = (vm2vm_type)ret;
- }
+ case OPT_VM2VM_NUM:
+ ret = parse_num_opt(optarg, (VM2VM_LAST - 1));
+ if (ret == -1) {
+ RTE_LOG(INFO, VHOST_CONFIG,
+ "Invalid argument for "
+ "vm2vm [0|1|2]\n");
+ us_vhost_usage(prgname);
+ return -1;
}
+ vm2vm_mode = (vm2vm_type)ret;
+ break;
- /* Enable/disable retries on RX. */
- if (!strncmp(long_option[option_index].name, "rx-retry", MAX_LONG_OPT_SZ)) {
- ret = parse_num_opt(optarg, 1);
- if (ret == -1) {
- RTE_LOG(INFO, VHOST_CONFIG, "Invalid argument for rx-retry [0|1]\n");
- us_vhost_usage(prgname);
- return -1;
- } else {
- enable_retry = ret;
- }
+ case OPT_RX_RETRY_NUM:
+ ret = parse_num_opt(optarg, 1);
+ if (ret == -1) {
+ RTE_LOG(INFO, VHOST_CONFIG, "Invalid argument for rx-retry [0|1]\n");
+ us_vhost_usage(prgname);
+ return -1;
}
+ enable_retry = ret;
+ break;
- /* Enable/disable TX checksum offload. */
- if (!strncmp(long_option[option_index].name, "tx-csum", MAX_LONG_OPT_SZ)) {
- ret = parse_num_opt(optarg, 1);
- if (ret == -1) {
- RTE_LOG(INFO, VHOST_CONFIG, "Invalid argument for tx-csum [0|1]\n");
- us_vhost_usage(prgname);
- return -1;
- } else
- enable_tx_csum = ret;
+ case OPT_TX_CSUM_NUM:
+ ret = parse_num_opt(optarg, 1);
+ if (ret == -1) {
+ RTE_LOG(INFO, VHOST_CONFIG, "Invalid argument for tx-csum [0|1]\n");
+ us_vhost_usage(prgname);
+ return -1;
}
+ enable_tx_csum = ret;
+ break;
- /* Enable/disable TSO offload. */
- if (!strncmp(long_option[option_index].name, "tso", MAX_LONG_OPT_SZ)) {
- ret = parse_num_opt(optarg, 1);
- if (ret == -1) {
- RTE_LOG(INFO, VHOST_CONFIG, "Invalid argument for tso [0|1]\n");
- us_vhost_usage(prgname);
- return -1;
- } else
- enable_tso = ret;
+ case OPT_TSO_NUM:
+ ret = parse_num_opt(optarg, 1);
+ if (ret == -1) {
+ RTE_LOG(INFO, VHOST_CONFIG, "Invalid argument for tso [0|1]\n");
+ us_vhost_usage(prgname);
+ return -1;
}
+ enable_tso = ret;
+ break;
- /* Specify the retries delay time (in useconds) on RX. */
- if (!strncmp(long_option[option_index].name, "rx-retry-delay", MAX_LONG_OPT_SZ)) {
- ret = parse_num_opt(optarg, INT32_MAX);
- if (ret == -1) {
- RTE_LOG(INFO, VHOST_CONFIG, "Invalid argument for rx-retry-delay [0-N]\n");
- us_vhost_usage(prgname);
- return -1;
- } else {
- burst_rx_delay_time = ret;
- }
+ case OPT_RX_RETRY_DELAY_NUM:
+ ret = parse_num_opt(optarg, INT32_MAX);
+ if (ret == -1) {
+ RTE_LOG(INFO, VHOST_CONFIG, "Invalid argument for rx-retry-delay [0-N]\n");
+ us_vhost_usage(prgname);
+ return -1;
}
+ burst_rx_delay_time = ret;
+ break;
- /* Specify the retries number on RX. */
- if (!strncmp(long_option[option_index].name, "rx-retry-num", MAX_LONG_OPT_SZ)) {
- ret = parse_num_opt(optarg, INT32_MAX);
- if (ret == -1) {
- RTE_LOG(INFO, VHOST_CONFIG, "Invalid argument for rx-retry-num [0-N]\n");
- us_vhost_usage(prgname);
- return -1;
- } else {
- burst_rx_retry_num = ret;
- }
+ case OPT_RX_RETRY_NUMB_NUM:
+ ret = parse_num_opt(optarg, INT32_MAX);
+ if (ret == -1) {
+ RTE_LOG(INFO, VHOST_CONFIG, "Invalid argument for rx-retry-num [0-N]\n");
+ us_vhost_usage(prgname);
+ return -1;
}
+ burst_rx_retry_num = ret;
+ break;
- /* Enable/disable RX mergeable buffers. */
- if (!strncmp(long_option[option_index].name, "mergeable", MAX_LONG_OPT_SZ)) {
- ret = parse_num_opt(optarg, 1);
- if (ret == -1) {
- RTE_LOG(INFO, VHOST_CONFIG, "Invalid argument for mergeable [0|1]\n");
- us_vhost_usage(prgname);
- return -1;
- } else {
- mergeable = !!ret;
- if (ret) {
- vmdq_conf_default.rxmode.offloads |=
- DEV_RX_OFFLOAD_JUMBO_FRAME;
- vmdq_conf_default.rxmode.max_rx_pkt_len
- = JUMBO_FRAME_MAX_SIZE;
- }
- }
+ case OPT_MERGEABLE_NUM:
+ ret = parse_num_opt(optarg, 1);
+ if (ret == -1) {
+ RTE_LOG(INFO, VHOST_CONFIG, "Invalid argument for mergeable [0|1]\n");
+ us_vhost_usage(prgname);
+ return -1;
}
-
- /* Enable/disable stats. */
- if (!strncmp(long_option[option_index].name, "stats", MAX_LONG_OPT_SZ)) {
- ret = parse_num_opt(optarg, INT32_MAX);
- if (ret == -1) {
- RTE_LOG(INFO, VHOST_CONFIG,
- "Invalid argument for stats [0..N]\n");
- us_vhost_usage(prgname);
- return -1;
- } else {
- enable_stats = ret;
- }
+ mergeable = !!ret;
+ if (ret) {
+ vmdq_conf_default.rxmode.offloads |=
+ DEV_RX_OFFLOAD_JUMBO_FRAME;
+ vmdq_conf_default.rxmode.max_rx_pkt_len
+ = JUMBO_FRAME_MAX_SIZE;
}
+ break;
- /* Set socket file path. */
- if (!strncmp(long_option[option_index].name,
- "socket-file", MAX_LONG_OPT_SZ)) {
- if (us_vhost_parse_socket_path(optarg) == -1) {
- RTE_LOG(INFO, VHOST_CONFIG,
- "Invalid argument for socket name (Max %d characters)\n",
- PATH_MAX);
- us_vhost_usage(prgname);
- return -1;
- }
+ case OPT_STATS_NUM:
+ ret = parse_num_opt(optarg, INT32_MAX);
+ if (ret == -1) {
+ RTE_LOG(INFO, VHOST_CONFIG,
+ "Invalid argument for stats [0..N]\n");
+ us_vhost_usage(prgname);
+ return -1;
}
+ enable_stats = ret;
+ break;
- if (!strncmp(long_option[option_index].name,
- "dma-type", MAX_LONG_OPT_SZ)) {
- strcpy(dma_type, optarg);
+ /* Set socket file path. */
+ case OPT_SOCKET_FILE_NUM:
+ if (us_vhost_parse_socket_path(optarg) == -1) {
+ RTE_LOG(INFO, VHOST_CONFIG,
+ "Invalid argument for socket name (Max %d characters)\n",
+ PATH_MAX);
+ us_vhost_usage(prgname);
+ return -1;
}
+ break;
- if (!strncmp(long_option[option_index].name,
- "dmas", MAX_LONG_OPT_SZ)) {
- if (open_dma(optarg) == -1) {
- RTE_LOG(INFO, VHOST_CONFIG,
- "Wrong DMA args\n");
- us_vhost_usage(prgname);
- return -1;
- }
- async_vhost_driver = 1;
- }
+ case OPT_DMA_TYPE_NUM:
+ strcpy(dma_type, optarg);
+ break;
+ case OPT_DMAS_NUM:
+ if (open_dma(optarg) == -1) {
+ RTE_LOG(INFO, VHOST_CONFIG,
+ "Wrong DMA args\n");
+ us_vhost_usage(prgname);
+ return -1;
+ }
+ async_vhost_driver = 1;
break;
- /* Invalid option - print options. */
+ /* Invalid option - print options. */
default:
us_vhost_usage(prgname);
return -1;
--
2.17.1
next prev parent reply other threads:[~2020-11-11 8:17 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-11 8:15 [dpdk-dev] [PATCH 1/7] examples/fips_validation: " Ibtisam Tariq
2020-11-11 8:15 ` [dpdk-dev] [PATCH 2/7] examples/l3fwd-acl: " Ibtisam Tariq
2020-11-13 12:26 ` Ananyev, Konstantin
2020-11-17 7:52 ` Ibtisam Tariq
2020-11-11 8:15 ` [dpdk-dev] [PATCH 3/7] examples/packet_ordering: " Ibtisam Tariq
2020-11-11 8:15 ` [dpdk-dev] [PATCH 4/7] examples/performance-thread/l3fwd-thread: " Ibtisam Tariq
2020-11-11 8:15 ` [dpdk-dev] [PATCH 5/7] examples/qos_sched: " Ibtisam Tariq
2020-11-14 11:12 ` David Marchand
2020-11-17 7:42 ` Ibtisam Tariq
2020-11-11 8:15 ` Ibtisam Tariq [this message]
2020-11-11 8:15 ` [dpdk-dev] [PATCH 7/7] examples/vhost_crypto: " Ibtisam Tariq
2020-11-24 12:32 [dpdk-dev] [PATCH 1/7] examples/fips_validation: " Ibtisam Tariq
2020-11-24 12:32 ` [dpdk-dev] [PATCH 6/7] examples/vhost: " Ibtisam Tariq
2020-12-07 10:51 ` David Marchand
2020-12-31 7:00 ` Ibtisam Tariq
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201111081507.19913-6-ibtisam.tariq@emumba.com \
--to=ibtisam.tariq@emumba.com \
--cc=chenbo.xia@intel.com \
--cc=cristian.dumitrescu@intel.com \
--cc=dev@dpdk.org \
--cc=huawei.xie@intel.com \
--cc=jasvinder.singh@intel.com \
--cc=jiayu.hu@intel.com \
--cc=john.mcnamara@intel.com \
--cc=konstantin.ananyev@intel.com \
--cc=marko.kovacevic@intel.com \
--cc=maxime.coquelin@redhat.com \
--cc=reshma.pattan@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).