Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/131574/?format=api
{ "id": 131574, "url": "https://patches.dpdk.org/api/patches/131574/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20230918130352.379478-6-bruce.richardson@intel.com/", "project": { "id": 1, "url": "https://patches.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": "<20230918130352.379478-6-bruce.richardson@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230918130352.379478-6-bruce.richardson@intel.com", "date": "2023-09-18T13:03:52", "name": "[RFC,v2,5/5] examples/bond: auto-generate cmdline boilerplate", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "6086a32ccaee33c959659e4697c3a7d4a99c46ed", "submitter": { "id": 20, "url": "https://patches.dpdk.org/api/people/20/?format=api", "name": "Bruce Richardson", "email": "bruce.richardson@intel.com" }, "delegate": { "id": 1, "url": "https://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20230918130352.379478-6-bruce.richardson@intel.com/mbox/", "series": [ { "id": 29536, "url": "https://patches.dpdk.org/api/series/29536/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=29536", "date": "2023-09-18T13:03:47", "name": "use script to simplify use of cmdline lib", "version": 2, "mbox": "https://patches.dpdk.org/series/29536/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/131574/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/131574/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 D49CC425D1;\n\tMon, 18 Sep 2023 15:04:48 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 32EA140DC9;\n\tMon, 18 Sep 2023 15:04:11 +0200 (CEST)", "from mgamail.intel.com (mgamail.intel.com [134.134.136.20])\n by mails.dpdk.org (Postfix) with ESMTP id A1E7140A8A\n for <dev@dpdk.org>; Mon, 18 Sep 2023 15:04:09 +0200 (CEST)", "from orsmga007.jf.intel.com ([10.7.209.58])\n by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 18 Sep 2023 06:04:09 -0700", "from silpixa00401385.ir.intel.com ([10.237.214.14])\n by orsmga007.jf.intel.com with ESMTP; 18 Sep 2023 06:04:07 -0700" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1695042249; x=1726578249;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=3emelectBIpbDMHMaNoUGWpCzzKxcxS4Kf7pjz1erAU=;\n b=VZtJnhjLbVMRc7pKRVxFQWQwRZmBMCLpoT3S6l06ex1eG46AHit3Wi/5\n 7q1mXvDJUHfu2e8XkiBbAPUttTQmm8ILMb6mYuvLnVef+MwAwrYuqdOX6\n ulKtsbBQ3I7SqolIihmI8kvWmvI9fsO9H4uBKcXe4Xthela61jCtOjQaE\n QKVR6MthsyBS+9oFZrBYVyAsUI/cwfsFgX4LJc0lhlJRyeWoiHBgbFD44\n /XRaOjwMYUeYhsZpd94WQKFjOkOkxJcnBT5hsh/pX9k3KWawrAI7l1Ce7\n 0/Q4BlIpcVGeGqFeE45SU1QAEiUvQPwL7YjfjTbCWzP8XqZm8KFd55aCg w==;", "X-IronPort-AV": [ "E=McAfee;i=\"6600,9927,10837\"; a=\"369969408\"", "E=Sophos;i=\"6.02,156,1688454000\"; d=\"scan'208\";a=\"369969408\"", "E=McAfee;i=\"6600,9927,10837\"; a=\"739130645\"", "E=Sophos;i=\"6.02,156,1688454000\"; d=\"scan'208\";a=\"739130645\"" ], "X-ExtLoop1": "1", "From": "Bruce Richardson <bruce.richardson@intel.com>", "To": "dev@dpdk.org", "Cc": "Olivier Matz <olivier.matz@6wind.com>,\n Bruce Richardson <bruce.richardson@intel.com>", "Subject": "[RFC PATCH v2 5/5] examples/bond: auto-generate cmdline boilerplate", "Date": "Mon, 18 Sep 2023 14:03:52 +0100", "Message-Id": "<20230918130352.379478-6-bruce.richardson@intel.com>", "X-Mailer": "git-send-email 2.39.2", "In-Reply-To": "<20230918130352.379478-1-bruce.richardson@intel.com>", "References": "<20230802170052.955323-1-bruce.richardson@intel.com>\n <20230918130352.379478-1-bruce.richardson@intel.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "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": "Use the dpdk-cmdline-gen script to autogenerate all the boilerplate\nstructs and defines for the commandline part of the app.\n\nSigned-off-by: Bruce Richardson <bruce.richardson@intel.com>\n---\n examples/bond/Makefile | 10 ++-\n examples/bond/commands.list | 6 ++\n examples/bond/main.c | 161 ++++--------------------------------\n examples/bond/main.h | 10 ---\n examples/bond/meson.build | 8 ++\n 5 files changed, 36 insertions(+), 159 deletions(-)\n create mode 100644 examples/bond/commands.list\n delete mode 100644 examples/bond/main.h", "diff": "diff --git a/examples/bond/Makefile b/examples/bond/Makefile\nindex ad711a5bee..0a559ad82b 100644\n--- a/examples/bond/Makefile\n+++ b/examples/bond/Makefile\n@@ -6,6 +6,7 @@ APP = bond_app\n \n # all source are stored in SRCS-y\n SRCS-y := main.c\n+SRC-DEPS := build/commands.h\n \n PKGCONF ?= pkg-config\n \n@@ -24,10 +25,13 @@ static: build/$(APP)-static\n LDFLAGS += -lrte_net_bond\n \n PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)\n-CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)\n+CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) -I build/\n LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)\n LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)\n \n+build/commands.h: commands.list Makefile\n+\tdpdk-cmdline-gen.py -o $@ --context-name=main_ctx $<\n+\n ifeq ($(MAKECMDGOALS),static)\n # check for broken pkg-config\n ifeq ($(shell echo $(LDFLAGS_STATIC) | grep 'whole-archive.*l:lib.*no-whole-archive'),)\n@@ -38,10 +42,10 @@ endif\n \n CFLAGS += -DALLOW_EXPERIMENTAL_API\n \n-build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build\n+build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build $(SRC-DEPS)\n \t$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)\n \n-build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build\n+build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build $(SRC-DEPS)\n \t$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC)\n \n build:\ndiff --git a/examples/bond/commands.list b/examples/bond/commands.list\nnew file mode 100644\nindex 0000000000..08e1a3fea8\n--- /dev/null\n+++ b/examples/bond/commands.list\n@@ -0,0 +1,6 @@\n+send <IP>ip\n+start\n+stop\n+show\n+help\n+quit\n\\ No newline at end of file\ndiff --git a/examples/bond/main.c b/examples/bond/main.c\nindex 9b076bb39f..e893005701 100644\n--- a/examples/bond/main.c\n+++ b/examples/bond/main.c\n@@ -45,16 +45,8 @@\n #include <rte_cpuflags.h>\n #include <rte_eth_bond.h>\n \n-#include <cmdline_rdline.h>\n-#include <cmdline_parse.h>\n-#include <cmdline_parse_num.h>\n-#include <cmdline_parse_string.h>\n-#include <cmdline_parse_ipaddr.h>\n-#include <cmdline_parse_etheraddr.h>\n #include <cmdline_socket.h>\n-#include <cmdline.h>\n-\n-#include \"main.h\"\n+#include \"commands.h\"\n \n #define RTE_LOGTYPE_DCB RTE_LOGTYPE_USER1\n \n@@ -462,11 +454,7 @@ static int lcore_main(__rte_unused void *arg1)\n \treturn 0;\n }\n \n-struct cmd_obj_send_result {\n-\tcmdline_fixed_string_t action;\n-\tcmdline_ipaddr_t ip;\n-};\n-static inline void get_string(struct cmd_obj_send_result *res, char *buf, uint8_t size)\n+static inline void get_string(struct cmd_send_result *res, char *buf, uint8_t size)\n {\n \tsnprintf(buf, size, NIPQUAD_FMT,\n \t\t((unsigned)((unsigned char *)&(res->ip.addr.ipv4))[0]),\n@@ -475,12 +463,11 @@ static inline void get_string(struct cmd_obj_send_result *res, char *buf, uint8_\n \t\t((unsigned)((unsigned char *)&(res->ip.addr.ipv4))[3])\n \t\t);\n }\n-static void cmd_obj_send_parsed(void *parsed_result,\n-\t\t__rte_unused struct cmdline *cl,\n-\t\t\t __rte_unused void *data)\n+void\n+cmd_send_parsed(void *parsed_result, __rte_unused struct cmdline *cl, __rte_unused void *data)\n {\n \n-\tstruct cmd_obj_send_result *res = parsed_result;\n+\tstruct cmd_send_result *res = parsed_result;\n \tchar ip_str[INET6_ADDRSTRLEN];\n \n \tstruct rte_ether_addr bond_mac_addr;\n@@ -544,29 +531,8 @@ static void cmd_obj_send_parsed(void *parsed_result,\n \tcmdline_printf(cl, \"\\n\");\n }\n \n-cmdline_parse_token_string_t cmd_obj_action_send =\n-\tTOKEN_STRING_INITIALIZER(struct cmd_obj_send_result, action, \"send\");\n-cmdline_parse_token_ipaddr_t cmd_obj_ip =\n-\tTOKEN_IPV4_INITIALIZER(struct cmd_obj_send_result, ip);\n-\n-cmdline_parse_inst_t cmd_obj_send = {\n-\t.f = cmd_obj_send_parsed, /* function to call */\n-\t.data = NULL, /* 2nd arg of func */\n-\t.help_str = \"send client_ip\",\n-\t.tokens = { /* token list, NULL terminated */\n-\t\t(void *)&cmd_obj_action_send,\n-\t\t(void *)&cmd_obj_ip,\n-\t\tNULL,\n-\t},\n-};\n-\n-struct cmd_start_result {\n-\tcmdline_fixed_string_t start;\n-};\n-\n-static void cmd_start_parsed(__rte_unused void *parsed_result,\n-\t\t\t struct cmdline *cl,\n-\t\t\t __rte_unused void *data)\n+void\n+cmd_start_parsed(__rte_unused void *parsed_result, struct cmdline *cl, __rte_unused void *data)\n {\n \tint worker_core_id = rte_lcore_id();\n \n@@ -605,26 +571,8 @@ static void cmd_start_parsed(__rte_unused void *parsed_result,\n \t\t);\n }\n \n-cmdline_parse_token_string_t cmd_start_start =\n-\tTOKEN_STRING_INITIALIZER(struct cmd_start_result, start, \"start\");\n-\n-cmdline_parse_inst_t cmd_start = {\n-\t.f = cmd_start_parsed, /* function to call */\n-\t.data = NULL, /* 2nd arg of func */\n-\t.help_str = \"starts listening if not started at startup\",\n-\t.tokens = { /* token list, NULL terminated */\n-\t\t(void *)&cmd_start_start,\n-\t\tNULL,\n-\t},\n-};\n-\n-struct cmd_help_result {\n-\tcmdline_fixed_string_t help;\n-};\n-\n-static void cmd_help_parsed(__rte_unused void *parsed_result,\n-\t\t\t struct cmdline *cl,\n-\t\t\t __rte_unused void *data)\n+void\n+cmd_help_parsed(__rte_unused void *parsed_result, struct cmdline *cl, __rte_unused void *data)\n {\n \tcmdline_printf(cl,\n \t\t\t\"ALB - link bonding mode 6 example\\n\"\n@@ -637,26 +585,8 @@ static void cmd_help_parsed(__rte_unused void *parsed_result,\n \t\t );\n }\n \n-cmdline_parse_token_string_t cmd_help_help =\n-\tTOKEN_STRING_INITIALIZER(struct cmd_help_result, help, \"help\");\n-\n-cmdline_parse_inst_t cmd_help = {\n-\t.f = cmd_help_parsed, /* function to call */\n-\t.data = NULL, /* 2nd arg of func */\n-\t.help_str = \"show help\",\n-\t.tokens = { /* token list, NULL terminated */\n-\t\t(void *)&cmd_help_help,\n-\t\tNULL,\n-\t},\n-};\n-\n-struct cmd_stop_result {\n-\tcmdline_fixed_string_t stop;\n-};\n-\n-static void cmd_stop_parsed(__rte_unused void *parsed_result,\n-\t\t\t struct cmdline *cl,\n-\t\t\t __rte_unused void *data)\n+void\n+cmd_stop_parsed(__rte_unused void *parsed_result, struct cmdline *cl, __rte_unused void *data)\n {\n \trte_spinlock_lock(&global_flag_stru_p->lock);\n \tif (global_flag_stru_p->LcoreMainIsRunning == 0)\t{\n@@ -678,26 +608,8 @@ static void cmd_stop_parsed(__rte_unused void *parsed_result,\n \trte_spinlock_unlock(&global_flag_stru_p->lock);\n }\n \n-cmdline_parse_token_string_t cmd_stop_stop =\n-\tTOKEN_STRING_INITIALIZER(struct cmd_stop_result, stop, \"stop\");\n-\n-cmdline_parse_inst_t cmd_stop = {\n-\t.f = cmd_stop_parsed, /* function to call */\n-\t.data = NULL, /* 2nd arg of func */\n-\t.help_str = \"this command do not handle any arguments\",\n-\t.tokens = { /* token list, NULL terminated */\n-\t\t(void *)&cmd_stop_stop,\n-\t\tNULL,\n-\t},\n-};\n-\n-struct cmd_quit_result {\n-\tcmdline_fixed_string_t quit;\n-};\n-\n-static void cmd_quit_parsed(__rte_unused void *parsed_result,\n-\t\t\t struct cmdline *cl,\n-\t\t\t __rte_unused void *data)\n+void\n+cmd_quit_parsed(__rte_unused void *parsed_result, struct cmdline *cl, __rte_unused void *data)\n {\n \trte_spinlock_lock(&global_flag_stru_p->lock);\n \tif (global_flag_stru_p->LcoreMainIsRunning == 0)\t{\n@@ -721,26 +633,8 @@ static void cmd_quit_parsed(__rte_unused void *parsed_result,\n \tcmdline_quit(cl);\n }\n \n-cmdline_parse_token_string_t cmd_quit_quit =\n-\tTOKEN_STRING_INITIALIZER(struct cmd_quit_result, quit, \"quit\");\n-\n-cmdline_parse_inst_t cmd_quit = {\n-\t.f = cmd_quit_parsed, /* function to call */\n-\t.data = NULL, /* 2nd arg of func */\n-\t.help_str = \"this command do not handle any arguments\",\n-\t.tokens = { /* token list, NULL terminated */\n-\t\t(void *)&cmd_quit_quit,\n-\t\tNULL,\n-\t},\n-};\n-\n-struct cmd_show_result {\n-\tcmdline_fixed_string_t show;\n-};\n-\n-static void cmd_show_parsed(__rte_unused void *parsed_result,\n-\t\t\t struct cmdline *cl,\n-\t\t\t __rte_unused void *data)\n+void\n+cmd_show_parsed(__rte_unused void *parsed_result, struct cmdline *cl, __rte_unused void *data)\n {\n \tuint16_t slaves[16] = {0};\n \tuint8_t len = 16;\n@@ -772,31 +666,6 @@ static void cmd_show_parsed(__rte_unused void *parsed_result,\n \trte_spinlock_unlock(&global_flag_stru_p->lock);\n }\n \n-cmdline_parse_token_string_t cmd_show_show =\n-\tTOKEN_STRING_INITIALIZER(struct cmd_show_result, show, \"show\");\n-\n-cmdline_parse_inst_t cmd_show = {\n-\t.f = cmd_show_parsed, /* function to call */\n-\t.data = NULL, /* 2nd arg of func */\n-\t.help_str = \"this command do not handle any arguments\",\n-\t.tokens = { /* token list, NULL terminated */\n-\t\t(void *)&cmd_show_show,\n-\t\tNULL,\n-\t},\n-};\n-\n-/****** CONTEXT (list of instruction) */\n-\n-cmdline_parse_ctx_t main_ctx[] = {\n-\t(cmdline_parse_inst_t *)&cmd_start,\n-\t(cmdline_parse_inst_t *)&cmd_obj_send,\n-\t(cmdline_parse_inst_t *)&cmd_stop,\n-\t(cmdline_parse_inst_t *)&cmd_show,\n-\t(cmdline_parse_inst_t *)&cmd_quit,\n-\t(cmdline_parse_inst_t *)&cmd_help,\n-\tNULL,\n-};\n-\n /* prompt function, called from main on MAIN lcore */\n static void prompt(__rte_unused void *arg1)\n {\ndiff --git a/examples/bond/main.h b/examples/bond/main.h\ndeleted file mode 100644\nindex f91ed9c885..0000000000\n--- a/examples/bond/main.h\n+++ /dev/null\n@@ -1,10 +0,0 @@\n-/* SPDX-License-Identifier: BSD-3-Clause\n- * Copyright(c) 2010-2015 Intel Corporation\n- */\n-\n-#ifndef _MAIN_H_\n-#define _MAIN_H_\n-\n-int main(int argc, char *argv[]);\n-\n-#endif /* ifndef _MAIN_H_ */\ndiff --git a/examples/bond/meson.build b/examples/bond/meson.build\nindex ed22b7887d..bfbec04ecd 100644\n--- a/examples/bond/meson.build\n+++ b/examples/bond/meson.build\n@@ -11,3 +11,11 @@ allow_experimental_apis = true\n sources = files(\n 'main.c',\n )\n+\n+cmd_h = custom_target('commands_hdr',\n+\toutput: 'commands.h',\n+\tinput: files('commands.list'),\n+\tcapture: true,\n+\tcommand: [cmdline_gen_cmd, '--context-name=main_ctx', '@INPUT@']\n+)\n+sources += cmd_h\n", "prefixes": [ "RFC", "v2", "5/5" ] }