Merge pull request #334 from yburette/topic/ofimtlbugfixes

Topic/ofimtlbugfixes

ompi/mca/mtl/ofi/mtl_ofi.c

@@ -104,10 +104,11 @@ ompi_mtl_ofi_add_procs(struct mca_mtl_base_module_t *mtl,
      * Map the EP names to fi_addrs.
      */
     ret = fi_av_insert(ompi_mtl_ofi.av, ep_names, nprocs, fi_addrs, 0, NULL);
-    if (ret) {
+    if (nprocs != ret) {
         opal_output_verbose(1, ompi_mtl_base_framework.framework_output,
                             "%s:%d: fi_av_insert failed: %s\n",
                             __FILE__, __LINE__, fi_strerror(errno));
+        ret = OMPI_ERROR;
         goto bail;
     }
 
@@ -123,6 +124,8 @@ ompi_mtl_ofi_add_procs(struct mca_mtl_base_module_t *mtl,
         procs[i]->proc_endpoints[OMPI_PROC_ENDPOINT_TAG_MTL] = endpoint;
     }
 
+    ret = OMPI_SUCCESS;
+
 bail:
     if (fi_addrs)
         free(fi_addrs);

ompi/mca/mtl/ofi/mtl_ofi_component.c

@@ -266,6 +266,12 @@ ompi_mtl_ofi_component_init(bool enable_progress_threads,
                     0ULL,                 /* In:  No flags                   */
                     &ompi_mtl_ofi.mr,     /* Out: memregion object           */
                     NULL);                /* Context: memregion events       */
+    if (0 != ret) {
+        opal_output_verbose(1, ompi_mtl_base_framework.framework_output,
+                            "%s:%d: fi_mr_reg failed: %s\n",
+                            __FILE__, __LINE__, fi_strerror(-ret));
+        goto error;
+    }
 
     /**
      * Bind the CQ and AV to the endpoint object.
@@ -306,6 +312,7 @@ ompi_mtl_ofi_component_init(bool enable_progress_threads,
      * Free providers info since it's not needed anymore.
      */
     fi_freeinfo(providers);
+    providers = NULL;
 
     /**
      * Get our address and publish it with modex.
@@ -347,7 +354,7 @@ ompi_mtl_ofi_component_init(bool enable_progress_threads,
                        &ompi_mtl_ofi.any_addr,
                        0ULL,
                        NULL);
-    if (ret) {
+    if (1 != ret) {
         opal_output_verbose(1, ompi_mtl_base_framework.framework_output,
                             "%s:%d: fi_av_insert failed: %s\n",
                             __FILE__, __LINE__, fi_strerror(-ret));