A little cleanup - the base function to sort numa lists must return something or you get a warning about non-void function returning without value, so cleanup the return values. Ensure the mindist module actually checks for a return of "error" so it won't segfault, and have it emit a polite message when that happens.

cmr:v1.7.3:reviewer=jladd

This commit was SVN r29089.

opal/mca/hwloc/base/hwloc_base_util.c

@@ -1845,7 +1845,7 @@ int opal_hwloc_get_sorted_numa_list(hwloc_topology_t topo, char* device_name, op
                         copy_numa->dist_from_closed = numa->dist_from_closed;
                         opal_list_append(sorted_list, &copy_numa->super);
                     }
-                    return 0;
+                    return OPAL_SUCCESS;
                 }else {
                     /* don't already know it - go get it */
                     /* firstly we check if we need to autodetect OpenFabrics  devices or we have the specified one */
@@ -1856,7 +1856,7 @@ int opal_hwloc_get_sorted_numa_list(hwloc_topology_t topo, char* device_name, op
                        }
                     }
                     if (!device_name || (strlen(device_name) == 0)) {
-                        return 1;
+                        return OPAL_ERR_NOT_FOUND;
                     }
                     sort_by_dist(topo, device_name, sorted_list);
                     /* store this info in summary object for later usage */
@@ -1866,9 +1866,10 @@ int opal_hwloc_get_sorted_numa_list(hwloc_topology_t topo, char* device_name, op
                         copy_numa->dist_from_closed = numa->dist_from_closed;
                         opal_list_append(&(sum->sorted_by_dist_list), &copy_numa->super);
                     }
-                    return 0;
+                    return OPAL_SUCCESS;
                 }
             }
         }
     }
+    return OPAL_ERR_NOT_FOUND;
 }

orte/mca/rmaps/mindist/help-orte-rmaps-md.txt

@@ -28,7 +28,7 @@ No PCI locality information could be found on at least one node:
 
   Node: %s
 
-Open MPI therefore cannot mapp the application as specified.
+Open MPI therefore cannot mapp\ the application as specified.
 #
 [orte-rmaps-mindist:several-hca-devices]
 There are several OpenFabrics devices found on at least one node. Please specify the definite one.
@@ -36,4 +36,12 @@ There are several OpenFabrics devices found on at least one node. Please specify
   Devices: %d
   Node: %s
 
-Open MPI therefore cannot mapp the application as specified.
+Open MPI therefore cannot map the application as specified.
+#
+[orte-rmaps-mindist:device-not-found]
+An OpenFabrics device was specified that cannot be found on at least one node.
+
+  Device: %s
+  Node: %s
+
+Open MPI therefore cannot map the application as specified.

orte/mca/rmaps/mindist/rmaps_mindist_module.c

@@ -252,6 +252,11 @@ static int mindist_map(orte_job_t *jdata)
                         true, ret, node->name);
                 rc = ORTE_ERR_SILENT;
                 goto error;
+            } else if (ret < 0) {
+                orte_show_help("help-orte-rmaps-md.txt", "orte-rmaps-mindist:device-not-found",
+                        true, orte_rmaps_base.device, node->name);
+                rc = ORTE_ERR_SILENT;
+                goto error;
             }
             if (opal_list_get_size(&numa_list) > 0) {
                 j = 0;