Update the ompi_info man page with information about variable levels

and improve the behavior of ompi_info.

This commit changes the default behavior of ompi_info --all when a
level is not specified. Instead of assuming level 1 in this case we
now assume level 9. This change is due to feedback from the community
after the introduction of the --level option.

I also added a new option: --selected-only. This option will limit the
displayed variables to components that can be selected (ie. if there
is a selection parameter set-- btl self,sm)

cmr=v1.7.3:reviewer=jsquyres

This commit was SVN r29070.

ompi/tools/ompi_info/ompi_info.1in

@@ -57,6 +57,11 @@ Show the hostname that Open MPI was configured and built on
 .I \-\-internal
 Show internal MCA parameters (not meant to be modified by users)
 .TP 8
+.I \-\-level
+Show only variables with at most this level (1-9). The default is 1 unless
+\-\-all is specified without \-\-level in which case the default is 9. See
+the LEVEL section for more information.
+.TP 8
 .I \-mca|\-\-mca <param> <value>
 Pass context-specific MCA parameters; they are considered global if --gmca is
 not used and only one context is specified.
@@ -80,10 +85,53 @@ parameters: prefix, bindir, libdir, incdir, pkglibdir, sysconfdir.
 When used in conjunction with other parameters, the output is
 displayed in 'prettyprint' format (default)
 .TP 8
+.I \-\-selected-only
+Show only variables from selected components.
+.TP 8
 .I \-V|\-\-version
 Show version of Open MPI.
 .
 .\" **************************
+.\"    Levels Section
+.\" **************************
+.SH LEVELS
+.TP 4
+1
+Basic information of interest to users
+.
+.TP
+2
+Detailed information of interest to users
+.
+.TP
+3
+All remaining information of interest to users
+.
+.TP
+4
+Basic information required for tuning
+.
+.TP
+5
+Detailed information required for tuning
+.
+.TP
+6
+All remaining information required for tuning
+.
+.TP
+7
+Basic information for MPI implementors
+.
+.TP
+8
+Detailed information for MPI implementors
+.
+.TP
+9
+All remaining information for MPI implementors
+.
+.\" **************************
 .\"    Examples Section
 .\" **************************
 .SH EXAMPLES

opal/runtime/opal_info_support.c

@@ -1,3 +1,4 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
 /*
  * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
@@ -66,6 +67,7 @@ const char *opal_info_path_pkgdatadir = "pkgdatadir";
 const char *opal_info_path_pkgincludedir = "pkgincludedir";
 
 bool opal_info_pretty = true;
+mca_base_register_flag_t opal_info_register_flags = MCA_BASE_REGISTER_ALL;
 
 const char *opal_info_type_all = "all";
 const char *opal_info_type_opal = "opal";
@@ -148,6 +150,8 @@ int opal_info_init(int argc, char **argv,
                             "Show all configuration options and MCA parameters");
     opal_cmd_line_make_opt3(opal_info_cmd_line, 'l', NULL, "level", 1,
                             "Show only variables with at most this level (1-9)");
+    opal_cmd_line_make_opt3(opal_info_cmd_line, 's', NULL, "selected-only", 0,
+                            "Show only variables from selected components");
 
     /* set our threading level */
     opal_set_using_threads(false);
@@ -209,6 +213,11 @@ int opal_info_init(int argc, char **argv,
         opal_info_pretty = false;
     }
 
+    if (opal_cmd_line_is_taken(opal_info_cmd_line, "selected-only")) {
+        /* register only selected components */
+        opal_info_register_flags = MCA_BASE_REGISTER_DEFAULT;
+    }
+    
     return OPAL_SUCCESS;
 }
 
@@ -223,7 +232,7 @@ static int info_register_framework (mca_base_framework_t *framework, opal_pointe
     opal_info_component_map_t *map;
     int rc;
 
-    rc = mca_base_framework_register(framework, MCA_BASE_REGISTER_ALL);
+    rc = mca_base_framework_register(framework, opal_info_register_flags);
     if (OPAL_SUCCESS != rc && OPAL_ERR_BAD_PARAM != rc) {
         return rc;
     }
@@ -440,6 +449,9 @@ void opal_info_do_params(bool want_all_in, bool want_internal,
             free(usage);
             exit(1);
         }
+    } else if (want_all_in) {
+        /* if not specified default to level 9 if all components are requested */
+        max_level = OPAL_INFO_LVL_9;
     }
 
     if (want_all_in) {