Skip to content

Commit ec21585

Browse files
committed
sessions:move opal_sma_base_f to ompi_framework
dependencies array. If this is not done, then when using a non-ob1 PML, the stages of finalization have the SMSC framework closed before the btl framework is closed or del_procs invoked for the btl(s). When using the --enable-mca_dso this results in a segfault as the code section for the SMSC framework/components has been dlclosed. Moving the opal_smc_base_framework from the opal_init_frameworks to the ompi_framework_dependencies fixes this problem. Related to #9097 Signed-off-by: Howard Pritchard <[email protected]>
1 parent 34685a2 commit ec21585

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

ompi/instance/instance.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
#include "opal/mca/allocator/base/base.h"
3939
#include "opal/mca/rcache/base/base.h"
4040
#include "opal/mca/mpool/base/base.h"
41+
#include "opal/mca/smsc/base/base.h"
4142
#include "ompi/mca/bml/base/base.h"
4243
#include "ompi/mca/pml/base/base.h"
4344
#include "ompi/mca/coll/base/base.h"
@@ -91,7 +92,7 @@ OBJ_CLASS_INSTANCE(ompi_instance_t, opal_infosubscriber_t, ompi_instance_constru
9192
/* NTH: frameworks needed by MPI */
9293
static mca_base_framework_t *ompi_framework_dependencies[] = {
9394
&ompi_hook_base_framework, &ompi_op_base_framework,
94-
&opal_allocator_base_framework, &opal_rcache_base_framework, &opal_mpool_base_framework,
95+
&opal_allocator_base_framework, &opal_rcache_base_framework, &opal_mpool_base_framework, &opal_smsc_base_framework,
9596
&ompi_bml_base_framework, &ompi_pml_base_framework, &ompi_coll_base_framework,
9697
&ompi_osc_base_framework, NULL,
9798
};

opal/runtime/opal_init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,7 @@ static mca_base_framework_t *opal_init_frameworks[] = {
622622
&opal_memcpy_base_framework, &opal_memchecker_base_framework,
623623
&opal_backtrace_base_framework, &opal_timer_base_framework,
624624
&opal_shmem_base_framework, &opal_reachable_base_framework,
625-
&opal_pmix_base_framework, &opal_smsc_base_framework,
625+
&opal_pmix_base_framework,
626626
NULL,
627627
};
628628

0 commit comments

Comments
 (0)