Skip to content

Commit 548060e

Browse files
author
Michael Heinz
committed
PSM2: Call add_procs through PML
Change ompi_mtl_ofi_get_endpoint() to call the active PML's add_procs() rather than the OFI MTL add_procs() directly when discovering a new process during operation. Functionally, this has no impact in correct operation. However, the current behavior means that the heterogenous and active PML checks are not being executed in the dynamic discovery case. Signed-off-by: Michael Heinz <michael.william.heinz@intel.com>
1 parent 9afe586 commit 548060e

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

ompi/mca/mtl/psm2/mtl_psm2_endpoint.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Copyright (c) 2004-2006 The Regents of the University of California.
1111
* All rights reserved.
1212
* 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
1414
* $COPYRIGHT$
1515
*
1616
* Additional copyrights may follow
@@ -58,7 +58,10 @@ OBJ_CLASS_DECLARATION(mca_mtl_psm2_endpoint);
5858
static inline mca_mtl_psm2_endpoint_t *ompi_mtl_psm2_get_endpoint (struct mca_mtl_base_module_t* mtl, ompi_proc_t *ompi_proc)
5959
{
6060
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+
}
6265
}
6366

6467
return ompi_proc->proc_endpoints[OMPI_PROC_ENDPOINT_TAG_MTL];

0 commit comments

Comments
 (0)