From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id EAF954365D;
Mon, 4 Dec 2023 08:53:59 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id C542540693;
Mon, 4 Dec 2023 08:53:59 +0100 (CET)
Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189])
by mails.dpdk.org (Postfix) with ESMTP id 0A61D402AE
for <dev@dpdk.org>; Mon, 4 Dec 2023 08:53:57 +0100 (CET)
Received: from dggpeml500024.china.huawei.com (unknown [172.30.72.57])
by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4SkG574qbwz14L6p;
Mon, 4 Dec 2023 15:48:59 +0800 (CST)
Received: from localhost.localdomain (10.50.165.33) by
dggpeml500024.china.huawei.com (7.185.36.10) with Microsoft SMTP Server
(version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id
15.1.2507.35; Mon, 4 Dec 2023 15:53:55 +0800
From: Chengwen Feng <fengchengwen@huawei.com>
To: <dev@dpdk.org>, <thomas@monjalon.net>, <ferruh.yigit@amd.com>,
<stephen@networkplumber.org>
CC: <tangkunshan@huawei.com>
Subject: [RFC v2 2/6] argparse: support verify argument config
Date: Mon, 4 Dec 2023 07:50:44 +0000
Message-ID: <20231204075048.894-3-fengchengwen@huawei.com>
X-Mailer: git-send-email 2.17.1
In-Reply-To: <20231204075048.894-1-fengchengwen@huawei.com>
References: <20231121122651.7078-1-fengchengwen@huawei.com>
<20231204075048.894-1-fengchengwen@huawei.com>
MIME-Version: 1.0
Content-Type: text/plain
X-Originating-IP: [10.50.165.33]
X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To
dggpeml500024.china.huawei.com (7.185.36.10)
X-CFilter-Loop: Reflected
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
This commit supports verify argument config.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
lib/argparse/rte_argparse.c | 310 +++++++++++++++++++++++++++++++++++-
1 file changed, 309 insertions(+), 1 deletion(-)
diff --git a/lib/argparse/rte_argparse.c b/lib/argparse/rte_argparse.c
index bf14c56858..eff504a778 100644
--- a/lib/argparse/rte_argparse.c
+++ b/lib/argparse/rte_argparse.c
@@ -2,13 +2,321 @@
* Copyright(c) 2023 HiSilicon Limited
*/
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <rte_log.h>
+
#include "rte_argparse.h"
+RTE_LOG_REGISTER_DEFAULT(rte_argparse_logtype, INFO);
+#define ARGPARSE_LOG(level, ...) \
+ rte_log(RTE_LOG_ ## level, rte_argparse_logtype, RTE_FMT("argparse: " \
+ RTE_FMT_HEAD(__VA_ARGS__,) "\n", RTE_FMT_TAIL(__VA_ARGS__,)))
+
+#define BIT(x) (1ul << (x))
+#define GENMASK_U32(h, l) \
+ (((~0u) << (l)) & (~0u >> (31 - (h))))
+#define BF_SHF(x) (__builtin_ffsll(x) - 1)
+#define FIELD_GET(mask, reg) \
+ ((typeof(mask))(((reg) & (mask)) >> BF_SHF(mask)))
+
+#define ARG_ATTR_HAS_VAL_MASK GENMASK_U32(1, 0)
+#define ARG_ATTR_HAS_VAL_SHIFT 0
+#define ARG_ATTR_VAL_TYPE_MASK GENMASK_U32(10, 2)
+#define ARG_ATTR_VAL_TYPE_SHIFT 2
+#define ARG_ATTR_SUPPORT_MULTI_MASK BIT(16)
+#define ARG_ATTR_SUPPORT_MULTI_SHIFT 16
+#define ARG_ATTR_FLAG_PARSED_MASK BIT(31)
+#define ARG_ATTR_FLAG_PARSED_SHIFT 31
+
+static inline bool
+is_arg_optional(const struct rte_argparse_arg *arg)
+{
+ return arg->name_long[0] == '-';
+}
+
+static inline bool
+is_arg_positional(const struct rte_argparse_arg *arg)
+{
+ return arg->name_long[0] != '-';
+}
+
+static inline uint32_t
+arg_attr_has_val(const struct rte_argparse_arg *arg)
+{
+ return FIELD_GET(ARG_ATTR_HAS_VAL_MASK, arg->flags);
+}
+
+static inline uint32_t
+arg_attr_val_type(const struct rte_argparse_arg *arg)
+{
+ return FIELD_GET(ARG_ATTR_VAL_TYPE_MASK, arg->flags);
+}
+
+static inline bool
+arg_attr_flag_multi(const struct rte_argparse_arg *arg)
+{
+ return FIELD_GET(ARG_ATTR_SUPPORT_MULTI_MASK, arg->flags);
+}
+
+static inline uint32_t
+arg_attr_unused_bits(const struct rte_argparse_arg *arg)
+{
+#define USED_BIT_MASK (ARG_ATTR_HAS_VAL_MASK | ARG_ATTR_VAL_TYPE_MASK | \
+ ARG_ATTR_SUPPORT_MULTI_MASK)
+ return arg->flags & ~USED_BIT_MASK;
+}
+
+static int
+verify_arg_name(const struct rte_argparse_arg *arg)
+{
+ if (is_arg_optional(arg)) {
+ if (strlen(arg->name_long) <= 3) {
+ ARGPARSE_LOG(ERR, "optional long name %s too short!", arg->name_long);
+ return -EINVAL;
+ }
+ if (arg->name_long[1] != '-') {
+ ARGPARSE_LOG(ERR, "optional long name %s must only start with '--'",
+ arg->name_long);
+ return -EINVAL;
+ }
+ if (arg->name_long[2] == '-') {
+ ARGPARSE_LOG(ERR, "optional long name %s should not start with '---'",
+ arg->name_long);
+ return -EINVAL;
+ }
+ }
+
+ if (arg->name_short == NULL)
+ return 0;
+
+ if (!is_arg_optional(arg)) {
+ ARGPARSE_LOG(ERR, "short name %s corresponding long name must be optional!",
+ arg->name_short);
+ return -EINVAL;
+ }
+
+ if (strlen(arg->name_short) != 2 || arg->name_short[0] != '-' ||
+ arg->name_short[1] == '-') {
+ ARGPARSE_LOG(ERR, "short name %s must start with a hyphen (-) followed by an English letter",
+ arg->name_short);
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+static int
+verify_arg_help(const struct rte_argparse_arg *arg)
+{
+ if (arg->help == NULL) {
+ ARGPARSE_LOG(ERR, "argument %s must have help info!", arg->name_long);
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+static int
+verify_arg_has_val(const struct rte_argparse_arg *arg)
+{
+ uint32_t has_val = arg_attr_has_val(arg);
+
+ if (is_arg_positional(arg)) {
+ if (has_val == RTE_ARGPARSE_ARG_REQUIRED_VALUE)
+ return 0;
+ ARGPARSE_LOG(ERR, "argument %s is positional, should has zero or required-val!",
+ arg->name_long);
+ return -EINVAL;
+ }
+
+ if (has_val == 0) {
+ ARGPARSE_LOG(ERR, "argument %s is optional, has-val config wrong!",
+ arg->name_long);
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+static int
+verify_arg_saver(const struct rte_argparse *obj, uint32_t index)
+{
+ uint32_t cmp_max = FIELD_GET(ARG_ATTR_VAL_TYPE_MASK, RTE_ARGPARSE_ARG_VALUE_MAX);
+ const struct rte_argparse_arg *arg = &obj->args[index];
+ uint32_t val_type = arg_attr_val_type(arg);
+ uint32_t has_val = arg_attr_has_val(arg);
+
+ if (arg->val_saver == NULL) {
+ if (val_type != 0) {
+ ARGPARSE_LOG(ERR, "argument %s parse by callback, val-type must be zero!",
+ arg->name_long);
+ return -EINVAL;
+ }
+
+ if (obj->callback == NULL) {
+ ARGPARSE_LOG(ERR, "argument %s parse by callback, but callback is NULL!",
+ arg->name_long);
+ return -EINVAL;
+ }
+
+ return 0;
+ }
+
+ if (val_type == 0 || val_type >= cmp_max) {
+ ARGPARSE_LOG(ERR, "argument %s val-type config wrong!", arg->name_long);
+ return -EINVAL;
+ }
+
+ if (has_val == RTE_ARGPARSE_ARG_REQUIRED_VALUE && arg->val_set != NULL) {
+ ARGPARSE_LOG(ERR, "argument %s has required value, val-set should be NULL!",
+ arg->name_long);
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+static int
+verify_arg_flags(const struct rte_argparse *obj, uint32_t index)
+{
+ const struct rte_argparse_arg *arg = &obj->args[index];
+ uint32_t unused_bits = arg_attr_unused_bits(arg);
+
+ if (unused_bits != 0) {
+ ARGPARSE_LOG(ERR, "argument %s flags set wrong!", arg->name_long);
+ return -EINVAL;
+ }
+
+ if (!(arg->flags & RTE_ARGPARSE_ARG_SUPPORT_MULTI))
+ return 0;
+
+ if (is_arg_positional(arg)) {
+ ARGPARSE_LOG(ERR, "argument %s is positional, don't support multiple times!",
+ arg->name_long);
+ return -EINVAL;
+ }
+
+ if (arg->val_saver != NULL) {
+ ARGPARSE_LOG(ERR, "argument %s could occur multiple times, should use callback to parse!",
+ arg->name_long);
+ return -EINVAL;
+ }
+
+ if (obj->callback == NULL) {
+ ARGPARSE_LOG(ERR, "argument %s should use callback to parse, but callback is NULL!",
+ arg->name_long);
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+static int
+verify_arg_repeat(const struct rte_argparse *self, uint32_t index)
+{
+ const struct rte_argparse_arg *arg = &self->args[index];
+ uint32_t i;
+
+ for (i = 0; i < index; i++) {
+ if (!strcmp(arg->name_long, self->args[i].name_long)) {
+ ARGPARSE_LOG(ERR, "argument %s repeat!", arg->name_long);
+ return -EINVAL;
+ }
+ }
+
+ if (arg->name_short == NULL)
+ return 0;
+
+ for (i = 0; i < index; i++) {
+ if (self->args[i].name_short == NULL)
+ continue;
+ if (!strcmp(arg->name_short, self->args[i].name_short)) {
+ ARGPARSE_LOG(ERR, "argument %s repeat!", arg->name_short);
+ return -EINVAL;
+ }
+ }
+
+ return 0;
+}
+
+static int
+verify_argparse_arg(const struct rte_argparse *obj, uint32_t index)
+{
+ const struct rte_argparse_arg *arg = &obj->args[index];
+ int ret;
+
+ ret = verify_arg_name(arg);
+ if (ret != 0)
+ return ret;
+
+ ret = verify_arg_help(arg);
+ if (ret != 0)
+ return ret;
+
+ ret = verify_arg_has_val(arg);
+ if (ret != 0)
+ return ret;
+
+ ret = verify_arg_saver(obj, index);
+ if (ret != 0)
+ return ret;
+
+ ret = verify_arg_flags(obj, index);
+ if (ret != 0)
+ return ret;
+
+ ret = verify_arg_repeat(obj, index);
+ if (ret != 0)
+ return ret;
+
+ return 0;
+}
+
+static int
+verify_argparse(const struct rte_argparse *obj)
+{
+ uint32_t idx = 0;
+ int ret;
+
+ if (obj->prog_name == NULL) {
+ ARGPARSE_LOG(ERR, "program name is NULL!");
+ return -EINVAL;
+ }
+
+ if (obj->usage == NULL) {
+ ARGPARSE_LOG(ERR, "usage is NULL!");
+ return -EINVAL;
+ }
+
+ while (obj->args[idx].name_long != NULL) {
+ ret = verify_argparse_arg(obj, idx);
+ if (ret != 0)
+ return ret;
+ idx++;
+ }
+
+ return 0;
+}
+
int
rte_argparse_parse(struct rte_argparse *obj, int argc, char **argv)
{
- (void)obj;
+ int ret;
+
(void)argc;
(void)argv;
+
+ ret = verify_argparse(obj);
+ if (ret != 0)
+ goto error;
+
return 0;
+
+error:
+ if (obj->exit_on_error)
+ exit(ret);
+ return ret;
}
--
2.17.1