Clean up the error message names from the hwloc base, and add a

missing error message.

This commit was SVN r27180.

opal/mca/hwloc/base/help-opal-hwloc-base.txt

@@ -9,7 +9,7 @@
 #
 # This is the US/English help file for Open MPI's hwloc base support
 #
-[invalid policy]
+[invalid mem_alloc_policy]
 WARNING: An invalid value was given for the
 hwloc_base_general_alloc_policy MCA parameter.  This MCA parameter
 determines the policy used for general memory allocations.  Note that
@@ -28,6 +28,28 @@ Valid values are:
   local_only:   fail an allocation if it cannot be placed entirely on
                 the local NUMA node
 
+Your job will now abort.
+#
+[invalid mem_bind_failure_action]
+WARNING: An invalid value was given for the
+hwloc_base_mem_bind_failure_action MCA parameter.  This MCA parameter
+determines what happens when memory fails to bind to a specific
+locale.  Note that this parameter *only* has effect when MPI processes
+are bound to specific processors.
+
+The value provided was:
+
+  Local host: %s
+  PID:        %d
+  Value:      %s
+
+Valid values are:
+
+  silent:     do not print a warning, and continue the job (possibly
+              with lower-than-expected performance)
+  warn:       print a warning, but continue the job
+  error:      print a warning and abort the job
+
 Your job will now abort.
 #
 [mbind failure]
@@ -40,7 +62,7 @@ message will only be reported at most once per process.
   Message:    %s
   Severity:   %s
 #
-[unrecognized-policy]
+[invalid binding_policy]
 The specified %s policy is not recognized:
 
   Policy: %s

opal/mca/hwloc/base/hwloc_base_open.c

@@ -109,7 +109,7 @@ int opal_hwloc_base_open(void)
         } else {
             char hostname[32];
             gethostname(hostname, sizeof(hostname));
-            opal_show_help("help-opal-hwloc-base.txt", "invalid policy",
+            opal_show_help("help-opal-hwloc-base.txt", "invalid mem_alloc_policy",
                            true, hostname, getpid(), str_value);
             free(str_value);
             return OPAL_ERR_BAD_PARAM;
@@ -140,7 +140,7 @@ int opal_hwloc_base_open(void)
         } else {
             char hostname[32];
             gethostname(hostname, sizeof(hostname));
-            opal_show_help("help-opal-hwloc-base.txt", "invalid error action",
+            opal_show_help("help-opal-hwloc-base.txt", "invalid mem_bind_failure_action",
                            true, hostname, getpid(), str_value);
             free(str_value);
             return OPAL_ERR_BAD_PARAM;
@@ -193,7 +193,7 @@ int opal_hwloc_base_open(void)
             } else if (0 == strcasecmp(tmpvals[0], "board")) {
                 OPAL_SET_BINDING_POLICY(opal_hwloc_binding_policy, OPAL_BIND_TO_BOARD);
             } else {
-                opal_show_help("help-opal-hwloc-base.txt", "unrecognized-policy", true, "binding", str_value);
+                opal_show_help("help-opal-hwloc-base.txt", "invalid binding_policy", true, "binding", str_value);
                 opal_argv_free(tmpvals);
                 free(str_value);
                 return OPAL_ERR_BAD_PARAM;