@@ -6,6 +6,7 @@ APP = hotplug_mp
# all source are stored in SRCS-y
SRCS-y := main.c commands.c
+SRC-DEPS := build/commands.h
PKGCONF ?= pkg-config
@@ -22,10 +23,13 @@ static: build/$(APP)-static
ln -sf $(APP)-static build/$(APP)
PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
-CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
+CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) -I build/
LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
+build/commands.h: commands.list Makefile
+ dpdk-cmdline-gen.py -o $@ --context-name=main_ctx $<
+
ifeq ($(MAKECMDGOALS),static)
# check for broken pkg-config
ifeq ($(shell echo $(LDFLAGS_STATIC) | grep 'whole-archive.*l:lib.*no-whole-archive'),)
@@ -36,10 +40,10 @@ endif
CFLAGS += -DALLOW_EXPERIMENTAL_API
-build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
+build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build $(SRC-DEPS)
$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
-build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build
+build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build $(SRC-DEPS)
$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC)
build:
@@ -1,24 +1,12 @@
/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2018 Intel Corporation.
+ * Copyright(c) 2018-2023 Intel Corporation.
*/
-#include <cmdline_rdline.h>
-#include <cmdline_parse.h>
-#include <cmdline_parse_ipaddr.h>
-#include <cmdline_parse_num.h>
-#include <cmdline_parse_string.h>
-#include <cmdline.h>
-
#include <rte_bus.h>
#include <rte_ethdev.h>
+#include "commands.h"
-/**********************************************************/
-
-struct cmd_help_result {
- cmdline_fixed_string_t help;
-};
-
-static void cmd_help_parsed(__rte_unused void *parsed_result,
+void cmd_help_parsed(__rte_unused void *parsed_result,
struct cmdline *cl,
__rte_unused void *data)
{
@@ -29,52 +17,16 @@ static void cmd_help_parsed(__rte_unused void *parsed_result,
"- list\n\n");
}
-cmdline_parse_token_string_t cmd_help_help =
- TOKEN_STRING_INITIALIZER(struct cmd_help_result, help, "help");
-
-cmdline_parse_inst_t cmd_help = {
- .f = cmd_help_parsed, /* function to call */
- .data = NULL, /* 2nd arg of func */
- .help_str = "show help",
- .tokens = { /* token list, NULL terminated */
- (void *)&cmd_help_help,
- NULL,
- },
-};
-
-/**********************************************************/
-
-struct cmd_quit_result {
- cmdline_fixed_string_t quit;
-};
-
-static void cmd_quit_parsed(__rte_unused void *parsed_result,
+void
+cmd_quit_parsed(__rte_unused void *parsed_result,
struct cmdline *cl,
__rte_unused void *data)
{
cmdline_quit(cl);
}
-cmdline_parse_token_string_t cmd_quit_quit =
- TOKEN_STRING_INITIALIZER(struct cmd_quit_result, quit, "quit");
-
-cmdline_parse_inst_t cmd_quit = {
- .f = cmd_quit_parsed, /* function to call */
- .data = NULL, /* 2nd arg of func */
- .help_str = "quit",
- .tokens = { /* token list, NULL terminated */
- (void *)&cmd_quit_quit,
- NULL,
- },
-};
-
-/**********************************************************/
-
-struct cmd_list_result {
- cmdline_fixed_string_t list;
-};
-
-static void cmd_list_parsed(__rte_unused void *parsed_result,
+void
+cmd_list_parsed(__rte_unused void *parsed_result,
struct cmdline *cl,
__rte_unused void *data)
{
@@ -92,31 +44,12 @@ static void cmd_list_parsed(__rte_unused void *parsed_result,
}
}
-cmdline_parse_token_string_t cmd_list_list =
- TOKEN_STRING_INITIALIZER(struct cmd_list_result, list, "list");
-
-cmdline_parse_inst_t cmd_list = {
- .f = cmd_list_parsed, /* function to call */
- .data = NULL, /* 2nd arg of func */
- .help_str = "list all devices",
- .tokens = { /* token list, NULL terminated */
- (void *)&cmd_list_list,
- NULL,
- },
-};
-
-/**********************************************************/
-
-struct cmd_dev_attach_result {
- cmdline_fixed_string_t attach;
- cmdline_fixed_string_t devargs;
-};
-
-static void cmd_dev_attach_parsed(void *parsed_result,
+void
+cmd_attach_parsed(void *parsed_result,
struct cmdline *cl,
__rte_unused void *data)
{
- struct cmd_dev_attach_result *res = parsed_result;
+ struct cmd_attach_result *res = parsed_result;
struct rte_devargs da;
memset(&da, 0, sizeof(da));
@@ -134,35 +67,12 @@ static void cmd_dev_attach_parsed(void *parsed_result,
rte_devargs_reset(&da);
}
-cmdline_parse_token_string_t cmd_dev_attach_attach =
- TOKEN_STRING_INITIALIZER(struct cmd_dev_attach_result, attach,
- "attach");
-cmdline_parse_token_string_t cmd_dev_attach_devargs =
- TOKEN_STRING_INITIALIZER(struct cmd_dev_attach_result, devargs, NULL);
-
-cmdline_parse_inst_t cmd_attach_device = {
- .f = cmd_dev_attach_parsed, /* function to call */
- .data = NULL, /* 2nd arg of func */
- .help_str = "attach a device",
- .tokens = { /* token list, NULL terminated */
- (void *)&cmd_dev_attach_attach,
- (void *)&cmd_dev_attach_devargs,
- NULL,
- },
-};
-
-/**********************************************************/
-
-struct cmd_dev_detach_result {
- cmdline_fixed_string_t detach;
- cmdline_fixed_string_t devargs;
-};
-
-static void cmd_dev_detach_parsed(void *parsed_result,
+void
+cmd_detach_parsed(void *parsed_result,
struct cmdline *cl,
__rte_unused void *data)
{
- struct cmd_dev_detach_result *res = parsed_result;
+ struct cmd_detach_result *res = parsed_result;
struct rte_devargs da;
memset(&da, 0, sizeof(da));
@@ -181,34 +91,3 @@ static void cmd_dev_detach_parsed(void *parsed_result,
da.name);
rte_devargs_reset(&da);
}
-
-cmdline_parse_token_string_t cmd_dev_detach_detach =
- TOKEN_STRING_INITIALIZER(struct cmd_dev_detach_result, detach,
- "detach");
-
-cmdline_parse_token_string_t cmd_dev_detach_devargs =
- TOKEN_STRING_INITIALIZER(struct cmd_dev_detach_result, devargs, NULL);
-
-cmdline_parse_inst_t cmd_detach_device = {
- .f = cmd_dev_detach_parsed, /* function to call */
- .data = NULL, /* 2nd arg of func */
- .help_str = "detach a device",
- .tokens = { /* token list, NULL terminated */
- (void *)&cmd_dev_detach_detach,
- (void *)&cmd_dev_detach_devargs,
- NULL,
- },
-};
-
-/**********************************************************/
-/**********************************************************/
-/****** CONTEXT (list of instruction) */
-
-cmdline_parse_ctx_t main_ctx[] = {
- (cmdline_parse_inst_t *)&cmd_help,
- (cmdline_parse_inst_t *)&cmd_quit,
- (cmdline_parse_inst_t *)&cmd_list,
- (cmdline_parse_inst_t *)&cmd_attach_device,
- (cmdline_parse_inst_t *)&cmd_detach_device,
- NULL,
-};
deleted file mode 100644
@@ -1,10 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2018 Intel Corporation
- */
-
-#ifndef _COMMANDS_H_
-#define _COMMANDS_H_
-
-extern cmdline_parse_ctx_t main_ctx[];
-
-#endif /* _COMMANDS_H_ */
new file mode 100644
@@ -0,0 +1,5 @@
+help
+quit
+list
+attach <STRING>devargs
+detach <STRING>devargs
\ No newline at end of file
@@ -7,7 +7,16 @@
# DPDK instance, use 'make'
allow_experimental_apis = true
+
+cmd_h = custom_target('commands_hdr',
+ output: 'commands.h',
+ input: files('commands.list'),
+ capture: true,
+ command: [cmdline_gen_cmd, '--context-name=main_ctx', '@INPUT@']
+)
+
sources = files(
'commands.c',
'main.c',
)
+sources += cmd_h