move buffered send component clean up out of the pml to ompi_mpi_finalize.
This commit was SVN r15463.
Этот коммит содержится в:
родитель
73f1d800cf
Коммит
0991c3d5f5
@ -155,9 +155,6 @@ mca_pml_cm_component_init(int* priority,
|
|||||||
static int
|
static int
|
||||||
mca_pml_cm_component_fini(void)
|
mca_pml_cm_component_fini(void)
|
||||||
{
|
{
|
||||||
/* shut down buffered send code */
|
|
||||||
mca_pml_base_bsend_fini();
|
|
||||||
|
|
||||||
if (NULL != ompi_mtl && NULL != ompi_mtl->mtl_finalize) {
|
if (NULL != ompi_mtl && NULL != ompi_mtl->mtl_finalize) {
|
||||||
return ompi_mtl->mtl_finalize(ompi_mtl);
|
return ompi_mtl->mtl_finalize(ompi_mtl);
|
||||||
}
|
}
|
||||||
|
@ -200,11 +200,6 @@ int mca_pml_ob1_component_fini(void)
|
|||||||
if(OMPI_SUCCESS != (rc = mca_bml.bml_finalize()))
|
if(OMPI_SUCCESS != (rc = mca_bml.bml_finalize()))
|
||||||
return rc;
|
return rc;
|
||||||
|
|
||||||
/* Shutdown buffered send */
|
|
||||||
if(OMPI_SUCCESS != (rc = mca_pml_base_bsend_fini())) {
|
|
||||||
return rc;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(!mca_pml_ob1.enabled)
|
if(!mca_pml_ob1.enabled)
|
||||||
return OMPI_SUCCESS; /* never selected.. return success.. */
|
return OMPI_SUCCESS; /* never selected.. return success.. */
|
||||||
mca_pml_ob1.enabled = false; /* not anymore */
|
mca_pml_ob1.enabled = false; /* not anymore */
|
||||||
|
@ -76,6 +76,7 @@
|
|||||||
#include "ompi/mca/io/base/base.h"
|
#include "ompi/mca/io/base/base.h"
|
||||||
#include "ompi/mca/mpool/base/base.h"
|
#include "ompi/mca/mpool/base/base.h"
|
||||||
#include "ompi/mca/rcache/base/base.h"
|
#include "ompi/mca/rcache/base/base.h"
|
||||||
|
#include "ompi/mca/pml/base/pml_base_bsend.h"
|
||||||
|
|
||||||
#if OPAL_ENABLE_FT == 1
|
#if OPAL_ENABLE_FT == 1
|
||||||
#include "ompi/mca/crcp/crcp.h"
|
#include "ompi/mca/crcp/crcp.h"
|
||||||
@ -204,6 +205,9 @@ int ompi_mpi_finalize(void)
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* shut down buffered send code */
|
||||||
|
mca_pml_base_bsend_fini();
|
||||||
|
|
||||||
#if OPAL_ENABLE_FT == 1
|
#if OPAL_ENABLE_FT == 1
|
||||||
/*
|
/*
|
||||||
* Shutdown the CRCP Framework, must happen after PML shutdown
|
* Shutdown the CRCP Framework, must happen after PML shutdown
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user