The echoing of commands contained in a file loaded via the "load"
command on testpmd CLI is governed by whether or not a cmdline-file or
cmdline-file-noecho had been passed to testpmd on the commandline.
Remove the use of a global setting for this, and explicitly add a
"load_echo" command to match the "load" command.
Signed-off-by: Bruce Richardson <bruce.richard...@intel.com>
---
app/test-pmd/cmdline.c | 51 +++++++++++++++++++--
app/test-pmd/testpmd.c | 2 +-
app/test-pmd/testpmd.h | 2 +-
doc/guides/testpmd_app_ug/testpmd_funcs.rst | 2 +-
4 files changed, 49 insertions(+), 8 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 7b4e27eddf..5433678b5e 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -11646,7 +11646,9 @@ cmd_load_from_file_parsed(
{
struct cmd_cmdfile_result *res = parsed_result;
- cmdline_read_from_file(res->filename);
+ if (cmdline_read_from_file(res->filename, false) != 0) {
+ fprintf(stderr, "Failed to load commands from file: %s\n",
res->filename);
+ }
}
static cmdline_parse_inst_t cmd_load_from_file = {
@@ -11660,6 +11662,41 @@ static cmdline_parse_inst_t cmd_load_from_file = {
},
};
+/* command to load a file with echoing commands */
+struct cmd_load_echo_result {
+ cmdline_fixed_string_t load_echo;
+ cmdline_fixed_string_t filename;
+};
+
+/* CLI fields for file load with echo command */
+static cmdline_parse_token_string_t cmd_load_echo =
+ TOKEN_STRING_INITIALIZER(struct cmd_load_echo_result, load_echo,
"load_echo");
+static cmdline_parse_token_string_t cmd_load_echo_filename =
+ TOKEN_STRING_INITIALIZER(struct cmd_load_echo_result, filename, NULL);
+
+static void
+cmd_load_echo_file_parsed(
+ void *parsed_result,
+ __rte_unused struct cmdline *cl,
+ __rte_unused void *data)
+{
+ struct cmd_load_echo_result *res = parsed_result;
+
+ if (cmdline_read_from_file(res->filename, true) != 0)
+ fprintf(stderr, "Failed to load commands from file: %s\n",
res->filename);
+}
+
+static cmdline_parse_inst_t cmd_load_echo_file = {
+ .f = cmd_load_echo_file_parsed,
+ .data = NULL,
+ .help_str = "load_echo <filename>",
+ .tokens = {
+ (void *)&cmd_load_echo,
+ (void *)&cmd_load_echo_filename,
+ NULL,
+ },
+};
+
/* Get Rx offloads capabilities */
struct cmd_rx_offload_get_capa_result {
cmdline_fixed_string_t show;
@@ -13865,6 +13902,7 @@ static cmdline_parse_ctx_t builtin_ctx[] = {
&cmd_help_long,
&cmd_quit,
&cmd_load_from_file,
+ &cmd_load_echo_file,
&cmd_showport,
&cmd_showqueue,
&cmd_showeeprom,
@@ -14151,24 +14189,25 @@ init_cmdline(void)
}
/* read cmdline commands from file */
-void
-cmdline_read_from_file(const char *filename)
+int
+cmdline_read_from_file(const char *filename, bool echo)
{
struct cmdline *cl;
int fd = -1;
+ int ret = 0;
/* cmdline_file_new does not produce any output
* so when echoing is requested we open filename directly
* and then pass that to cmdline_new with stdout as the output path.
*/
- if (!echo_cmdline_file) {
+ if (!echo) {
cl = cmdline_file_new(main_ctx, "testpmd> ", filename);
} else {
fd = open(filename, O_RDONLY);
if (fd < 0) {
fprintf(stderr, "Failed to open file %s: %s\n",
filename, strerror(errno));
- return;
+ return -1;
}
cl = cmdline_new(main_ctx, "testpmd> ", fd, STDOUT_FILENO);
@@ -14177,6 +14216,7 @@ cmdline_read_from_file(const char *filename)
fprintf(stderr,
"Failed to create file based cmdline context: %s\n",
filename);
+ ret = -1;
goto end;
}
@@ -14190,6 +14230,7 @@ cmdline_read_from_file(const char *filename)
end:
if (fd >= 0)
close(fd);
+ return ret;
}
void
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index bb88555328..b498e6d9fe 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -4509,7 +4509,7 @@ main(int argc, char** argv)
"Could not initialise cmdline context.\n");
if (strlen(cmdline_filename) != 0)
- cmdline_read_from_file(cmdline_filename);
+ cmdline_read_from_file(cmdline_filename, echo_cmdline_file);
if (interactive == 1) {
if (auto_start) {
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index e629edaa02..1d34f40deb 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -928,7 +928,7 @@ unsigned int parse_hdrs_list(const char *str, const char
*item_name,
unsigned int *parsed_items);
void launch_args_parse(int argc, char** argv);
void cmd_reconfig_device_queue(portid_t id, uint8_t dev, uint8_t queue);
-void cmdline_read_from_file(const char *filename);
+int cmdline_read_from_file(const char *filename, bool echo);
int init_cmdline(void);
void prompt(void);
void prompt_exit(void);
diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index 6ad83ae50d..e12585f025 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -95,7 +95,7 @@ practical or possible testpmd supports alternative methods
for executing command
* At run-time additional commands can be loaded in bulk by invoking the ``load
FILENAME``
- command.
+ or ``load_echo FILENAME`` command.
.. code-block:: console
--
2.48.1
