Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/134785/?format=api
http://patchwork.dpdk.org/api/patches/134785/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20231204075048.894-5-fengchengwen@huawei.com/", "project": { "id": 1, "url": "http://patchwork.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20231204075048.894-5-fengchengwen@huawei.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20231204075048.894-5-fengchengwen@huawei.com", "date": "2023-12-04T07:50:46", "name": "[RFC,v2,4/6] argparse: support parse parameters", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "fa0f39f29d06e4889c96d4e4a1e16a7ab8e02ec8", "submitter": { "id": 2146, "url": "http://patchwork.dpdk.org/api/people/2146/?format=api", "name": "fengchengwen", "email": "fengchengwen@huawei.com" }, "delegate": null, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20231204075048.894-5-fengchengwen@huawei.com/mbox/", "series": [ { "id": 30439, "url": "http://patchwork.dpdk.org/api/series/30439/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=30439", "date": "2023-12-04T07:50:42", "name": "add argparse library", "version": 2, "mbox": "http://patchwork.dpdk.org/series/30439/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/134785/comments/", "check": "pending", "checks": "http://patchwork.dpdk.org/api/patches/134785/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "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])\n\tby inbox.dpdk.org (Postfix) with ESMTP id D02C94365D;\n\tMon, 4 Dec 2023 08:54:27 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id F3B06406A2;\n\tMon, 4 Dec 2023 08:54:04 +0100 (CET)", "from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187])\n by mails.dpdk.org (Postfix) with ESMTP id 593FA40685\n for <dev@dpdk.org>; Mon, 4 Dec 2023 08:53:59 +0100 (CET)", "from dggpeml500024.china.huawei.com (unknown [172.30.72.55])\n by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4SkGB72CkLzvRXN;\n Mon, 4 Dec 2023 15:53:19 +0800 (CST)", "from localhost.localdomain (10.50.165.33) by\n dggpeml500024.china.huawei.com (7.185.36.10) with Microsoft SMTP Server\n (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id\n 15.1.2507.35; Mon, 4 Dec 2023 15:53:56 +0800" ], "From": "Chengwen Feng <fengchengwen@huawei.com>", "To": "<dev@dpdk.org>, <thomas@monjalon.net>, <ferruh.yigit@amd.com>,\n <stephen@networkplumber.org>", "CC": "<tangkunshan@huawei.com>", "Subject": "[RFC v2 4/6] argparse: support parse parameters", "Date": "Mon, 4 Dec 2023 07:50:46 +0000", "Message-ID": "<20231204075048.894-5-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>\n <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\n 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>,\n <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>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "This commit supports parse parameters which described in [argc, argv].\n\nSigned-off-by: Chengwen Feng <fengchengwen@huawei.com>\n---\n lib/argparse/rte_argparse.c | 295 +++++++++++++++++++++++++++++++++++-\n 1 file changed, 292 insertions(+), 3 deletions(-)", "diff": "diff --git a/lib/argparse/rte_argparse.c b/lib/argparse/rte_argparse.c\nindex eff504a778..5007992f0e 100644\n--- a/lib/argparse/rte_argparse.c\n+++ b/lib/argparse/rte_argparse.c\n@@ -301,18 +301,307 @@ verify_argparse(const struct rte_argparse *obj)\n \treturn 0;\n }\n \n+static uint32_t\n+calc_position_count(const struct rte_argparse *obj)\n+{\n+\tconst struct rte_argparse_arg *arg;\n+\tuint32_t count = 0;\n+\tuint32_t i;\n+\n+\tfor (i = 0; /* NULL */; i++) {\n+\t\targ = &obj->args[i];\n+\t\tif (obj->args[i].name_long == NULL)\n+\t\t\tbreak;\n+\t\tif (is_arg_positional(arg))\n+\t\t\tcount++;\n+\t}\n+\n+\treturn count;\n+}\n+\n+static struct rte_argparse_arg *\n+find_position_arg(struct rte_argparse *obj, uint32_t index)\n+{\n+\tstruct rte_argparse_arg *arg;\n+\tuint32_t count = 0;\n+\tuint32_t i;\n+\n+\tfor (i = 0; /* NULL */; i++) {\n+\t\targ = &obj->args[i];\n+\t\tif (arg->name_long == NULL)\n+\t\t\tbreak;\n+\t\tif (!is_arg_positional(arg))\n+\t\t\tcontinue;\n+\t\tcount++;\n+\t\tif (count == index)\n+\t\t\treturn arg;\n+\t}\n+\n+\treturn NULL;\n+}\n+\n+static bool\n+is_arg_match(struct rte_argparse_arg *arg, char *curr_argv, uint32_t len)\n+{\n+\tif (strlen(arg->name_long) == len && strncmp(arg->name_long, curr_argv, len) == 0)\n+\t\treturn true;\n+\n+\tif (arg->name_short == NULL)\n+\t\treturn false;\n+\n+\tif (strlen(arg->name_short) == len && strncmp(arg->name_short, curr_argv, len) == 0)\n+\t\treturn true;\n+\n+\treturn false;\n+}\n+\n+static struct rte_argparse_arg *\n+find_option_arg(struct rte_argparse *obj, char *curr_argv, char *has_equal)\n+{\n+\tuint32_t len = strlen(curr_argv) - (has_equal != NULL ? strlen(has_equal) : 0);\n+\tstruct rte_argparse_arg *arg;\n+\tuint32_t i;\n+\tbool match;\n+\n+\tfor (i = 0; /* nothing */; i++) {\n+\t\targ = &obj->args[i];\n+\t\tif (arg->name_long == NULL)\n+\t\t\tbreak;\n+\t\tmatch = is_arg_match(arg, curr_argv, len);\n+\t\tif (match)\n+\t\t\treturn arg;\n+\t}\n+\n+\treturn NULL;\n+}\n+\n+static int\n+parse_arg_int(struct rte_argparse_arg *arg, char *value)\n+{\n+\tchar *s = NULL;\n+\n+\tif (value == NULL) {\n+\t\t*(int *)arg->val_saver = (int)(intptr_t)arg->val_set;\n+\t\treturn 0;\n+\t}\n+\n+\terrno = 0;\n+\t*(int *)arg->val_saver = strtol(value, &s, 0);\n+\tif (errno == ERANGE) {\n+\t\tARGPARSE_LOG(ERR, \"argument %s numerical out of range!\", arg->name_long);\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tif (s[0] != '\\0') {\n+\t\tARGPARSE_LOG(ERR, \"argument %s expect an integer value!\", arg->name_long);\n+\t\treturn -EINVAL;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static int\n+parse_arg_autosave(struct rte_argparse_arg *arg, char *value)\n+{\n+\tstatic struct {\n+\t\tuint32_t val_type;\n+\t\tint (*f_parse_type)(struct rte_argparse_arg *arg, char *value);\n+\t} map[] = {\n+\t\t{ RTE_ARGPARSE_ARG_VALUE_INT, parse_arg_int },\n+\t\t{ 0, NULL },\n+\t};\n+\tint ret = -EINVAL;\n+\tuint32_t i;\n+\n+\tfor (i = 0; /* NULL */; i++) {\n+\t\tif (map[i].val_type == 0)\n+\t\t\tbreak;\n+\t\tif ((arg->flags & ARG_ATTR_VAL_TYPE_MASK) == map[i].val_type) {\n+\t\t\tret = map[i].f_parse_type(arg, value);\n+\t\t\tbreak;\n+\t\t}\n+\t}\n+\n+\treturn ret;\n+}\n+\n+static int\n+parse_arg_val(struct rte_argparse *obj, struct rte_argparse_arg *arg, char *value)\n+{\n+\tint ret;\n+\n+\tif (arg->val_saver == NULL)\n+\t\tret = obj->callback((uint32_t)(uintptr_t)arg->val_set, value, obj->opaque);\n+\telse\n+\t\tret = parse_arg_autosave(arg, value);\n+\tif (ret != 0) {\n+\t\tARGPARSE_LOG(ERR, \"argument %s parse value fail!\", arg->name_long);\n+\t\treturn ret;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static bool\n+is_help(char *curr_argv)\n+{\n+\treturn strcmp(curr_argv, \"-h\") == 0 || strcmp(curr_argv, \"--help\") == 0;\n+}\n+\n+static int\n+parse_args(struct rte_argparse *obj, int argc, char **argv, bool *show_help)\n+{\n+\tuint32_t position_count = calc_position_count(obj);\n+\tstruct rte_argparse_arg *arg;\n+\tuint32_t position_index = 0;\n+\tchar *curr_argv;\n+\tchar *has_equal;\n+\tchar *value;\n+\tint ret;\n+\tint i;\n+\n+\tfor (i = 1; i < argc; i++) {\n+\t\tcurr_argv = argv[i];\n+\t\tif (curr_argv[0] != '-') {\n+\t\t\t/* process positional parameters. */\n+\t\t\tposition_index++;\n+\t\t\tif (position_index > position_count) {\n+\t\t\t\tARGPARSE_LOG(ERR, \"too much positional argument %s!\", curr_argv);\n+\t\t\t\treturn -EINVAL;\n+\t\t\t}\n+\t\t\targ = find_position_arg(obj, position_index);\n+\t\t\tret = parse_arg_val(obj, arg, curr_argv);\n+\t\t\tif (ret != 0)\n+\t\t\t\treturn ret;\n+\t\t\tcontinue;\n+\t\t}\n+\n+\t\t/* process optional parameters. */\n+\t\tif (is_help(curr_argv)) {\n+\t\t\t*show_help = true;\n+\t\t\tcontinue;\n+\t\t}\n+\n+\t\thas_equal = strchr(curr_argv, '=');\n+\t\targ = find_option_arg(obj, curr_argv, has_equal);\n+\t\tif (arg == NULL) {\n+\t\t\tARGPARSE_LOG(ERR, \"unknown argument %s!\", curr_argv);\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n+\t\tif ((arg->flags & ARG_ATTR_FLAG_PARSED_MASK) && !arg_attr_flag_multi(arg)) {\n+\t\t\tARGPARSE_LOG(ERR, \"argument %s should not occur multiple!\",\n+\t\t\t\t arg->name_long);\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n+\t\tvalue = (has_equal != NULL ? has_equal + 1 : NULL);\n+\t\tif (arg_attr_has_val(arg) == RTE_ARGPARSE_ARG_NO_VALUE) {\n+\t\t\tif (value != NULL) {\n+\t\t\t\tARGPARSE_LOG(ERR, \"argument %s should not take value!\",\n+\t\t\t\t\t arg->name_long);\n+\t\t\t\treturn -EINVAL;\n+\t\t\t}\n+\t\t} else if (arg_attr_has_val(arg) == RTE_ARGPARSE_ARG_REQUIRED_VALUE) {\n+\t\t\tif (value == NULL) {\n+\t\t\t\tif (i >= argc - 1) {\n+\t\t\t\t\tARGPARSE_LOG(ERR, \"argument %s doesn't have value!\",\n+\t\t\t\t\t\t arg->name_long);\n+\t\t\t\t\treturn -EINVAL;\n+\t\t\t\t}\n+\t\t\t\t/* Set value and make i move next. */\n+\t\t\t\tvalue = argv[++i];\n+\t\t\t}\n+\t\t} else {\n+\t\t\t/* Do nothing, because it's optional value, only support arg=val or arg. */\n+\t\t}\n+\n+\t\tret = parse_arg_val(obj, arg, value);\n+\t\tif (ret != 0)\n+\t\t\treturn ret;\n+\n+\t\t/* This argument parsed success! then mark it parsed. */\n+\t\targ->flags |= ARG_ATTR_FLAG_PARSED_MASK;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static void\n+show_args_pos_help(struct rte_argparse *obj)\n+{\n+\tuint32_t position_count = calc_position_count(obj);\n+\tstruct rte_argparse_arg *arg;\n+\tuint32_t i;\n+\n+\tif (position_count == 0)\n+\t\treturn;\n+\n+\tprintf(\"\\npositional arguments:\\n\");\n+\tfor (i = 0; /* NULL */; i++) {\n+\t\targ = &obj->args[i];\n+\t\tif (arg->name_long == NULL)\n+\t\t\tbreak;\n+\t\tif (!is_arg_positional(arg))\n+\t\t\tcontinue;\n+\t\tprintf(\" %s: %s\\n\", arg->name_long, arg->help);\n+\t}\n+}\n+\n+static void\n+show_args_opt_help(struct rte_argparse *obj)\n+{\n+\tstruct rte_argparse_arg *arg;\n+\tuint32_t i;\n+\n+\tprintf(\"\\noptions:\\n\"\n+\t \" -h, --help: show this help message and exit.\\n\");\n+\tfor (i = 0; /* NULL */; i++) {\n+\t\targ = &obj->args[i];\n+\t\tif (arg->name_long == NULL)\n+\t\t\tbreak;\n+\t\tif (!is_arg_optional(arg))\n+\t\t\tcontinue;\n+\t\tif (arg->name_short != NULL)\n+\t\t\tprintf(\" %s, %s: %s\\n\", arg->name_short, arg->name_long, arg->help);\n+\t\telse\n+\t\t\tprintf(\" %s: %s\\n\", arg->name_long, arg->help);\n+\t}\n+}\n+\n+static void\n+show_args_help(struct rte_argparse *obj)\n+{\n+\tprintf(\"usage: %s %s\\n\", obj->prog_name, obj->usage);\n+\tif (obj->descriptor != NULL)\n+\t\tprintf(\"\\ndescriptor: %s\\n\", obj->descriptor);\n+\n+\tshow_args_pos_help(obj);\n+\tshow_args_opt_help(obj);\n+\n+\tif (obj->epilog != NULL)\n+\t\tprintf(\"\\n%s\\n\", obj->epilog);\n+}\n+\n int\n rte_argparse_parse(struct rte_argparse *obj, int argc, char **argv)\n {\n+\tbool show_help = false;\n \tint ret;\n \n-\t(void)argc;\n-\t(void)argv;\n-\n \tret = verify_argparse(obj);\n \tif (ret != 0)\n \t\tgoto error;\n \n+\tret = parse_args(obj, argc, argv, &show_help);\n+\tif (ret != 0)\n+\t\tgoto error;\n+\n+\tif (show_help) {\n+\t\tshow_args_help(obj);\n+\t\texit(0);\n+\t}\n+\n \treturn 0;\n \n error:\n", "prefixes": [ "RFC", "v2", "4/6" ] }{ "id": 134785, "url": "