lstopo/interactive: no need to list --index parameters

Only the global index type may be changed interactively. Signed-off-by: Brice Goglin <Brice.Goglin@inria.fr>
open-mpi · Apr 11, 2019 · 79f81ea · 79f81ea
1 parent 361222c
commit 79f81ea
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/utils/lstopo/lstopo.c b/utils/lstopo/lstopo.c
@@ -424,8 +424,6 @@ static void lstopo__show_interactive_cli_options(const struct lstopo_output *lou
     printf(" -l");
   else if (loutput->index_type == LSTOPO_INDEX_TYPE_NONE)
     printf(" --no-index");
-  else
-    lstopo_show_interactive_cli_options_array(loutput->show_indexes, "index");
 
   lstopo_show_interactive_cli_options_array(loutput->show_attrs, "attrs");
   lstopo_show_interactive_cli_options_array(loutput->show_text, "text");

diff --git a/utils/lstopo/lstopo.h b/utils/lstopo/lstopo.h
@@ -77,8 +77,8 @@ struct lstopo_output {
   float text_xscale;
   enum lstopo_orient_e force_orient[HWLOC_OBJ_TYPE_MAX]; /* orientation of children within an object of the given type */
   unsigned no_half_lines; /* set by ASCII backend because it cannot write between lines of the terminal */
+  int show_indexes[HWLOC_OBJ_TYPE_MAX]; /* enabled by global toggle index_type */
   int show_text[HWLOC_OBJ_TYPE_MAX];
-  int show_indexes[HWLOC_OBJ_TYPE_MAX];
   int show_attrs[HWLOC_OBJ_TYPE_MAX];
   int show_binding;
   int show_disallowed;