From patchwork Thu Feb 4 07:34:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ibtisam Tariq X-Patchwork-Id: 87716 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id B1BACA0A0E; Thu, 4 Feb 2021 08:34:34 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 33BDE240573; Thu, 4 Feb 2021 08:34:34 +0100 (CET) Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mails.dpdk.org (Postfix) with ESMTP id C2D88240570 for ; Thu, 4 Feb 2021 08:34:32 +0100 (CET) Received: by mail-wr1-f53.google.com with SMTP id l12so2308573wry.2 for ; Wed, 03 Feb 2021 23:34:32 -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; bh=0CkJHgMooaCSAlWV4f6dM8g+t8Ln0RTTPcI4Z4TJ7Xs=; b=t9DaquAR9yw1zr68QUMywMsgD4LlEToyBQg9auyk3m6N58EPFwmEn+RUvvtJSl2NUC M4D0YW1iZ2bdn953TlDjv4fjL8O1gC5cpJmLrhEWNDb8faFmZvHkFYnivLxB/yukQezr EdiJ4Ys7yNXcZ8ysfEbHcs1dvbGdMZkVAobxt935uXl0blBVD5k6/Yp6vGBEMs1N1kOG SMID//KQ113SM5ct1Slxkj9Z/dCfKgDDqbWSm2BsMJO4lWQhDf/JNwE0roRh5lm5mjUR y9kjKneMT8ECz+Klwz68CEiXjRw7HPzzBS+aKUXOSRL4y/L62mqyZWQZI+RryjH/jvdC E5ZQ== 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; bh=0CkJHgMooaCSAlWV4f6dM8g+t8Ln0RTTPcI4Z4TJ7Xs=; b=FTJWAGiEzS0hQdBwdlGhuWjtFKUKT6KN1TQAn4TNrpDYy1LovNLdwowgtxWqdS4XWx BMaTA3mpZxGEQj109mnIGNQG84OayA4qAl00Ak+zh1WyH/gZAp5k4gI5RhEzimtQtUqU ortKE+/oUX9p762C46vg0HpDdYlZlg0PbQO8TlTFY8nn3j0Ds34oaeJ48CRNJK8ml6Y2 xl+oSLwTv8ZejQocvuvs5StyKLt542PDxBlTKt0/yXZLycyzvy46UvbJX3YflmbcPxRQ Q7ms47BtDvk80g/JfO7V0cM+8037tCiELPfWrmcwzb9FmQqCgENOsb6sM54VHoDkH6bT poxQ== X-Gm-Message-State: AOAM532SY1czrsFH//g0OY5hBhNXsVN6E5yQzL20IxEqMJZtkzDz4EEr I6RH9z3XA4FnUaIycOKtjDi3rg== X-Google-Smtp-Source: ABdhPJwAP8mTPkSaojSf5gtHbdgOBuvdnQd0p1iGCqxWKNXEZkx99Nq+UgiF/Hk4JIGegaK0hsnaHw== X-Received: by 2002:a05:6000:192:: with SMTP id p18mr7562669wrx.69.1612424072452; Wed, 03 Feb 2021 23:34:32 -0800 (PST) Received: from localhost.localdomain ([39.33.143.135]) by smtp.gmail.com with ESMTPSA id j11sm7082604wrt.26.2021.02.03.23.34.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Feb 2021 23:34:31 -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 Date: Thu, 4 Feb 2021 07:34:14 +0000 Message-Id: <20210204073420.2421-1-ibtisam.tariq@emumba.com> X-Mailer: git-send-email 2.17.1 Subject: [dpdk-dev] [PATCH v4 1/7] examples/fips_validation: enhance getopt_long usage X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 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: marko.kovacevic@intel.com Reported-by: David Marchand Signed-off-by: Ibtisam Tariq Reviewed-by: David Marchand --- v4: * Set indentation of preprocessor directives. * Remove condition on question mark. v3: * None. v2: * Added parser_read_uint16 function to remove extra variable. * Remove extra indentations. * Remove extra block brackets in switch statement. * Replace the pre-processor with actual value, if it used once. * Change enum names to start with OPT_ and remove KEYWORD from enum names. v1: * enhance getopt_long usage. --- examples/fips_validation/fips_validation.c | 16 ++ examples/fips_validation/fips_validation.h | 3 + examples/fips_validation/main.c | 246 +++++++++++---------- 3 files changed, 151 insertions(+), 114 deletions(-) diff --git a/examples/fips_validation/fips_validation.c b/examples/fips_validation/fips_validation.c index 4c3ed80c8..52a7bf952 100644 --- a/examples/fips_validation/fips_validation.c +++ b/examples/fips_validation/fips_validation.c @@ -650,6 +650,22 @@ parser_read_uint32(uint32_t *value, char *p) return 0; } +int +parser_read_uint16(uint16_t *value, const char *p) +{ + uint64_t val = 0; + int ret = parser_read_uint64(&val, p); + + if (ret < 0) + return ret; + + if (val > UINT16_MAX) + return -ERANGE; + + *value = val; + return 0; +} + void parse_write_hex_str(struct fips_val *src) { diff --git a/examples/fips_validation/fips_validation.h b/examples/fips_validation/fips_validation.h index 8396932f9..6cda4e0bd 100644 --- a/examples/fips_validation/fips_validation.h +++ b/examples/fips_validation/fips_validation.h @@ -257,6 +257,9 @@ parser_read_uint32(uint32_t *value, char *p); int parser_read_uint32_val(const char *key, char *src, struct fips_val *val); +int +parser_read_uint16(uint16_t *value, const char *p); + int writeback_hex_str(const char *key, char *dst, struct fips_val *val); diff --git a/examples/fips_validation/main.c b/examples/fips_validation/main.c index cad6bcb18..b73691dd2 100644 --- a/examples/fips_validation/main.c +++ b/examples/fips_validation/main.c @@ -15,17 +15,26 @@ #include "fips_validation.h" #include "fips_dev_self_test.h" -#define REQ_FILE_PATH_KEYWORD "req-file" -#define RSP_FILE_PATH_KEYWORD "rsp-file" -#define MBUF_DATAROOM_KEYWORD "mbuf-dataroom" -#define FOLDER_KEYWORD "path-is-folder" -#define CRYPTODEV_KEYWORD "cryptodev" -#define CRYPTODEV_ID_KEYWORD "cryptodev-id" -#define CRYPTODEV_ST_KEYWORD "self-test" -#define CRYPTODEV_BK_ID_KEYWORD "broken-test-id" -#define CRYPTODEV_BK_DIR_KEY "broken-test-dir" -#define CRYPTODEV_ENC_KEYWORD "enc" -#define CRYPTODEV_DEC_KEYWORD "dec" +enum { +#define OPT_REQ_FILE_PATH "req-file" + OPT_REQ_FILE_PATH_NUM = 256, +#define OPT_RSP_FILE_PATH "rsp-file" + OPT_RSP_FILE_PATH_NUM, +#define OPT_MBUF_DATAROOM "mbuf-dataroom" + OPT_MBUF_DATAROOM_NUM, +#define OPT_FOLDER "path-is-folder" + OPT_FOLDER_NUM, +#define OPT_CRYPTODEV "cryptodev" + OPT_CRYPTODEV_NUM, +#define OPT_CRYPTODEV_ID "cryptodev-id" + OPT_CRYPTODEV_ID_NUM, +#define OPT_CRYPTODEV_ST "self-test" + OPT_CRYPTODEV_ST_NUM, +#define OPT_CRYPTODEV_BK_ID "broken-test-id" + OPT_CRYPTODEV_BK_ID_NUM, +#define OPT_CRYPTODEV_BK_DIR_KEY "broken-test-dir" + OPT_CRYPTODEV_BK_DIR_KEY_NUM, +}; struct fips_test_vector vec; struct fips_test_interim_info info; @@ -212,10 +221,10 @@ cryptodev_fips_validate_usage(const char *prgname) " --%s: self test indicator\n" " --%s: self broken test ID\n" " --%s: self broken test direction\n", - prgname, REQ_FILE_PATH_KEYWORD, RSP_FILE_PATH_KEYWORD, - FOLDER_KEYWORD, MBUF_DATAROOM_KEYWORD, def_mbuf_seg_size, - CRYPTODEV_KEYWORD, CRYPTODEV_ID_KEYWORD, CRYPTODEV_ST_KEYWORD, - CRYPTODEV_BK_ID_KEYWORD, CRYPTODEV_BK_DIR_KEY); + prgname, OPT_REQ_FILE_PATH, OPT_RSP_FILE_PATH, + OPT_FOLDER, OPT_MBUF_DATAROOM, def_mbuf_seg_size, + OPT_CRYPTODEV, OPT_CRYPTODEV_ID, OPT_CRYPTODEV_ST, + OPT_CRYPTODEV_BK_ID, OPT_CRYPTODEV_BK_DIR_KEY); } static int @@ -226,16 +235,25 @@ cryptodev_fips_validate_parse_args(int argc, char **argv) char **argvopt; int option_index; struct option lgopts[] = { - {REQ_FILE_PATH_KEYWORD, required_argument, 0, 0}, - {RSP_FILE_PATH_KEYWORD, required_argument, 0, 0}, - {FOLDER_KEYWORD, no_argument, 0, 0}, - {MBUF_DATAROOM_KEYWORD, required_argument, 0, 0}, - {CRYPTODEV_KEYWORD, required_argument, 0, 0}, - {CRYPTODEV_ID_KEYWORD, required_argument, 0, 0}, - {CRYPTODEV_ST_KEYWORD, no_argument, 0, 0}, - {CRYPTODEV_BK_ID_KEYWORD, required_argument, 0, 0}, - {CRYPTODEV_BK_DIR_KEY, required_argument, 0, 0}, - {NULL, 0, 0, 0} + {OPT_REQ_FILE_PATH, required_argument, + NULL, OPT_REQ_FILE_PATH_NUM}, + {OPT_RSP_FILE_PATH, required_argument, + NULL, OPT_RSP_FILE_PATH_NUM}, + {OPT_FOLDER, no_argument, + NULL, OPT_FOLDER_NUM}, + {OPT_MBUF_DATAROOM, required_argument, + NULL, OPT_MBUF_DATAROOM_NUM}, + {OPT_CRYPTODEV, required_argument, + NULL, OPT_CRYPTODEV_NUM}, + {OPT_CRYPTODEV_ID, required_argument, + NULL, OPT_CRYPTODEV_ID_NUM}, + {OPT_CRYPTODEV_ST, no_argument, + NULL, OPT_CRYPTODEV_ST_NUM}, + {OPT_CRYPTODEV_BK_ID, required_argument, + NULL, OPT_CRYPTODEV_BK_ID_NUM}, + {OPT_CRYPTODEV_BK_DIR_KEY, required_argument, + NULL, OPT_CRYPTODEV_BK_DIR_KEY_NUM}, + {NULL, 0, 0, 0} }; argvopt = argv; @@ -252,104 +270,104 @@ cryptodev_fips_validate_parse_args(int argc, char **argv) lgopts, &option_index)) != EOF) { switch (opt) { - case 0: - if (strcmp(lgopts[option_index].name, - REQ_FILE_PATH_KEYWORD) == 0) - env.req_path = optarg; - else if (strcmp(lgopts[option_index].name, - RSP_FILE_PATH_KEYWORD) == 0) - env.rsp_path = optarg; - else if (strcmp(lgopts[option_index].name, - FOLDER_KEYWORD) == 0) - env.is_path_folder = 1; - else if (strcmp(lgopts[option_index].name, - CRYPTODEV_KEYWORD) == 0) { - ret = parse_cryptodev_arg(optarg); - if (ret < 0) { - cryptodev_fips_validate_usage(prgname); - return -EINVAL; - } - } else if (strcmp(lgopts[option_index].name, - CRYPTODEV_ID_KEYWORD) == 0) { - ret = parse_cryptodev_id_arg(optarg); - if (ret < 0) { - cryptodev_fips_validate_usage(prgname); - return -EINVAL; - } - } else if (strcmp(lgopts[option_index].name, - CRYPTODEV_ST_KEYWORD) == 0) { - env.self_test = 1; - } else if (strcmp(lgopts[option_index].name, - CRYPTODEV_BK_ID_KEYWORD) == 0) { - if (!env.broken_test_config) { - env.broken_test_config = rte_malloc( - NULL, - sizeof(*env.broken_test_config), - 0); - if (!env.broken_test_config) - return -ENOMEM; - - env.broken_test_config->expect_fail_dir = - self_test_dir_enc_auth_gen; - } + case OPT_REQ_FILE_PATH_NUM: + env.req_path = optarg; + break; - if (parser_read_uint32( - &env.broken_test_config->expect_fail_test_idx, - optarg) < 0) { - rte_free(env.broken_test_config); - cryptodev_fips_validate_usage(prgname); - return -EINVAL; - } - } else if (strcmp(lgopts[option_index].name, - CRYPTODEV_BK_DIR_KEY) == 0) { - if (!env.broken_test_config) { - env.broken_test_config = rte_malloc( - NULL, - sizeof(*env.broken_test_config), - 0); - if (!env.broken_test_config) - return -ENOMEM; - - env.broken_test_config-> - expect_fail_test_idx = 0; - } + case OPT_RSP_FILE_PATH_NUM: + env.rsp_path = optarg; + break; - if (strcmp(optarg, CRYPTODEV_ENC_KEYWORD) == 0) - env.broken_test_config->expect_fail_dir = - self_test_dir_enc_auth_gen; - else if (strcmp(optarg, CRYPTODEV_DEC_KEYWORD) - == 0) - env.broken_test_config->expect_fail_dir = - self_test_dir_dec_auth_verify; - else { - rte_free(env.broken_test_config); - cryptodev_fips_validate_usage(prgname); - return -EINVAL; - } - } else if (strcmp(lgopts[option_index].name, - MBUF_DATAROOM_KEYWORD) == 0) { - uint32_t data_room_size; - - if (parser_read_uint32(&data_room_size, - optarg) < 0) { - cryptodev_fips_validate_usage(prgname); - return -EINVAL; - } + case OPT_FOLDER_NUM: + env.is_path_folder = 1; + break; - if (data_room_size == 0 || - data_room_size > UINT16_MAX) { - cryptodev_fips_validate_usage(prgname); - return -EINVAL; - } + case OPT_CRYPTODEV_NUM: + ret = parse_cryptodev_arg(optarg); + if (ret < 0) { + cryptodev_fips_validate_usage(prgname); + return -EINVAL; + } + break; - env.mbuf_data_room = data_room_size; - } else { + case OPT_CRYPTODEV_ID_NUM: + ret = parse_cryptodev_id_arg(optarg); + if (ret < 0) { cryptodev_fips_validate_usage(prgname); return -EINVAL; } break; + + case OPT_CRYPTODEV_ST_NUM: + env.self_test = 1; + break; + + case OPT_CRYPTODEV_BK_ID_NUM: + if (!env.broken_test_config) { + env.broken_test_config = rte_malloc( + NULL, + sizeof(*env.broken_test_config), + 0); + if (!env.broken_test_config) + return -ENOMEM; + + env.broken_test_config->expect_fail_dir = + self_test_dir_enc_auth_gen; + } + + if (parser_read_uint32( + &env.broken_test_config->expect_fail_test_idx, + optarg) < 0) { + rte_free(env.broken_test_config); + cryptodev_fips_validate_usage(prgname); + return -EINVAL; + } + break; + + case OPT_CRYPTODEV_BK_DIR_KEY_NUM: + if (!env.broken_test_config) { + env.broken_test_config = rte_malloc( + NULL, + sizeof(*env.broken_test_config), + 0); + if (!env.broken_test_config) + return -ENOMEM; + + env.broken_test_config->expect_fail_test_idx = + 0; + } + + if (strcmp(optarg, "enc") == 0) + env.broken_test_config->expect_fail_dir = + self_test_dir_enc_auth_gen; + else if (strcmp(optarg, "dec") + == 0) + env.broken_test_config->expect_fail_dir = + self_test_dir_dec_auth_verify; + else { + rte_free(env.broken_test_config); + cryptodev_fips_validate_usage(prgname); + return -EINVAL; + } + break; + + + case OPT_MBUF_DATAROOM_NUM: + if (parser_read_uint16(&env.mbuf_data_room, + optarg) < 0) { + cryptodev_fips_validate_usage(prgname); + return -EINVAL; + } + + if (env.mbuf_data_room == 0) { + cryptodev_fips_validate_usage(prgname); + return -EINVAL; + } + break; + default: - return -1; + cryptodev_fips_validate_usage(prgname); + return -EINVAL; } } From patchwork Thu Feb 4 07:34:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ibtisam Tariq X-Patchwork-Id: 87717 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 774E2A0A0E; Thu, 4 Feb 2021 08:34:41 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4F74224057C; Thu, 4 Feb 2021 08:34:41 +0100 (CET) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mails.dpdk.org (Postfix) with ESMTP id 62726240570 for ; Thu, 4 Feb 2021 08:34:39 +0100 (CET) Received: by mail-wr1-f48.google.com with SMTP id q7so2198746wre.13 for ; Wed, 03 Feb 2021 23:34:39 -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=2UUnEgcL3km4ZOeJvZfMVNfy5nkfEK33AEjLuI3Fb4I=; b=H583xV3xG1okNXTnN+l9UMXxGLAY81u978fOv24/9ZwZYtoIfmlM3nfUxhgtLgXOKM 1Z+XVY5KCpycBDfa9O/TFp+1MbuPMO2OOxK+eqnB4M/qImZQG2uR/VCHELwvYeVfM4/k y6JnfBQsoVR0ka/vT3UEBVwY+WqDjCihUal+1HUCtc8NZeIF7RDp72y5bp5QNSjC7kct ntJ+s0xQld1E2VPm/AFXYVoTn0jrmvUuocurMGtvY+arql8u541gMY5wV0WD4x3mhDXE 7LL81l/cGyG8bmWmPWNzLgGyUwAiJMqlxuJgWJ39UVhm1KSP9y3sqT9D5Qu/rhgwEDyc gCNQ== 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=2UUnEgcL3km4ZOeJvZfMVNfy5nkfEK33AEjLuI3Fb4I=; b=T5v7dFQSYXkQZbgeWIA3k4cTX/FGeglP2ttM9X/ahukEMBm7w185QP9cVVjpoKA6B1 RbQbmBhlxoyAaTqqg3FBcZH8umfnqeT0r6Vutar2dCkSYuMOgHBXwbKijMKdMJlsbFiM HhKAXLHs0DY670NpaxEHjJPxrPLz40RAe+D+o288UPancTWc8iWnFFDvd6ZmjLDeEqrn BlkfcusUY9kWsn7BXz6kejO3ofOQW7fBURGTn2QODHClPxBkVGT5NGLTrkIbBuu1wUsK AEZ1Peh3lwwqYVAWFiWTNuEI5K0VEwDeMS3hdQc8KWbrsFZISEsVW5haM927w8N6wgVw Q80Q== X-Gm-Message-State: AOAM531UJV4SlT3bFL+y/6VFS9D2wHDcOsUyosbAxywn7d5PP9dy4mEe rmWD6oe7GtgvAoP4uY4CevAvvg== X-Google-Smtp-Source: ABdhPJxQ6yqdCU64FDx1Wu73kofkJiQgJibmfT26pc2urhW08CUZ1ow3qYUI1LkEecM0r8QNu5rvpg== X-Received: by 2002:adf:c413:: with SMTP id v19mr7681450wrf.158.1612424079137; Wed, 03 Feb 2021 23:34:39 -0800 (PST) Received: from localhost.localdomain ([39.33.143.135]) by smtp.gmail.com with ESMTPSA id j11sm7082604wrt.26.2021.02.03.23.34.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Feb 2021 23:34:38 -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 Date: Thu, 4 Feb 2021 07:34:15 +0000 Message-Id: <20210204073420.2421-2-ibtisam.tariq@emumba.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210204073420.2421-1-ibtisam.tariq@emumba.com> References: <20210204073420.2421-1-ibtisam.tariq@emumba.com> Subject: [dpdk-dev] [PATCH v4 2/7] examples/l3fwd-acl: enhance getopt_long usage X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 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: konstantin.ananyev@intel.com Reported-by: David Marchand Signed-off-by: Ibtisam Tariq --- v4: * Set indentation of preprocessor directives. v3: * None. 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. --- examples/l3fwd-acl/main.c | 219 +++++++++++++++++++------------------- 1 file changed, 110 insertions(+), 109 deletions(-) diff --git a/examples/l3fwd-acl/main.c b/examples/l3fwd-acl/main.c index 961594f5f..3e71103da 100644 --- a/examples/l3fwd-acl/main.c +++ b/examples/l3fwd-acl/main.c @@ -195,13 +195,24 @@ send_single_packet(struct rte_mbuf *m, uint16_t port); #define ACL_LEAD_CHAR ('@') #define ROUTE_LEAD_CHAR ('R') #define COMMENT_LEAD_CHAR ('#') -#define OPTION_CONFIG "config" -#define OPTION_NONUMA "no-numa" -#define OPTION_ENBJMO "enable-jumbo" -#define OPTION_RULE_IPV4 "rule_ipv4" -#define OPTION_RULE_IPV6 "rule_ipv6" -#define OPTION_ALG "alg" -#define OPTION_ETH_DEST "eth-dest" + +enum { +#define OPT_CONFIG "config" + OPT_CONFIG_NUM = 256, +#define OPT_NONUMA "no-numa" + OPT_NONUMA_NUM, +#define OPT_ENBJMO "enable-jumbo" + OPT_ENBJMO_NUM, +#define OPT_RULE_IPV4 "rule_ipv4" + OPT_RULE_IPV4_NUM, +#define OPT_RULE_IPV6 "rule_ipv6" + OPT_RULE_IPV6_NUM, +#define OPT_ALG "alg" + OPT_ALG_NUM, +#define OPT_ETH_DEST "eth-dest" + OPT_ETH_DEST_NUM, +}; + #define ACL_DENY_SIGNATURE 0xf0000000 #define RTE_LOGTYPE_L3FWDACL RTE_LOGTYPE_USER3 #define acl_log(format, ...) RTE_LOG(ERR, L3FWDACL, format, ##__VA_ARGS__) @@ -1177,9 +1188,9 @@ static void dump_acl_config(void) { printf("ACL option are:\n"); - printf(OPTION_RULE_IPV4": %s\n", parm_config.rule_ipv4_name); - printf(OPTION_RULE_IPV6": %s\n", parm_config.rule_ipv6_name); - printf(OPTION_ALG": %s\n", str_acl_alg(parm_config.alg)); + printf(OPT_RULE_IPV4": %s\n", parm_config.rule_ipv4_name); + printf(OPT_RULE_IPV6": %s\n", parm_config.rule_ipv6_name); + printf(OPT_ALG": %s\n", str_acl_alg(parm_config.alg)); } static int @@ -1608,27 +1619,27 @@ print_usage(const char *prgname) usage_acl_alg(alg, sizeof(alg)); printf("%s [EAL options] -- -p PORTMASK -P" - "--"OPTION_RULE_IPV4"=FILE" - "--"OPTION_RULE_IPV6"=FILE" - " [--"OPTION_CONFIG" (port,queue,lcore)[,(port,queue,lcore]]" - " [--"OPTION_ENBJMO" [--max-pkt-len PKTLEN]]\n" + "--"OPT_RULE_IPV4"=FILE" + "--"OPT_RULE_IPV6"=FILE" + " [--"OPT_CONFIG" (port,queue,lcore)[,(port,queue,lcore]]" + " [--"OPT_ENBJMO" [--max-pkt-len PKTLEN]]\n" " -p PORTMASK: hexadecimal bitmask of ports to configure\n" " -P : enable promiscuous mode\n" - " --"OPTION_CONFIG": (port,queue,lcore): " + " --"OPT_CONFIG": (port,queue,lcore): " "rx queues configuration\n" - " --"OPTION_NONUMA": optional, disable numa awareness\n" - " --"OPTION_ENBJMO": enable jumbo frame" + " --"OPT_NONUMA": optional, disable numa awareness\n" + " --"OPT_ENBJMO": enable jumbo frame" " which max packet len is PKTLEN in decimal (64-9600)\n" - " --"OPTION_RULE_IPV4"=FILE: specify the ipv4 rules entries " + " --"OPT_RULE_IPV4"=FILE: specify the ipv4 rules entries " "file. " "Each rule occupy one line. " "2 kinds of rules are supported. " "One is ACL entry at while line leads with character '%c', " "another is route entry at while line leads with " "character '%c'.\n" - " --"OPTION_RULE_IPV6"=FILE: specify the ipv6 rules " + " --"OPT_RULE_IPV6"=FILE: specify the ipv6 rules " "entries file.\n" - " --"OPTION_ALG": ACL classify method to use, one of: %s\n", + " --"OPT_ALG": ACL classify method to use, one of: %s\n", prgname, ACL_LEAD_CHAR, ROUTE_LEAD_CHAR, alg); } @@ -1747,14 +1758,14 @@ parse_args(int argc, char **argv) int option_index; char *prgname = argv[0]; static struct option lgopts[] = { - {OPTION_CONFIG, 1, 0, 0}, - {OPTION_NONUMA, 0, 0, 0}, - {OPTION_ENBJMO, 0, 0, 0}, - {OPTION_RULE_IPV4, 1, 0, 0}, - {OPTION_RULE_IPV6, 1, 0, 0}, - {OPTION_ALG, 1, 0, 0}, - {OPTION_ETH_DEST, 1, 0, 0}, - {NULL, 0, 0, 0} + {OPT_CONFIG, 1, NULL, OPT_CONFIG_NUM }, + {OPT_NONUMA, 0, NULL, OPT_NONUMA_NUM }, + {OPT_ENBJMO, 0, NULL, OPT_ENBJMO_NUM }, + {OPT_RULE_IPV4, 1, NULL, OPT_RULE_IPV4_NUM }, + {OPT_RULE_IPV6, 1, NULL, OPT_RULE_IPV6_NUM }, + {OPT_ALG, 1, NULL, OPT_ALG_NUM }, + {OPT_ETH_DEST, 1, NULL, OPT_ETH_DEST_NUM }, + {NULL, 0, 0, 0 } }; argvopt = argv; @@ -1772,104 +1783,94 @@ parse_args(int argc, char **argv) return -1; } break; + case 'P': printf("Promiscuous mode selected\n"); promiscuous_on = 1; break; /* long options */ - case 0: - if (!strncmp(lgopts[option_index].name, - OPTION_CONFIG, - sizeof(OPTION_CONFIG))) { - ret = parse_config(optarg); - if (ret) { - printf("invalid config\n"); - print_usage(prgname); - return -1; - } - } - - if (!strncmp(lgopts[option_index].name, - OPTION_NONUMA, - sizeof(OPTION_NONUMA))) { - printf("numa is disabled\n"); - numa_on = 0; - } - - if (!strncmp(lgopts[option_index].name, - OPTION_ENBJMO, sizeof(OPTION_ENBJMO))) { - struct option lenopts = { - "max-pkt-len", - required_argument, - 0, - 0 - }; - - printf("jumbo frame is enabled\n"); - port_conf.rxmode.offloads |= - DEV_RX_OFFLOAD_JUMBO_FRAME; - port_conf.txmode.offloads |= - DEV_TX_OFFLOAD_MULTI_SEGS; - - /* - * if no max-pkt-len set, then use the - * default value RTE_ETHER_MAX_LEN - */ - if (0 == getopt_long(argc, argvopt, "", - &lenopts, &option_index)) { - ret = parse_max_pkt_len(optarg); - if ((ret < 64) || - (ret > MAX_JUMBO_PKT_LEN)) { - printf("invalid packet " - "length\n"); - print_usage(prgname); - return -1; - } - port_conf.rxmode.max_rx_pkt_len = ret; - } - printf("set jumbo frame max packet length " - "to %u\n", - (unsigned int) - port_conf.rxmode.max_rx_pkt_len); + case OPT_CONFIG_NUM: + ret = parse_config(optarg); + if (ret) { + printf("invalid config\n"); + print_usage(prgname); + return -1; } + break; - if (!strncmp(lgopts[option_index].name, - OPTION_RULE_IPV4, - sizeof(OPTION_RULE_IPV4))) - parm_config.rule_ipv4_name = optarg; - - if (!strncmp(lgopts[option_index].name, - OPTION_RULE_IPV6, - sizeof(OPTION_RULE_IPV6))) { - parm_config.rule_ipv6_name = optarg; - } + case OPT_NONUMA_NUM: + printf("numa is disabled\n"); + numa_on = 0; + break; - if (!strncmp(lgopts[option_index].name, - OPTION_ALG, sizeof(OPTION_ALG))) { - parm_config.alg = parse_acl_alg(optarg); - if (parm_config.alg == - RTE_ACL_CLASSIFY_DEFAULT) { - printf("unknown %s value:\"%s\"\n", - OPTION_ALG, optarg); + case OPT_ENBJMO_NUM: + { + struct option lenopts = { + "max-pkt-len", + required_argument, + 0, + 0 + }; + + printf("jumbo frame is enabled\n"); + port_conf.rxmode.offloads |= + DEV_RX_OFFLOAD_JUMBO_FRAME; + port_conf.txmode.offloads |= + DEV_TX_OFFLOAD_MULTI_SEGS; + + /* + * if no max-pkt-len set, then use the + * default value RTE_ETHER_MAX_LEN + */ + if (0 == getopt_long(argc, argvopt, "", + &lenopts, &option_index)) { + ret = parse_max_pkt_len(optarg); + if ((ret < 64) || + (ret > MAX_JUMBO_PKT_LEN)) { + printf("invalid packet " + "length\n"); print_usage(prgname); return -1; } + port_conf.rxmode.max_rx_pkt_len = ret; } + printf("set jumbo frame max packet length " + "to %u\n", + (unsigned int) + port_conf.rxmode.max_rx_pkt_len); + break; + } + case OPT_RULE_IPV4_NUM: + parm_config.rule_ipv4_name = optarg; + break; - if (!strncmp(lgopts[option_index].name, OPTION_ETH_DEST, - sizeof(OPTION_ETH_DEST))) { - const char *serr = parse_eth_dest(optarg); - if (serr != NULL) { - printf("invalid %s value:\"%s\": %s\n", - OPTION_ETH_DEST, optarg, serr); - print_usage(prgname); - return -1; - } - } + case OPT_RULE_IPV6_NUM: + parm_config.rule_ipv6_name = optarg; + break; + case OPT_ALG_NUM: + parm_config.alg = parse_acl_alg(optarg); + if (parm_config.alg == + RTE_ACL_CLASSIFY_DEFAULT) { + printf("unknown %s value:\"%s\"\n", + OPT_ALG, optarg); + print_usage(prgname); + return -1; + } break; + case OPT_ETH_DEST_NUM: + { + const char *serr = parse_eth_dest(optarg); + if (serr != NULL) { + printf("invalid %s value:\"%s\": %s\n", + OPT_ETH_DEST, optarg, serr); + print_usage(prgname); + return -1; + } + break; + } default: print_usage(prgname); return -1; From patchwork Thu Feb 4 07:34:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ibtisam Tariq X-Patchwork-Id: 87718 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A9F4EA0A0E; Thu, 4 Feb 2021 08:34:51 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id ECEE624058C; Thu, 4 Feb 2021 08:34:44 +0100 (CET) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mails.dpdk.org (Postfix) with ESMTP id 86F2124058E for ; Thu, 4 Feb 2021 08:34:43 +0100 (CET) Received: by mail-wr1-f45.google.com with SMTP id q7so2198912wre.13 for ; Wed, 03 Feb 2021 23:34:43 -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=YfN9QRUlm5CbXIMozeXmALaYryPmXJ5iUEf+HSPnZsg=; b=r/BTUAV9ZCwAec6+g0sePX1nu++x1R1itswX5UnVzOu4L3Rd8/pzT386UG4LvauubS ekdxGRhIQVvLng6WYpKEgdmsJdXJg3Exz8qBxYJBJQ06tYHMLmp9/1GCe0ID6oMTlex/ 92+KEQc3gfil5bHPH/vn4YU4iNrHbrAVOMnwwPmLKLaJSsd+81bWqbBpAq4ObfQJ8QXo dippbCXGURNzhaPRvGiudEh3BMViFFMGSvCEdutfHtrLt6WTRKiuPfXe5m0bwFOie4Tt bfJfzVqOuE1yRcksmFlNCVgOwrDwJ0cQQvpjL3b5DUPsqdPL48wYrg1shoRrYRbVHFRC JfVA== 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=YfN9QRUlm5CbXIMozeXmALaYryPmXJ5iUEf+HSPnZsg=; b=Aigdezg1/d+jMgUPtTFeXPEElLMR2RutEwaaMXWmGE/bIisriARAmOa8XlYj3xl8yv iB/lgsT4BXtSzWssyeTHamRlAIfD9YfwmpzyorgfP90A1H1kJ/OHtaczupEQcQsIWDNo tim5VXzNIq6peE80tqLKhvy0Fzw69dr0tE2Nd4L0qHJGDcJNxiCL0V/1MadcbqjVF8kz F8yQca2jqZIn0tHdOZaQw1yJHtFUP7mr+zciwjJzqEM5EPvguFKzS+it7LcMFkei8IO6 3ExJWXCOKiPNtqHxYo1pB8xmHNke1lGAmCU88/IYUOsiHc1HmolFknpPfv1FNugKkMB7 vP2Q== X-Gm-Message-State: AOAM530kdeVPqXojMIV/7/9xz3SSs6Ufd33fafDAelJZCfyioohTT9QN 3wEeLwzXMe1ql6ctBYfsyBcUTw== X-Google-Smtp-Source: ABdhPJzCd829sMHTV1DrYblSlDFpbjdYWU81/Q8Y5NAtuS3B126Wkk/ECf14iaotyIbKWnNdl4txJw== X-Received: by 2002:a5d:414f:: with SMTP id c15mr7705488wrq.42.1612424083317; Wed, 03 Feb 2021 23:34:43 -0800 (PST) Received: from localhost.localdomain ([39.33.143.135]) by smtp.gmail.com with ESMTPSA id j11sm7082604wrt.26.2021.02.03.23.34.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Feb 2021 23:34:42 -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 , sergio.gonzalez.monroy@intel.com, phil.yang@arm.com Date: Thu, 4 Feb 2021 07:34:16 +0000 Message-Id: <20210204073420.2421-3-ibtisam.tariq@emumba.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210204073420.2421-1-ibtisam.tariq@emumba.com> References: <20210204073420.2421-1-ibtisam.tariq@emumba.com> Subject: [dpdk-dev] [PATCH v4 3/7] examples/packet_ordering: enhance getopt_long usage X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 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: sergio.gonzalez.monroy@intel.com Cc: phil.yang@arm.com Reported-by: David Marchand Signed-off-by: Ibtisam Tariq --- v4: * None. v3: * None. 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/packet_ordering/main.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/examples/packet_ordering/main.c b/examples/packet_ordering/main.c index 4bea1982d..ff670747f 100644 --- a/examples/packet_ordering/main.c +++ b/examples/packet_ordering/main.c @@ -29,6 +29,13 @@ /* Macros for printing using RTE_LOG */ #define RTE_LOGTYPE_REORDERAPP RTE_LOGTYPE_USER1 +enum { +#define OPT_DISABLE_REORDER "disable-reorder" + OPT_DISABLE_REORDER_NUM = 256, +#define OPT_INSIGHT_WORKER "insight-worker" + OPT_INSIGHT_WORKER_NUM, +}; + unsigned int portmask; unsigned int disable_reorder; unsigned int insight_worker; @@ -157,9 +164,9 @@ parse_args(int argc, char **argv) char **argvopt; char *prgname = argv[0]; static struct option lgopts[] = { - {"disable-reorder", 0, 0, 0}, - {"insight-worker", 0, 0, 0}, - {NULL, 0, 0, 0} + {OPT_DISABLE_REORDER, 0, NULL, OPT_DISABLE_REORDER_NUM}, + {OPT_INSIGHT_WORKER, 0, NULL, OPT_INSIGHT_WORKER_NUM }, + {NULL, 0, 0, 0 } }; argvopt = argv; @@ -176,18 +183,18 @@ parse_args(int argc, char **argv) return -1; } break; + /* long options */ - case 0: - if (!strcmp(lgopts[option_index].name, "disable-reorder")) { - printf("reorder disabled\n"); - disable_reorder = 1; - } - if (!strcmp(lgopts[option_index].name, - "insight-worker")) { - printf("print all worker statistics\n"); - insight_worker = 1; - } + case OPT_DISABLE_REORDER_NUM: + printf("reorder disabled\n"); + disable_reorder = 1; + break; + + case OPT_INSIGHT_WORKER_NUM: + printf("print all worker statistics\n"); + insight_worker = 1; break; + default: print_usage(prgname); return -1; From patchwork Thu Feb 4 07:34:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ibtisam Tariq X-Patchwork-Id: 87719 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5E428A0A0E; Thu, 4 Feb 2021 08:34:59 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 34903240596; Thu, 4 Feb 2021 08:34:49 +0100 (CET) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mails.dpdk.org (Postfix) with ESMTP id 313C7240596 for ; Thu, 4 Feb 2021 08:34:48 +0100 (CET) Received: by mail-wr1-f52.google.com with SMTP id q7so2199107wre.13 for ; Wed, 03 Feb 2021 23:34:48 -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=CJGk2Wn+nSLdWIWbjQrTbm1E7PYXh8Uju35NS1n34ho=; b=YgZZuAOV51Yp3D1Fb2H/Zpn51ZZSpRQL5nzfnLAtdDDOFJSOK1LfezKpx5c+LxlnmA 0ilEwZhuncD7Zm+LOUnpRq/709waphlStI4kgErr7Hb2NaRn73QTOFH8+EBjt4Idhhkb cHnjeu9xJbXfJyRFOmbodnKTYS7qTpuVyxwC6auLICJ0SerzQySXdHZFxun6VVvlaZgF hgEqPFiSE/ebEedxZOUTNOI2h3nw1Aata63sCEW/mhOWFatV3hTHOtwNJt/2QHOiBcDL kN8RpOOZJN9yHB9v8gHQGRD1yP49eD/9EyX5P+zegrWcJB3WLnhbLw2f/gT9hbUi7jW7 8tnQ== 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=CJGk2Wn+nSLdWIWbjQrTbm1E7PYXh8Uju35NS1n34ho=; b=ZkWkglT5CNEv22LQEHOgyWew3ABanND8aZqvKwhJS0hTzHVKfRC6onxMmGqQVU47hG zAGqi5Efcf0mj5yksxBEOX6A/26bDowmynWvYyfjz6UjKyUBwqa2wtX/A68VBqlU73bt 0ojGezPrXJWoTY0chhqxP1femQ0bzVGxKJrqGzl7PQp0Lncn7AMq3iixZVCoywEAPp6e gktDp3bkdohjx2Fd3i4QbB2zlRnktaSj4sJI9+E1ViI+9zHFA170dsofbXHheD14FWeK 21XmD8b0HREG+rSuazXQY89QMqjNAwA65cGMSb8k0EsLTMZ37qUj9CpYEH8wcvHlmvCl xYfg== X-Gm-Message-State: AOAM5333BXDWu76UgVHSO/JO2Je+FfDeY7VvaeKEUOZTqbu2Ypx8Be3g RgIltpqV6Vp5mtuhTytVztb6lA== X-Google-Smtp-Source: ABdhPJwv6ufX+uL3loBa8aILTsq+mbx+xxiaJi02kqtR32mYmdh22j5Tl6XtRu2xd+goODJvgnbmmw== X-Received: by 2002:adf:fd52:: with SMTP id h18mr7705093wrs.295.1612424087921; Wed, 03 Feb 2021 23:34:47 -0800 (PST) Received: from localhost.localdomain ([39.33.143.135]) by smtp.gmail.com with ESMTPSA id j11sm7082604wrt.26.2021.02.03.23.34.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Feb 2021 23:34:47 -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 , ian.betts@intel.com Date: Thu, 4 Feb 2021 07:34:17 +0000 Message-Id: <20210204073420.2421-4-ibtisam.tariq@emumba.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210204073420.2421-1-ibtisam.tariq@emumba.com> References: <20210204073420.2421-1-ibtisam.tariq@emumba.com> Subject: [dpdk-dev] [PATCH v4 4/7] examples/performance-thread/l3fwd-thread: enhance getopt_long usage X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 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: ian.betts@intel.com Reported-by: David Marchand Signed-off-by: Ibtisam Tariq --- v4: * Set indentation of preprocessor directives. v3: * None. 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. --- .../performance-thread/l3fwd-thread/main.c | 208 +++++++++--------- 1 file changed, 106 insertions(+), 102 deletions(-) diff --git a/examples/performance-thread/l3fwd-thread/main.c b/examples/performance-thread/l3fwd-thread/main.c index 4d82fb82e..65652f993 100644 --- a/examples/performance-thread/l3fwd-thread/main.c +++ b/examples/performance-thread/l3fwd-thread/main.c @@ -2864,16 +2864,28 @@ parse_eth_dest(const char *optarg) *(uint64_t *)(val_eth + portid) = dest_eth_addr[portid]; } -#define CMD_LINE_OPT_RX_CONFIG "rx" -#define CMD_LINE_OPT_TX_CONFIG "tx" -#define CMD_LINE_OPT_STAT_LCORE "stat-lcore" -#define CMD_LINE_OPT_ETH_DEST "eth-dest" -#define CMD_LINE_OPT_NO_NUMA "no-numa" -#define CMD_LINE_OPT_IPV6 "ipv6" -#define CMD_LINE_OPT_ENABLE_JUMBO "enable-jumbo" -#define CMD_LINE_OPT_HASH_ENTRY_NUM "hash-entry-num" -#define CMD_LINE_OPT_NO_LTHREADS "no-lthreads" -#define CMD_LINE_OPT_PARSE_PTYPE "parse-ptype" +enum { +#define OPT_RX_CONFIG "rx" + OPT_RX_CONFIG_NUM = 256, +#define OPT_TX_CONFIG "tx" + OPT_TX_CONFIG_NUM, +#define OPT_STAT_LCORE "stat-lcore" + OPT_STAT_LCORE_NUM, +#define OPT_ETH_DEST "eth-dest" + OPT_ETH_DEST_NUM, +#define OPT_NO_NUMA "no-numa" + OPT_NO_NUMA_NUM, +#define OPT_IPV6 "ipv6" + OPT_IPV6_NUM, +#define OPT_ENABLE_JUMBO "enable-jumbo" + OPT_ENABLE_JUMBO_NUM, +#define OPT_HASH_ENTRY_NUM "hash-entry-num" + OPT_HASH_ENTRY_NUM_NUM, +#define OPT_NO_LTHREADS "no-lthreads" + OPT_NO_LTHREADS_NUM, +#define OPT_PARSE_PTYPE "parse-ptype" + OPT_PARSE_PTYPE_NUM, +}; /* Parse the argument given in the command line of the application */ static int @@ -2884,17 +2896,17 @@ parse_args(int argc, char **argv) int option_index; char *prgname = argv[0]; static struct option lgopts[] = { - {CMD_LINE_OPT_RX_CONFIG, 1, 0, 0}, - {CMD_LINE_OPT_TX_CONFIG, 1, 0, 0}, - {CMD_LINE_OPT_STAT_LCORE, 1, 0, 0}, - {CMD_LINE_OPT_ETH_DEST, 1, 0, 0}, - {CMD_LINE_OPT_NO_NUMA, 0, 0, 0}, - {CMD_LINE_OPT_IPV6, 0, 0, 0}, - {CMD_LINE_OPT_ENABLE_JUMBO, 0, 0, 0}, - {CMD_LINE_OPT_HASH_ENTRY_NUM, 1, 0, 0}, - {CMD_LINE_OPT_NO_LTHREADS, 0, 0, 0}, - {CMD_LINE_OPT_PARSE_PTYPE, 0, 0, 0}, - {NULL, 0, 0, 0} + {OPT_RX_CONFIG, 1, NULL, OPT_RX_CONFIG_NUM }, + {OPT_TX_CONFIG, 1, NULL, OPT_TX_CONFIG_NUM }, + {OPT_STAT_LCORE, 1, NULL, OPT_STAT_LCORE_NUM }, + {OPT_ETH_DEST, 1, NULL, OPT_ETH_DEST_NUM }, + {OPT_NO_NUMA, 0, NULL, OPT_NO_NUMA_NUM }, + {OPT_IPV6, 0, NULL, OPT_IPV6_NUM }, + {OPT_ENABLE_JUMBO, 0, NULL, OPT_ENABLE_JUMBO_NUM }, + {OPT_HASH_ENTRY_NUM, 1, NULL, OPT_HASH_ENTRY_NUM_NUM }, + {OPT_NO_LTHREADS, 0, NULL, OPT_NO_LTHREADS_NUM }, + {OPT_PARSE_PTYPE, 0, NULL, OPT_PARSE_PTYPE_NUM }, + {NULL, 0, 0, 0 } }; argvopt = argv; @@ -2912,112 +2924,104 @@ parse_args(int argc, char **argv) return -1; } break; + case 'P': printf("Promiscuous mode selected\n"); promiscuous_on = 1; break; /* long options */ - case 0: - if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_RX_CONFIG, - sizeof(CMD_LINE_OPT_RX_CONFIG))) { - ret = parse_rx_config(optarg); - if (ret) { - printf("invalid rx-config\n"); - print_usage(prgname); - return -1; - } + case OPT_RX_CONFIG_NUM: + ret = parse_rx_config(optarg); + if (ret) { + printf("invalid rx-config\n"); + print_usage(prgname); + return -1; } + break; - if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_TX_CONFIG, - sizeof(CMD_LINE_OPT_TX_CONFIG))) { - ret = parse_tx_config(optarg); - if (ret) { - printf("invalid tx-config\n"); - print_usage(prgname); - return -1; - } + case OPT_TX_CONFIG_NUM: + ret = parse_tx_config(optarg); + if (ret) { + printf("invalid tx-config\n"); + print_usage(prgname); + return -1; } + break; #if (APP_CPU_LOAD > 0) - if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_STAT_LCORE, - sizeof(CMD_LINE_OPT_STAT_LCORE))) { - cpu_load_lcore_id = parse_stat_lcore(optarg); - } + case OPT_STAT_LCORE_NUM: + cpu_load_lcore_id = parse_stat_lcore(optarg); + break; #endif - if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_ETH_DEST, - sizeof(CMD_LINE_OPT_ETH_DEST))) - parse_eth_dest(optarg); + case OPT_ETH_DEST_NUM: + parse_eth_dest(optarg); + break; - if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_NO_NUMA, - sizeof(CMD_LINE_OPT_NO_NUMA))) { - printf("numa is disabled\n"); - numa_on = 0; - } + case OPT_NO_NUMA_NUM: + printf("numa is disabled\n"); + numa_on = 0; + break; #if (APP_LOOKUP_METHOD == APP_LOOKUP_EXACT_MATCH) - if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_IPV6, - sizeof(CMD_LINE_OPT_IPV6))) { - printf("ipv6 is specified\n"); - ipv6 = 1; - } + case OPT_IPV6_NUM: + printf("ipv6 is specified\n"); + ipv6 = 1; + break; #endif - if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_NO_LTHREADS, - sizeof(CMD_LINE_OPT_NO_LTHREADS))) { - printf("l-threads model is disabled\n"); - lthreads_on = 0; - } + case OPT_NO_LTHREADS_NUM: + printf("l-threads model is disabled\n"); + lthreads_on = 0; + break; - if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_PARSE_PTYPE, - sizeof(CMD_LINE_OPT_PARSE_PTYPE))) { - printf("software packet type parsing enabled\n"); - parse_ptype_on = 1; - } + case OPT_PARSE_PTYPE_NUM: + printf("software packet type parsing enabled\n"); + parse_ptype_on = 1; + break; - if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_ENABLE_JUMBO, - sizeof(CMD_LINE_OPT_ENABLE_JUMBO))) { - struct option lenopts = {"max-pkt-len", required_argument, 0, - 0}; - - printf("jumbo frame is enabled - disabling simple TX path\n"); - port_conf.rxmode.offloads |= - DEV_RX_OFFLOAD_JUMBO_FRAME; - port_conf.txmode.offloads |= - DEV_TX_OFFLOAD_MULTI_SEGS; - - /* if no max-pkt-len set, use the default value - * RTE_ETHER_MAX_LEN - */ - if (0 == getopt_long(argc, argvopt, "", &lenopts, - &option_index)) { - - ret = parse_max_pkt_len(optarg); - if ((ret < 64) || (ret > MAX_JUMBO_PKT_LEN)) { - printf("invalid packet length\n"); - print_usage(prgname); - return -1; - } - port_conf.rxmode.max_rx_pkt_len = ret; - } - printf("set jumbo frame max packet length to %u\n", - (unsigned int)port_conf.rxmode.max_rx_pkt_len); - } -#if (APP_LOOKUP_METHOD == APP_LOOKUP_EXACT_MATCH) - if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_HASH_ENTRY_NUM, - sizeof(CMD_LINE_OPT_HASH_ENTRY_NUM))) { - ret = parse_hash_entry_number(optarg); - if ((ret > 0) && (ret <= L3FWD_HASH_ENTRIES)) { - hash_entry_number = ret; - } else { - printf("invalid hash entry number\n"); + case OPT_ENABLE_JUMBO_NUM: + { + struct option lenopts = {"max-pkt-len", + required_argument, 0, 0}; + + printf("jumbo frame is enabled - disabling simple TX path\n"); + port_conf.rxmode.offloads |= + DEV_RX_OFFLOAD_JUMBO_FRAME; + port_conf.txmode.offloads |= + DEV_TX_OFFLOAD_MULTI_SEGS; + + /* if no max-pkt-len set, use the default value + * RTE_ETHER_MAX_LEN + */ + if (0 == getopt_long(argc, argvopt, "", &lenopts, + &option_index)) { + + ret = parse_max_pkt_len(optarg); + if ((ret < 64) || (ret > MAX_JUMBO_PKT_LEN)) { + printf("invalid packet length\n"); print_usage(prgname); return -1; } + port_conf.rxmode.max_rx_pkt_len = ret; } -#endif + printf("set jumbo frame max packet length to %u\n", + (unsigned int)port_conf.rxmode.max_rx_pkt_len); break; + } +#if (APP_LOOKUP_METHOD == APP_LOOKUP_EXACT_MATCH) + case OPT_HASH_ENTRY_NUM_NUM: + ret = parse_hash_entry_number(optarg); + if ((ret > 0) && (ret <= L3FWD_HASH_ENTRIES)) { + hash_entry_number = ret; + } else { + printf("invalid hash entry number\n"); + print_usage(prgname); + return -1; + } + break; +#endif default: print_usage(prgname); From patchwork Thu Feb 4 07:34:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ibtisam Tariq X-Patchwork-Id: 87720 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id EC172A0A0E; Thu, 4 Feb 2021 08:35:07 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6CCC72405A6; Thu, 4 Feb 2021 08:34:55 +0100 (CET) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mails.dpdk.org (Postfix) with ESMTP id 71BC224058B for ; Thu, 4 Feb 2021 08:34:54 +0100 (CET) Received: by mail-wm1-f44.google.com with SMTP id m1so2093467wml.2 for ; Wed, 03 Feb 2021 23:34:54 -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=NnSV00WerX9kYlnNqdk35XhWEJrzuwHatqcmgZ5qOYA=; b=TvhQDqx9FOdH5UY/vILWRLDz/cAa/NMXNQ/QAplX8PFJG2hcXE5fPcJMVNNGzgJvYZ letgoXLBZCMyR/BsOHOSz1zpGG8Qd05Ud10z98L2gq+FmzukMfwFfk0dyfwpxAZ2ozYu E2WmbI1iPKZVVm1UY7cU38BJ8KwIn7W8xja1NGtDx9vecXh0gH5webfOABpCKwcdyyEB kWmbDhh3rOPJZml3se+c6ChkG8gOQlTambpIzEkjddhGC73GK2D3W8YmERwmMa4umflw 0p4kcdIKgKDvRcW5XQhxy7SNZViTk9vHPPHHsP4rpyw+/RYGLlPiEjguyMGYHUFJxuKK CZIQ== 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=NnSV00WerX9kYlnNqdk35XhWEJrzuwHatqcmgZ5qOYA=; b=LtjVYJfQOXLjT/eoBFr4CXOvxFXzxd/QNFQ7u8DpL9qDcJLsbPxCDcnTLaspDPi98X AYZiARbeq8TcDx8qYcBu31Shm9stx37WAzU/cFcQtFPgciv+9qUo7qJUIf5A4RhBTqz4 TSOMc8aMhwVX4zqOunImpa+w5IcxqnsHh+gBDaj5d2wRweeHoX1Tnrqr7dlOXoH3hGVQ RNUY7e6xPJx+OfjtE4HHzCS6J6DIF6ZuuUBDSLJ2HrkDzvSBg26kNNjAU0jA7DrkSn10 2KLhM+2Du9m2UwBOQoaM9aX0mpYSxv/WidV2FXWFvdWSVoVYGtNklrMIB101gaoTUV/p /qcQ== X-Gm-Message-State: AOAM531kGPf1bVSayE7Qgifq619o3vkfrVqMLq0CFVf8EHRGTxGVlS8n l1GPofvt5OMmsm1whEgRArA6zHfSu9LEj6WP X-Google-Smtp-Source: ABdhPJxX/nLWX6hPleogueKC4jeEH6xxDNa7L+0RQFtmZ8EhxsydGTR21ABG337uTpnM1KlaHlsBSQ== X-Received: by 2002:a1c:25c2:: with SMTP id l185mr6126020wml.62.1612424094234; Wed, 03 Feb 2021 23:34:54 -0800 (PST) Received: from localhost.localdomain ([39.33.143.135]) by smtp.gmail.com with ESMTPSA id j11sm7082604wrt.26.2021.02.03.23.34.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Feb 2021 23:34:53 -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 , stephen@networkplumber.org Date: Thu, 4 Feb 2021 07:34:18 +0000 Message-Id: <20210204073420.2421-5-ibtisam.tariq@emumba.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210204073420.2421-1-ibtisam.tariq@emumba.com> References: <20210204073420.2421-1-ibtisam.tariq@emumba.com> Subject: [dpdk-dev] [PATCH v4 5/7] examples/qos_sched: enhance getopt_long usage X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 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: stephen@networkplumber.org Reported-by: David Marchand Signed-off-by: Ibtisam Tariq --- v4: * None. v3: * Remove str_is function. 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/qos_sched/args.c | 149 +++++++++++++++++++++----------------- 1 file changed, 83 insertions(+), 66 deletions(-) diff --git a/examples/qos_sched/args.c b/examples/qos_sched/args.c index c369ba9b4..10ca7bea6 100644 --- a/examples/qos_sched/args.c +++ b/examples/qos_sched/args.c @@ -81,10 +81,6 @@ app_usage(const char *prgname) ); } -static inline int str_is(const char *str, const char *is) -{ - return strcmp(str, is) == 0; -} /* returns core mask used by DPDK */ static uint64_t @@ -297,6 +293,25 @@ app_parse_burst_conf(const char *conf_str) return 0; } +enum { +#define OPT_PFC "pfc" + OPT_PFC_NUM = 256, +#define OPT_MNC "mnc" + OPT_MNC_NUM, +#define OPT_RSZ "rsz" + OPT_RSZ_NUM, +#define OPT_BSZ "bsz" + OPT_BSZ_NUM, +#define OPT_MSZ "msz" + OPT_MSZ_NUM, +#define OPT_RTH "rth" + OPT_RTH_NUM, +#define OPT_TTH "tth" + OPT_TTH_NUM, +#define OPT_CFG "cfg" + OPT_CFG_NUM, +}; + /* * Parses the argument given in the command line of the application, * calculates mask for used cores and initializes EAL with calculated core mask @@ -306,20 +321,19 @@ app_parse_args(int argc, char **argv) { int opt, ret; int option_index; - const char *optname; char *prgname = argv[0]; uint32_t i, nb_lcores; static struct option lgopts[] = { - { "pfc", 1, 0, 0 }, - { "mnc", 1, 0, 0 }, - { "rsz", 1, 0, 0 }, - { "bsz", 1, 0, 0 }, - { "msz", 1, 0, 0 }, - { "rth", 1, 0, 0 }, - { "tth", 1, 0, 0 }, - { "cfg", 1, 0, 0 }, - { NULL, 0, 0, 0 } + {OPT_PFC, 1, NULL, OPT_PFC_NUM}, + {OPT_MNC, 1, NULL, OPT_MNC_NUM}, + {OPT_RSZ, 1, NULL, OPT_RSZ_NUM}, + {OPT_BSZ, 1, NULL, OPT_BSZ_NUM}, + {OPT_MSZ, 1, NULL, OPT_MSZ_NUM}, + {OPT_RTH, 1, NULL, OPT_RTH_NUM}, + {OPT_TTH, 1, NULL, OPT_TTH_NUM}, + {OPT_CFG, 1, NULL, OPT_CFG_NUM}, + {NULL, 0, 0, 0 } }; /* initialize EAL first */ @@ -342,66 +356,69 @@ app_parse_args(int argc, char **argv) interactive = 1; break; /* long options */ - case 0: - optname = lgopts[option_index].name; - if (str_is(optname, "pfc")) { - ret = app_parse_flow_conf(optarg); - if (ret) { - RTE_LOG(ERR, APP, "Invalid pipe configuration %s\n", optarg); - return -1; - } - break; - } - if (str_is(optname, "mnc")) { - app_main_core = (uint32_t)atoi(optarg); - break; - } - if (str_is(optname, "rsz")) { - ret = app_parse_ring_conf(optarg); - if (ret) { - RTE_LOG(ERR, APP, "Invalid ring configuration %s\n", optarg); - return -1; - } - break; + + case OPT_PFC_NUM: + ret = app_parse_flow_conf(optarg); + if (ret) { + RTE_LOG(ERR, APP, "Invalid pipe configuration %s\n", + optarg); + return -1; } - if (str_is(optname, "bsz")) { - ret = app_parse_burst_conf(optarg); - if (ret) { - RTE_LOG(ERR, APP, "Invalid burst configuration %s\n", optarg); - return -1; - } - break; + break; + + case OPT_MNC_NUM: + app_main_core = (uint32_t)atoi(optarg); + break; + + case OPT_RSZ_NUM: + ret = app_parse_ring_conf(optarg); + if (ret) { + RTE_LOG(ERR, APP, "Invalid ring configuration %s\n", + optarg); + return -1; } - if (str_is(optname, "msz")) { - mp_size = atoi(optarg); - if (mp_size <= 0) { - RTE_LOG(ERR, APP, "Invalid mempool size %s\n", optarg); - return -1; - } - break; + break; + + case OPT_BSZ_NUM: + ret = app_parse_burst_conf(optarg); + if (ret) { + RTE_LOG(ERR, APP, "Invalid burst configuration %s\n", + optarg); + return -1; } - if (str_is(optname, "rth")) { - ret = app_parse_rth_conf(optarg); - if (ret) { - RTE_LOG(ERR, APP, "Invalid RX threshold configuration %s\n", optarg); - return -1; - } - break; + break; + + case OPT_MSZ_NUM: + mp_size = atoi(optarg); + if (mp_size <= 0) { + RTE_LOG(ERR, APP, "Invalid mempool size %s\n", + optarg); + return -1; } - if (str_is(optname, "tth")) { - ret = app_parse_tth_conf(optarg); - if (ret) { - RTE_LOG(ERR, APP, "Invalid TX threshold configuration %s\n", optarg); - return -1; - } - break; + break; + + case OPT_RTH_NUM: + ret = app_parse_rth_conf(optarg); + if (ret) { + RTE_LOG(ERR, APP, "Invalid RX threshold configuration %s\n", + optarg); + return -1; } - if (str_is(optname, "cfg")) { - cfg_profile = optarg; - break; + break; + + case OPT_TTH_NUM: + ret = app_parse_tth_conf(optarg); + if (ret) { + RTE_LOG(ERR, APP, "Invalid TX threshold configuration %s\n", + optarg); + return -1; } break; + case OPT_CFG_NUM: + cfg_profile = optarg; + break; + default: app_usage(prgname); return -1; From patchwork Thu Feb 4 07:34:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ibtisam Tariq X-Patchwork-Id: 87721 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id CB6D1A0A0E; Thu, 4 Feb 2021 08:35:15 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9B6C52405BB; Thu, 4 Feb 2021 08:35:00 +0100 (CET) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mails.dpdk.org (Postfix) with ESMTP id 80588240581 for ; Thu, 4 Feb 2021 08:34:59 +0100 (CET) Received: by mail-wr1-f45.google.com with SMTP id v15so2277923wrx.4 for ; Wed, 03 Feb 2021 23:34:59 -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=v2aa+4+YUf8WV7rnmTdvFLYMbKyOLWBq8ATGNNvybCs=; b=XgoH18bpmx+mnnMJjn72q76V1eKnsQYSZVegnY9uAlCSd0QMloSlfmi0GhseQ9vT8R 0SykWiMRtAJW3obaY1C15jj4FmurMB5Gigha6YYFRYY5VKL3lt7t8zNjt4Qt2lK/An4r OGtuofw5KrYCx6OLGlHVaPive51CdGQMH9ilvAG/A68VrqieEEeoFWKYeXvbLTaidAQi kf7hOmwy4w41DC712YBVd9XqJjn/d2dCy7OGdixzB+SdxbMEH5Hwg/pS/iFMDmN39JYj dlnto1bEtnr8M+OgFceGhkG7M3q/dEJ1jsR1X5PxOW58kXb+xLNfAX+cXv8vQVQNviQ8 DYrA== 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=v2aa+4+YUf8WV7rnmTdvFLYMbKyOLWBq8ATGNNvybCs=; b=EPz9Ti9vzhNBzVrzBsNCIWazh2QbdHdGxsuZcPwpo11C5/YgRGWsQ/b8TE+oAq1K60 9odRUP/SwMntymN0dlOMhdO3x/GoPpr8FgA3r5MdBwu0h/Qll99CTa991MfANaMbCGqB f3ff3Xt/Akb05mTYtzSKKYjnAG6MSktS9cWoRrzozT41kpGxa42tp8z4dI0b9gNi77/F j7yDijuXkiibsRGW5OcRebdHZVzyHZvUgLt2ELzECn0bntpZ9d6hi9J8t1N5TZv4FPo3 706jRPP/n8MODWJcJgwZ8LuS/dcA7DiabqwJD7hkD9ecRRwl2kCNS7HElfGGK1eGebfb FU6Q== X-Gm-Message-State: AOAM533Ofb2WdTLjH+DCIuynHEuDvKIaQ2TTdSnQJlmg4bTmA+OgDAF4 VMPGKRxHYv/+YiaEDBfQVQVE5A== X-Google-Smtp-Source: ABdhPJyGSbWfJACczpmHQvDTlmOpqWPL0xE5+GxDpEPrS6ym7xvPkMre+Ia962hHZsWreyNzfiBWgw== X-Received: by 2002:a5d:5686:: with SMTP id f6mr7555870wrv.257.1612424099129; Wed, 03 Feb 2021 23:34:59 -0800 (PST) Received: from localhost.localdomain ([39.33.143.135]) by smtp.gmail.com with ESMTPSA id j11sm7082604wrt.26.2021.02.03.23.34.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Feb 2021 23:34:58 -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 , jiayu.hu@intel.com, huawei.xie@intel.com Date: Thu, 4 Feb 2021 07:34:19 +0000 Message-Id: <20210204073420.2421-6-ibtisam.tariq@emumba.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210204073420.2421-1-ibtisam.tariq@emumba.com> References: <20210204073420.2421-1-ibtisam.tariq@emumba.com> Subject: [dpdk-dev] [PATCH v4 6/7] examples/vhost: enhance getopt_long usage X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 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: jiayu.hu@intel.com Cc: huawei.xie@intel.com Reported-by: David Marchand Signed-off-by: Ibtisam Tariq Reviewed-by: Maxime Coquelin --- v4: * Set indentation of preprocessor directives. * Add enums for OPT_BUILTIN_NET_DRIVER and OPT_CLIENT in getopt_long. v3: * None. 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 | 288 +++++++++++++++++++++++------------------- 1 file changed, 155 insertions(+), 133 deletions(-) diff --git a/examples/vhost/main.c b/examples/vhost/main.c index 233a2dc6e..465981ac3 100644 --- a/examples/vhost/main.c +++ b/examples/vhost/main.c @@ -478,6 +478,35 @@ 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" + OPT_CLIENT_NUM, +#define OPT_BUILTIN_NET_DRIVER "builtin-net-driver" + OPT_BUILTIN_NET_DRIVER_NUM, +#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. */ @@ -489,19 +518,32 @@ 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, + NULL, OPT_CLIENT_NUM}, + {OPT_BUILTIN_NET_DRIVER, no_argument, + NULL, OPT_BUILTIN_NET_DRIVER_NUM}, + {OPT_DMA_TYPE, required_argument, + NULL, OPT_DMA_TYPE_NUM}, + {OPT_DMAS, required_argument, + NULL, OPT_DMAS_NUM}, {NULL, 0, 0, 0}, }; @@ -524,151 +566,131 @@ 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)) { - if (strlen(optarg) >= MAX_LONG_OPT_SZ) { - RTE_LOG(INFO, VHOST_CONFIG, - "Wrong DMA type\n"); - us_vhost_usage(prgname); - return -1; - } - 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; + + case OPT_CLIENT_NUM: + client_mode = 1; + break; + case OPT_BUILTIN_NET_DRIVER_NUM: + builtin_net_driver = 1; break; - /* Invalid option - print options. */ + /* Invalid option - print options. */ default: us_vhost_usage(prgname); return -1; From patchwork Thu Feb 4 07:34:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ibtisam Tariq X-Patchwork-Id: 87722 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id AA011A0A0E; Thu, 4 Feb 2021 08:35:25 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EE0AC2405C1; Thu, 4 Feb 2021 08:35:04 +0100 (CET) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mails.dpdk.org (Postfix) with ESMTP id A8E0324059F for ; Thu, 4 Feb 2021 08:35:03 +0100 (CET) Received: by mail-wm1-f42.google.com with SMTP id l12so2205827wmq.2 for ; Wed, 03 Feb 2021 23:35:03 -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=fYgUCFObKmBMlEz3xcUZhSHwLZmaVrRvR10lapU6ZHM=; b=QCCcSLiCqIS6JSrAGAdZf/2vKf4mgG/jxEnKBKtzezXQb1o/ct6dh9WuklmPXxuwqJ XlbtVgeHiwMRSeeTRxdjTP0+HGxLPxCBsy/axRjIE4+TK93kHka4dzIHipKx4iCTn2Pr GCn7V7ckYCY2VooCNHSFtjHYrpkeTNuxZnthQOdDqNJXZH+0qVuuOGt9CXqIlgl1wKba 8c2+DmkmlZvi73eui3Kln12Rv1Ew1jDqPHZuDhEXkbWpQS5BKwir9aWtjkoTXsHgubO+ aJwujav59KmWR/Tk3qyUSsoEv3kBbo5df1rDsTlKMJFhnJeq+nnN1R/kU619vS6HBWKw IlVg== 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=fYgUCFObKmBMlEz3xcUZhSHwLZmaVrRvR10lapU6ZHM=; b=HZKl8G1Wgn4ISuB/SrWyq9B4wPBEM3mOh2zGuciDBeESaL0YM/BcQAoUv2IkThvIQJ 7TRrTN4wYpqoKuHm+6ZpGHqY1pDGNkUaTCqb4e8D6c/AsVcjiLTLHBrWvUKgQmLg+3Zc aKSb3oPT7E0bxhYRoBsFhrGk+/1XdmTbRdyHIzK1m484VVZad8CK0yKlquQEKuqxB0hm CNljjtw75OM8amvrY3/myN3Fv+HEB+pitbNIMqL/vZ2Sh1xRTaVvybsWSXGaLaOHlbZx Xk+K+8dHaFXFhWEnmlVIcSo3LRNwpFsydMY4/PMEmUD/pDyKPNNZeGsXI85GaeNPmowX Kmvg== X-Gm-Message-State: AOAM530eWbveScnC1CIAugIskJX0bA25lq+K6W29ZRz1qmra2y/GQyqL qeT/z4tDaW5MU5LjJWjDEVHIDg== X-Google-Smtp-Source: ABdhPJz2t/9H/1M31YrRU4zprNhssFIly32KqPeksXEujjnXZv2Ztx9MVo9W1pBfB1g7Ewdmm0HDfQ== X-Received: by 2002:a05:600c:3545:: with SMTP id i5mr6286822wmq.134.1612424103376; Wed, 03 Feb 2021 23:35:03 -0800 (PST) Received: from localhost.localdomain ([39.33.143.135]) by smtp.gmail.com with ESMTPSA id j11sm7082604wrt.26.2021.02.03.23.35.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Feb 2021 23:35:02 -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: Thu, 4 Feb 2021 07:34:20 +0000 Message-Id: <20210204073420.2421-7-ibtisam.tariq@emumba.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210204073420.2421-1-ibtisam.tariq@emumba.com> References: <20210204073420.2421-1-ibtisam.tariq@emumba.com> Subject: [dpdk-dev] [PATCH v4 7/7] examples/vhost_crypto: enhance getopt_long usage X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 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 Acked-by: Fan Zhang Reviewed-by: Maxime Coquelin --- v4: * Set indentation of preprocessor directives. v3: * None. 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 | 86 +++++++++++++++++++++--------------- 1 file changed, 50 insertions(+), 36 deletions(-) diff --git a/examples/vhost_crypto/main.c b/examples/vhost_crypto/main.c index 29c8f7228..efae99781 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)]\n" " --%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,11 +216,15 @@ 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; @@ -222,36 +232,40 @@ vhost_crypto_parse_args(int argc, char **argv) while ((opt = getopt_long(argc, argvopt, "s:", 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; } }