bdedd8b0d3
Reasoning: The old behavior was a little confusing. mca_base_components_open does not open an output stream so it is a little unexpected that mca_base_components_close does. To add to this several frameworks (that don't use mca_base_components_close) failed to close their output in the framework close function and others closed their output a second time. This change is an improvement to the symantics of mca_base_components_open/close as they are now symetric in their functionality. This commit was SVN r27570.
54 строки
1.3 KiB
C
54 строки
1.3 KiB
C
/*
|
|
* Copyright (c) 2011 Cisco Systems, Inc. All rights reserved.
|
|
* $COPYRIGHT$
|
|
*
|
|
* Additional copyrights may follow
|
|
*
|
|
* $HEADER$
|
|
*/
|
|
|
|
#include "opal_config.h"
|
|
|
|
#include "opal/constants.h"
|
|
#include "opal/mca/mca.h"
|
|
#include "opal/mca/base/base.h"
|
|
#include "opal/mca/hwloc/hwloc.h"
|
|
#include "opal/mca/hwloc/base/base.h"
|
|
|
|
int opal_hwloc_base_close(void)
|
|
{
|
|
if (!opal_hwloc_base_inited) {
|
|
return OPAL_SUCCESS;
|
|
}
|
|
|
|
#if OPAL_HAVE_HWLOC
|
|
{
|
|
opal_list_item_t *item;
|
|
|
|
/* no need to close the component as it was statically opened */
|
|
|
|
/* for support of tools such as ompi_info */
|
|
for (item = opal_list_remove_first(&opal_hwloc_base_components);
|
|
NULL != item;
|
|
item = opal_list_remove_first(&opal_hwloc_base_components)) {
|
|
OBJ_RELEASE(item);
|
|
}
|
|
OBJ_DESTRUCT(&opal_hwloc_base_components);
|
|
|
|
/* free memory */
|
|
if (NULL != opal_hwloc_my_cpuset) {
|
|
hwloc_bitmap_free(opal_hwloc_my_cpuset);
|
|
opal_hwloc_my_cpuset = NULL;
|
|
}
|
|
|
|
/* Close the framework output */
|
|
opal_output_close (opal_hwloc_base_output);
|
|
opal_hwloc_base_output = -1;
|
|
}
|
|
#endif
|
|
|
|
/* All done */
|
|
opal_hwloc_base_inited = false;
|
|
return OPAL_SUCCESS;
|
|
}
|