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: [PATCH v2 6/8] argparse: support parse unsigned base type
Date: Thu, 25 Jan 2024 11:52:27 +0000 [thread overview]
Message-ID: <20240125115229.41402-7-fengchengwen@huawei.com> (raw)
In-Reply-To: <20240125115229.41402-1-fengchengwen@huawei.com>
This commit supports parsing unsigned base type (u8/u16/u32/u64).
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
app/test/test_argparse.c | 59 ++++++++++++++++--
lib/argparse/rte_argparse.c | 116 ++++++++++++++++++++++++++++++++++++
lib/argparse/rte_argparse.h | 10 +++-
3 files changed, 179 insertions(+), 6 deletions(-)
diff --git a/app/test/test_argparse.c b/app/test/test_argparse.c
index 98c6cd6b80..470c1bd2b6 100644
--- a/app/test/test_argparse.c
+++ b/app/test/test_argparse.c
@@ -733,19 +733,68 @@ static int
test_argparse_parse_type(void)
{
char *str_erange = test_strdup("9999999999999999999999999999999999");
+ char *str_erange_u32 = test_strdup("4294967296");
+ char *str_erange_u16 = test_strdup("65536");
+ char *str_erange_u8 = test_strdup("256");
char *str_invalid = test_strdup("1a");
char *str_ok = test_strdup("123");
- int value;
+ uint16_t val_u16;
+ uint32_t val_u32;
+ uint64_t val_u64;
+ uint8_t val_u8;
+ int val_int;
int ret;
/* test for int parsing */
- ret = rte_argparse_parse_type(str_erange, RTE_ARGPARSE_ARG_VALUE_INT, &value);
+ ret = rte_argparse_parse_type(str_erange, RTE_ARGPARSE_ARG_VALUE_INT, &val_int);
TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
- ret = rte_argparse_parse_type(str_invalid, RTE_ARGPARSE_ARG_VALUE_INT, &value);
+ ret = rte_argparse_parse_type(str_invalid, RTE_ARGPARSE_ARG_VALUE_INT, &val_int);
TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
- ret = rte_argparse_parse_type(str_ok, RTE_ARGPARSE_ARG_VALUE_INT, &value);
+ ret = rte_argparse_parse_type(str_ok, RTE_ARGPARSE_ARG_VALUE_INT, &val_int);
TEST_ASSERT(ret == 0, "Argparse parse type expect failed!");
- TEST_ASSERT(value == 123, "Argparse parse type expect failed!");
+ TEST_ASSERT(val_int == 123, "Argparse parse type expect failed!");
+
+ /* test for u8 parsing */
+ ret = rte_argparse_parse_type(str_erange, RTE_ARGPARSE_ARG_VALUE_U8, &val_u8);
+ TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+ ret = rte_argparse_parse_type(str_erange_u8, RTE_ARGPARSE_ARG_VALUE_U8, &val_u8);
+ TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+ ret = rte_argparse_parse_type(str_invalid, RTE_ARGPARSE_ARG_VALUE_U8, &val_u8);
+ TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+ ret = rte_argparse_parse_type(str_ok, RTE_ARGPARSE_ARG_VALUE_U8, &val_u8);
+ TEST_ASSERT(ret == 0, "Argparse parse type expect failed!");
+ TEST_ASSERT(val_u8 == 123, "Argparse parse type expect failed!");
+
+ /* test for u16 parsing */
+ ret = rte_argparse_parse_type(str_erange, RTE_ARGPARSE_ARG_VALUE_U16, &val_u16);
+ TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+ ret = rte_argparse_parse_type(str_erange_u16, RTE_ARGPARSE_ARG_VALUE_U16, &val_u16);
+ TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+ ret = rte_argparse_parse_type(str_invalid, RTE_ARGPARSE_ARG_VALUE_U16, &val_u16);
+ TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+ ret = rte_argparse_parse_type(str_ok, RTE_ARGPARSE_ARG_VALUE_U16, &val_u16);
+ TEST_ASSERT(ret == 0, "Argparse parse type expect failed!");
+ TEST_ASSERT(val_u16 == 123, "Argparse parse type expect failed!");
+
+ /* test for u32 parsing */
+ ret = rte_argparse_parse_type(str_erange, RTE_ARGPARSE_ARG_VALUE_U32, &val_u32);
+ TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+ ret = rte_argparse_parse_type(str_erange_u32, RTE_ARGPARSE_ARG_VALUE_U32, &val_u32);
+ TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+ ret = rte_argparse_parse_type(str_invalid, RTE_ARGPARSE_ARG_VALUE_U32, &val_u32);
+ TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+ ret = rte_argparse_parse_type(str_ok, RTE_ARGPARSE_ARG_VALUE_U32, &val_u32);
+ TEST_ASSERT(ret == 0, "Argparse parse type expect failed!");
+ TEST_ASSERT(val_u32 == 123, "Argparse parse type expect failed!");
+
+ /* test for u64 parsing */
+ ret = rte_argparse_parse_type(str_erange, RTE_ARGPARSE_ARG_VALUE_U64, &val_u64);
+ TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+ ret = rte_argparse_parse_type(str_invalid, RTE_ARGPARSE_ARG_VALUE_U64, &val_u64);
+ TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+ ret = rte_argparse_parse_type(str_ok, RTE_ARGPARSE_ARG_VALUE_U64, &val_u64);
+ TEST_ASSERT(ret == 0, "Argparse parse type expect failed!");
+ TEST_ASSERT(val_u64 == 123, "Argparse parse type expect failed!");
return 0;
}
diff --git a/lib/argparse/rte_argparse.c b/lib/argparse/rte_argparse.c
index f33bd470ba..3cb1557b85 100644
--- a/lib/argparse/rte_argparse.c
+++ b/lib/argparse/rte_argparse.c
@@ -397,6 +397,118 @@ parse_arg_int(struct rte_argparse_arg *arg, const char *value)
return 0;
}
+static int
+parse_arg_u8(struct rte_argparse_arg *arg, const char *value)
+{
+ unsigned long val;
+ char *s = NULL;
+
+ if (value == NULL) {
+ *(uint8_t *)arg->val_saver = (uint8_t)(intptr_t)arg->val_set;
+ return 0;
+ }
+
+ errno = 0;
+ val = strtoul(value, &s, 0);
+ if (errno == ERANGE || val > UINT8_MAX) {
+ ARGPARSE_LOG(ERR, "argument %s numerical out of range!", arg->name_long);
+ return -EINVAL;
+ }
+
+ if (s[0] != '\0') {
+ ARGPARSE_LOG(ERR, "argument %s expect an uint8 value!", arg->name_long);
+ return -EINVAL;
+ }
+
+ *(uint8_t *)arg->val_saver = val;
+
+ return 0;
+}
+
+static int
+parse_arg_u16(struct rte_argparse_arg *arg, const char *value)
+{
+ unsigned long val;
+ char *s = NULL;
+
+ if (value == NULL) {
+ *(uint16_t *)arg->val_saver = (uint16_t)(intptr_t)arg->val_set;
+ return 0;
+ }
+
+ errno = 0;
+ val = strtoul(value, &s, 0);
+ if (errno == ERANGE || val > UINT16_MAX) {
+ ARGPARSE_LOG(ERR, "argument %s numerical out of range!", arg->name_long);
+ return -EINVAL;
+ }
+
+ if (s[0] != '\0') {
+ ARGPARSE_LOG(ERR, "argument %s expect an uint16 value!", arg->name_long);
+ return -EINVAL;
+ }
+
+ *(uint16_t *)arg->val_saver = val;
+
+ return 0;
+}
+
+static int
+parse_arg_u32(struct rte_argparse_arg *arg, const char *value)
+{
+ unsigned long val;
+ char *s = NULL;
+
+ if (value == NULL) {
+ *(uint32_t *)arg->val_saver = (uint32_t)(intptr_t)arg->val_set;
+ return 0;
+ }
+
+ errno = 0;
+ val = strtoul(value, &s, 0);
+ if (errno == ERANGE || val > UINT32_MAX) {
+ ARGPARSE_LOG(ERR, "argument %s numerical out of range!", arg->name_long);
+ return -EINVAL;
+ }
+
+ if (s[0] != '\0') {
+ ARGPARSE_LOG(ERR, "argument %s expect an uint32 value!", arg->name_long);
+ return -EINVAL;
+ }
+
+ *(uint32_t *)arg->val_saver = val;
+
+ return 0;
+}
+
+static int
+parse_arg_u64(struct rte_argparse_arg *arg, const char *value)
+{
+ unsigned long val;
+ char *s = NULL;
+
+ if (value == NULL) {
+ *(uint64_t *)arg->val_saver = (uint64_t)(intptr_t)arg->val_set;
+ return 0;
+ }
+
+ errno = 0;
+ val = strtoull(value, &s, 0);
+ if (errno == ERANGE) {
+ ARGPARSE_LOG(ERR, "argument %s numerical out of range!", arg->name_long);
+ return -EINVAL;
+ }
+
+ if (s[0] != '\0') {
+ ARGPARSE_LOG(ERR, "argument %s expect an uint64 value!", arg->name_long);
+ return -EINVAL;
+ }
+
+ *(uint64_t *)arg->val_saver = val;
+
+ return 0;
+}
+
static int
parse_arg_autosave(struct rte_argparse_arg *arg, const char *value)
{
@@ -406,6 +518,10 @@ parse_arg_autosave(struct rte_argparse_arg *arg, const char *value)
/* Sort by RTE_ARGPARSE_ARG_VALUE_XXX. */
{ NULL },
{ parse_arg_int },
+ { parse_arg_u8 },
+ { parse_arg_u16 },
+ { parse_arg_u32 },
+ { parse_arg_u64 },
};
uint32_t index = arg_attr_val_type(arg);
int ret = -EINVAL;
diff --git a/lib/argparse/rte_argparse.h b/lib/argparse/rte_argparse.h
index a795263a81..7f785f017e 100644
--- a/lib/argparse/rte_argparse.h
+++ b/lib/argparse/rte_argparse.h
@@ -59,8 +59,16 @@ enum rte_argparse_flag {
/** The argument's value is int type. */
RTE_ARGPARSE_ARG_VALUE_INT = RTE_SHIFT_VAL64(1, 2),
+ /** The argument's value is uint8 type. */
+ RTE_ARGPARSE_ARG_VALUE_U8 = RTE_SHIFT_VAL64(2, 2),
+ /** The argument's value is uint16 type. */
+ RTE_ARGPARSE_ARG_VALUE_U16 = RTE_SHIFT_VAL64(3, 2),
+ /** The argument's value is uint32 type. */
+ RTE_ARGPARSE_ARG_VALUE_U32 = RTE_SHIFT_VAL64(4, 2),
+ /** The argument's value is uint64 type. */
+ RTE_ARGPARSE_ARG_VALUE_U64 = RTE_SHIFT_VAL64(5, 2),
/** Max value type. */
- RTE_ARGPARSE_ARG_VALUE_MAX = RTE_SHIFT_VAL64(2, 2),
+ RTE_ARGPARSE_ARG_VALUE_MAX = RTE_SHIFT_VAL64(6, 2),
/**
--
2.17.1
next prev parent reply other threads:[~2024-01-25 11:58 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-21 12:26 [24.03 RFC] argparse: add argparse library Chengwen Feng
2023-11-21 16:36 ` Stephen Hemminger
2023-11-22 6:28 ` fengchengwen
2023-12-04 7:50 ` [RFC v2 0/6] " Chengwen Feng
2023-12-04 7:50 ` [RFC v2 1/6] argparse: " Chengwen Feng
2023-12-04 17:10 ` Stephen Hemminger
2023-12-05 1:22 ` fengchengwen
2023-12-04 7:50 ` [RFC v2 2/6] argparse: support verify argument config Chengwen Feng
2023-12-04 7:50 ` [RFC v2 3/6] test/argparse: add verify argument config test Chengwen Feng
2023-12-04 7:50 ` [RFC v2 4/6] argparse: support parse parameters Chengwen Feng
2023-12-04 7:50 ` [RFC v2 5/6] test/argparse: add parse parameters test Chengwen Feng
2023-12-04 7:50 ` [RFC v2 6/6] examples/dma: replace getopt with argparse Chengwen Feng
2023-12-11 9:50 ` [RFC v3 00/12] add argparse library Chengwen Feng
2023-12-11 9:50 ` [RFC v3 01/12] eal: introduce more macro for bit definition Chengwen Feng
2023-12-11 9:51 ` [RFC v3 02/12] argparse: add argparse library Chengwen Feng
2023-12-11 9:51 ` [RFC v3 03/12] argparse: support verify argument config Chengwen Feng
2023-12-11 9:51 ` [RFC v3 04/12] test/argparse: add verify argument config test Chengwen Feng
2023-12-11 9:51 ` [RFC v3 05/12] argparse: support parse parameters Chengwen Feng
2023-12-11 9:51 ` [RFC v3 06/12] test/argparse: add parse parameters test Chengwen Feng
2023-12-11 9:51 ` [RFC v3 07/12] argparse: provide parsing known type API Chengwen Feng
2023-12-11 9:51 ` [RFC v3 08/12] test/argparse: add parse type test Chengwen Feng
2023-12-11 9:51 ` [RFC v3 09/12] argparse: support parse unsigned base type Chengwen Feng
2023-12-11 9:51 ` [RFC v3 10/12] test/argparse: add parse unsigned base type test Chengwen Feng
2023-12-11 9:51 ` [RFC v3 11/12] argparse: pretty help info Chengwen Feng
2023-12-11 9:51 ` [RFC v3 12/12] examples/dma: replace getopt with argparse Chengwen Feng
2024-01-22 3:57 ` [PATCH 00/12] add argparse library Chengwen Feng
2024-01-22 3:57 ` [PATCH 01/12] eal: introduce more macro for bit definition Chengwen Feng
2024-01-24 13:00 ` Thomas Monjalon
2024-01-22 3:57 ` [PATCH 02/12] argparse: add argparse library Chengwen Feng
2024-01-22 4:54 ` Stephen Hemminger
2024-01-22 6:06 ` fengchengwen
2024-01-24 13:24 ` Thomas Monjalon
2024-01-25 3:44 ` fengchengwen
2024-01-22 3:57 ` [PATCH 03/12] argparse: support verify argument config Chengwen Feng
2024-01-22 3:57 ` [PATCH 04/12] test/argparse: add verify argument config test Chengwen Feng
2024-01-24 13:01 ` Thomas Monjalon
2024-01-22 3:57 ` [PATCH 05/12] argparse: support parse parameters Chengwen Feng
2024-01-22 3:57 ` [PATCH 06/12] test/argparse: add parse parameters test Chengwen Feng
2024-01-22 3:57 ` [PATCH 07/12] argparse: provide parsing known type API Chengwen Feng
2024-01-22 3:57 ` [PATCH 08/12] test/argparse: add parse type test Chengwen Feng
2024-01-22 3:57 ` [PATCH 09/12] argparse: support parse unsigned base type Chengwen Feng
2024-01-22 3:58 ` [PATCH 10/12] test/argparse: add parse unsigned base type test Chengwen Feng
2024-01-22 3:58 ` [PATCH 11/12] argparse: pretty help info Chengwen Feng
2024-01-22 3:58 ` [PATCH 12/12] examples/dma: replace getopt with argparse Chengwen Feng
2024-01-24 13:26 ` Thomas Monjalon
2024-01-24 15:54 ` [24.03 RFC] argparse: add argparse library Stephen Hemminger
2024-01-25 6:31 ` fengchengwen
2024-01-26 16:38 ` Stephen Hemminger
2024-01-25 11:52 ` [PATCH v2 0/8] " Chengwen Feng
2024-01-25 11:52 ` [PATCH v2 1/8] eal: introduce more macro for bit definition Chengwen Feng
2024-01-25 11:52 ` [PATCH v2 2/8] argparse: add argparse library Chengwen Feng
2024-01-25 11:52 ` [PATCH v2 3/8] argparse: support verify argument config Chengwen Feng
2024-01-25 11:52 ` [PATCH v2 4/8] argparse: support parse parameters Chengwen Feng
2024-01-25 11:52 ` [PATCH v2 5/8] argparse: provide parsing known type API Chengwen Feng
2024-01-25 11:52 ` Chengwen Feng [this message]
2024-01-25 11:52 ` [PATCH v2 7/8] argparse: pretty help info Chengwen Feng
2024-01-25 11:52 ` [PATCH v2 8/8] examples/dma: replace getopt with argparse Chengwen Feng
2024-01-26 6:10 ` [PATCH v3 0/8] add argparse library Chengwen Feng
2024-01-26 6:10 ` [PATCH v3 1/8] eal: introduce more macro for bit definition Chengwen Feng
2024-01-26 6:10 ` [PATCH v3 2/8] argparse: add argparse library Chengwen Feng
2024-01-26 6:10 ` [PATCH v3 3/8] argparse: support verify argument config Chengwen Feng
2024-01-26 6:10 ` [PATCH v3 4/8] argparse: support parse parameters Chengwen Feng
2024-01-26 6:10 ` [PATCH v3 5/8] argparse: provide parsing known type API Chengwen Feng
2024-01-26 6:10 ` [PATCH v3 6/8] argparse: support parse unsigned base type Chengwen Feng
2024-01-26 6:10 ` [PATCH v3 7/8] argparse: pretty help info Chengwen Feng
2024-01-26 6:10 ` [PATCH v3 8/8] examples/dma: replace getopt with argparse Chengwen Feng
2024-02-14 16:53 ` [PATCH v3 0/8] add argparse library Thomas Monjalon
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=20240125115229.41402-7-fengchengwen@huawei.com \
--to=fengchengwen@huawei.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@amd.com \
--cc=stephen@networkplumber.org \
--cc=tangkunshan@huawei.com \
--cc=thomas@monjalon.net \
/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).