Merge pull request #7713 from mwheinz/master-7699

Michael Heinz · web-flow · commit 4a5622a43663 · 2020-05-13T07:59:43.000-04:00
PSM2: Call add_procs through PML
diff --git a/ompi/mca/mtl/psm2/mtl_psm2_endpoint.h b/ompi/mca/mtl/psm2/mtl_psm2_endpoint.h
@@ -10,7 +10,7 @@
  * Copyright (c) 2004-2006 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2006      QLogic Corporation. All rights reserved.
- * Copyright (c) 2015      Intel, Inc. All rights reserved
+ * Copyright (c) 2015-2020 Intel, Inc. All rights reserved
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -58,7 +58,10 @@ OBJ_CLASS_DECLARATION(mca_mtl_psm2_endpoint);
 static inline mca_mtl_psm2_endpoint_t *ompi_mtl_psm2_get_endpoint (struct mca_mtl_base_module_t* mtl, ompi_proc_t *ompi_proc)
 {
     if (OPAL_UNLIKELY(NULL == ompi_proc->proc_endpoints[OMPI_PROC_ENDPOINT_TAG_MTL])) {
-	ompi_mtl_psm2_add_procs (mtl, 1, &ompi_proc);
+        int rc;
+        if (OPAL_UNLIKELY(OMPI_SUCCESS != (rc = MCA_PML_CALL(add_procs(&ompi_proc, 1))))) {
+            ompi_rte_abort(rc,"Error in ompi_mtl_psm2_get_endpoint.\n");
+        }
     }
 
     return ompi_proc->proc_endpoints[OMPI_PROC_ENDPOINT_TAG_MTL];

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`* Copyright (c) 2004-2006 The Regents of the University of California.`
`11`	`11`	`* All rights reserved.`
`12`	`12`	`* Copyright (c) 2006 QLogic Corporation. All rights reserved.`
`13`		`- * Copyright (c) 2015 Intel, Inc. All rights reserved`
	`13`	`+ * Copyright (c) 2015-2020 Intel, Inc. All rights reserved`
`14`	`14`	`* $COPYRIGHT$`
`15`	`15`	`*`
`16`	`16`	`* Additional copyrights may follow`
`@@ -58,7 +58,10 @@ OBJ_CLASS_DECLARATION(mca_mtl_psm2_endpoint);`
`58`	`58`	`static inline mca_mtl_psm2_endpoint_t ompi_mtl_psm2_get_endpoint (struct mca_mtl_base_module_t mtl, ompi_proc_t *ompi_proc)`
`59`	`59`	`{`
`60`	`60`	`if (OPAL_UNLIKELY(NULL == ompi_proc->proc_endpoints[OMPI_PROC_ENDPOINT_TAG_MTL])) {`
`61`		`- ompi_mtl_psm2_add_procs (mtl, 1, &ompi_proc);`
	`61`	`+ int rc;`
	`62`	`+ if (OPAL_UNLIKELY(OMPI_SUCCESS != (rc = MCA_PML_CALL(add_procs(&ompi_proc, 1))))) {`
	`63`	`+ ompi_rte_abort(rc,"Error in ompi_mtl_psm2_get_endpoint.\n");`
	`64`	`+ }`
`62`	`65`	`}`
`63`	`66`
`64`	`67`	`return ompi_proc->proc_endpoints[OMPI_PROC_ENDPOINT_TAG_MTL];`