xdp-bench: Update long option for -p to match documentation

The documentation for the -p option of xdp-bench (in the basic modes) was updated in the documentation, but not the value actually being accepted by the program. The --packet-operation option name is actually the better one, so change the code to accept that, but keep accepting the old --program-mode since that was in a release already. Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
xdp-project · Jun 8, 2023 · ca0ba83 · ca0ba83
1 parent 297d5ab
commit ca0ba83
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/lib/util/params.c b/lib/util/params.c
@@ -456,7 +456,7 @@ static void _print_options(const struct prog_option *poptions, bool required)
 	const struct prog_option *opt;
 
 	FOR_EACH_OPTION (poptions, opt) {
-		if (opt->required != required)
+		if (opt->required != required || opt->hidden)
 			continue;
 
 		if (opt->positional) {

diff --git a/lib/util/params.h b/lib/util/params.h
@@ -40,6 +40,7 @@ struct prog_option {
 	void *typearg;
 	bool required;
 	bool positional;
+	bool hidden;
 	unsigned int min_num;
 	unsigned int max_num;
 	unsigned int num_set;

diff --git a/xdp-bench/xdp-bench.c b/xdp-bench/xdp-bench.c
@@ -62,11 +62,14 @@ struct enum_val cpumap_program_modes[] = {
 
 
 struct prog_option basic_options[] = {
-	DEFINE_OPTION("program-mode", OPT_ENUM, struct basic_opts, program_mode,
+	DEFINE_OPTION("packet-operation", OPT_ENUM, struct basic_opts, program_mode,
 		      .short_opt = 'p',
-		      .metavar = "<mode>",
+		      .metavar = "<action>",
 		      .typearg = basic_program_modes,
 		      .help = "Action to take before dropping packet."),
+	DEFINE_OPTION("program-mode", OPT_ENUM, struct basic_opts, program_mode,
+		      .typearg = basic_program_modes,
+		      .hidden = true),
 	DEFINE_OPTION("rxq-stats", OPT_BOOL, struct basic_opts, rxq_stats,
 		      .short_opt = 'r',
 		      .help = "Collect per-RXQ drop statistics"),