From patchwork Wed Nov 11 08:15:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ibtisam Tariq X-Patchwork-Id: 83997 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id F019AA09D2; Wed, 11 Nov 2020 09:17:38 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1EE165B3A; Wed, 11 Nov 2020 09:16:07 +0100 (CET) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by dpdk.org (Postfix) with ESMTP id E50785AB3 for ; Wed, 11 Nov 2020 09:16:04 +0100 (CET) Received: by mail-wr1-f67.google.com with SMTP id d12so1585038wrr.13 for ; Wed, 11 Nov 2020 00:16:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=emumba-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=F4hIvNjOel+GquIQtnawbHV5oREb1Om8o4ct0BH2KXM=; b=jIULhxXQgaf1WD9NocWHH1lFmMqDVPu5RXhn8X9hUAOrXRrO9ZZZxnHlQeSQSVsKmE Q1XkxPv0YeZUewe5M7xj81a795tas8mHdqxOxigViDwT8OXCHk2QGgQeDoFBOkkqkPC8 JWF7gBci08JyHIPGFi3IJeF2T/SQjH5sj76vLF+INONniEIXzkUzC7UiltAwEbxtAr/E ig1xIX6erV6X/XUIO1EO7XGw7N2+vITjN6xjp62K5wYICowK1VMxlPN+8h/rs0MqXoH2 xkvEclriOIrd3uflzb7f+72KHQiZIj/BFhD4XI8hdcr/j4+w7q/90jcKnYAvOnvXK20U EGXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=F4hIvNjOel+GquIQtnawbHV5oREb1Om8o4ct0BH2KXM=; b=cphIjMYyyyszNFl4IiEmqC1fheA4gzeaXXPb80wsSvIfyhbYJ+v1b4fH21VXVU2c19 1caLhgEXx4gk4buD8UgWwhufYIJeh2gv15sfQyXxzXFppONppBhZq0u8YpZkiouqiOjE 8LFlwbCAxU6N9CvJqDlKzZoYU3p5gjQeUjhAB1brx2zBJXWE1ARjs52FT3/yv4DCSkt7 bcLRgzFnAwnEkApzM6WLrCfpHZK6+gnNPji8IPKSzg2fRsFS4+LzQMOYbIe3y/vjnj28 b/9fdv1fFancF+4LCRHPJSd0XCPu/mWtN7eqy77SlFm5mesjixkc68RcCWA0qJA6g/R0 Uhlw== X-Gm-Message-State: AOAM531ye0FXuhJrK8iu+4pUMOpKwFMDP3DgQ3u8YgdT8hqv2K51wDOH s2kM2lZzof4vrXBQjuITNpQaAw== X-Google-Smtp-Source: ABdhPJzq/iZ399dtjZYysZtoZOLXeazm1VN0kEzW9XSDsJDjSoCNJ1fT/WqjSsZieFORLQom6SPzIw== X-Received: by 2002:adf:c847:: with SMTP id e7mr28604628wrh.346.1605082563634; Wed, 11 Nov 2020 00:16:03 -0800 (PST) Received: from localhost.localdomain ([39.33.227.210]) by smtp.gmail.com with ESMTPSA id z3sm909539wrw.87.2020.11.11.00.16.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 00:16:03 -0800 (PST) From: Ibtisam Tariq 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 , roy.fan.zhang@intel.com Date: Wed, 11 Nov 2020 08:15:07 +0000 Message-Id: <20201111081507.19913-7-ibtisam.tariq@emumba.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201111081507.19913-1-ibtisam.tariq@emumba.com> References: <20201111081507.19913-1-ibtisam.tariq@emumba.com> Subject: [dpdk-dev] [PATCH 7/7] examples/vhost_crypto: enhance getopt_long usage X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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: roy.fan.zhang@intel.com Reported-by: David Marchand Signed-off-by: Ibtisam Tariq --- v2 * Remove extra indentations. * Remove extra block brackets in switch statement. * Change enum names to start with OPT_ and remove KEYWORD from enum names. * Remove unused short options v1 * enhance getopt_long usage --- examples/vhost_crypto/main.c | 88 +++++++++++++++++++++--------------- 1 file changed, 51 insertions(+), 37 deletions(-) diff --git a/examples/vhost_crypto/main.c b/examples/vhost_crypto/main.c index 11ad49159..d731751eb 100644 --- a/examples/vhost_crypto/main.c +++ b/examples/vhost_crypto/main.c @@ -62,10 +62,16 @@ struct vhost_crypto_options { uint32_t guest_polling; } options; -#define CONFIG_KEYWORD "config" -#define SOCKET_FILE_KEYWORD "socket-file" -#define ZERO_COPY_KEYWORD "zero-copy" -#define POLLING_KEYWORD "guest-polling" +enum { +#define OPT_CONFIG "config" + OPT_CONFIG_NUM = 256, +#define OPT_SOCKET_FILE "socket-file" + OPT_SOCKET_FILE_NUM, +#define OPT_ZERO_COPY "zero-copy" + OPT_ZERO_COPY_NUM, +#define OPT_POLLING "guest-polling" + OPT_POLLING_NUM, +}; #define NB_SOCKET_FIELDS (2) @@ -198,8 +204,8 @@ vhost_crypto_usage(const char *prgname) " --%s (lcore,cdev_id,queue_id)[,(lcore,cdev_id,queue_id)]" " --%s: zero copy\n" " --%s: guest polling\n", - prgname, SOCKET_FILE_KEYWORD, CONFIG_KEYWORD, - ZERO_COPY_KEYWORD, POLLING_KEYWORD); + prgname, OPT_SOCKET_FILE, OPT_CONFIG, + OPT_ZERO_COPY, OPT_POLLING); } static int @@ -210,48 +216,56 @@ vhost_crypto_parse_args(int argc, char **argv) char **argvopt; int option_index; struct option lgopts[] = { - {SOCKET_FILE_KEYWORD, required_argument, 0, 0}, - {CONFIG_KEYWORD, required_argument, 0, 0}, - {ZERO_COPY_KEYWORD, no_argument, 0, 0}, - {POLLING_KEYWORD, no_argument, 0, 0}, - {NULL, 0, 0, 0} + {OPT_SOCKET_FILE, required_argument, + NULL, OPT_SOCKET_FILE_NUM}, + {OPT_CONFIG, required_argument, + NULL, OPT_CONFIG_NUM}, + {OPT_ZERO_COPY, no_argument, + NULL, OPT_ZERO_COPY_NUM}, + {OPT_POLLING, no_argument, + NULL, OPT_POLLING_NUM}, + {NULL, 0, 0, 0} }; argvopt = argv; - while ((opt = getopt_long(argc, argvopt, "s:", + while ((opt = getopt_long(argc, argvopt, "", lgopts, &option_index)) != EOF) { + if (opt == '?') { + vhost_crypto_usage(prgname); + return -1; + } + switch (opt) { - case 0: - if (strcmp(lgopts[option_index].name, - SOCKET_FILE_KEYWORD) == 0) { - ret = parse_socket_arg(optarg); - if (ret < 0) { - vhost_crypto_usage(prgname); - return ret; - } - } else if (strcmp(lgopts[option_index].name, - CONFIG_KEYWORD) == 0) { - ret = parse_config(optarg); - if (ret < 0) { - vhost_crypto_usage(prgname); - return ret; - } - } else if (strcmp(lgopts[option_index].name, - ZERO_COPY_KEYWORD) == 0) { - options.zero_copy = - RTE_VHOST_CRYPTO_ZERO_COPY_ENABLE; - } else if (strcmp(lgopts[option_index].name, - POLLING_KEYWORD) == 0) { - options.guest_polling = 1; - } else { + case OPT_SOCKET_FILE_NUM: + ret = parse_socket_arg(optarg); + if (ret < 0) { vhost_crypto_usage(prgname); - return -EINVAL; + return ret; + } + break; + + case OPT_CONFIG_NUM: + ret = parse_config(optarg); + if (ret < 0) { + vhost_crypto_usage(prgname); + return ret; } break; + + case OPT_ZERO_COPY_NUM: + options.zero_copy = + RTE_VHOST_CRYPTO_ZERO_COPY_ENABLE; + break; + + case OPT_POLLING_NUM: + options.guest_polling = 1; + break; + default: - return -1; + vhost_crypto_usage(prgname); + return -EINVAL; } }