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.
59 строки
2.0 KiB
C
59 строки
2.0 KiB
C
/*
|
||
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||
* University Research and Technology
|
||
* Corporation. All rights reserved.
|
||
* Copyright (c) 2004-2005 The University of Tennessee and The University
|
||
* of Tennessee Research Foundation. All rights
|
||
* reserved.
|
||
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||
* University of Stuttgart. All rights reserved.
|
||
* Copyright (c) 2004-2005 The Regents of the University of California.
|
||
* All rights reserved.
|
||
* Copyright (c) 2008-2011 University of Houston. All rights reserved.
|
||
* $COPYRIGHTOB$
|
||
*
|
||
* Additional copyrights may follow
|
||
*
|
||
* $HEADER$
|
||
*/
|
||
|
||
#include "ompi_config.h"
|
||
|
||
#include <stdio.h>
|
||
|
||
#include "ompi/constants.h"
|
||
#include "opal/mca/mca.h"
|
||
#include "opal/mca/base/base.h"
|
||
#include "ompi/mca/sharedfp/sharedfp.h"
|
||
#include "ompi/mca/sharedfp/base/base.h"
|
||
#include "opal/util/output.h"
|
||
|
||
int mca_sharedfp_base_close(void)
|
||
{
|
||
/*
|
||
Close all components that are still open. This may be the opened
|
||
list (if we're in ompi_info), or it may be the available list (if
|
||
we're anywhere else).
|
||
*/
|
||
|
||
if (mca_sharedfp_base_components_opened_valid) {
|
||
mca_base_components_close(mca_sharedfp_base_output,
|
||
&mca_sharedfp_base_components_opened, NULL);
|
||
OBJ_DESTRUCT(&mca_sharedfp_base_components_opened);
|
||
mca_sharedfp_base_components_opened_valid = false;
|
||
} else if (mca_sharedfp_base_components_available_valid) {
|
||
mca_base_components_close(mca_sharedfp_base_output,
|
||
&mca_sharedfp_base_components_available, NULL);
|
||
OBJ_DESTRUCT(&mca_sharedfp_base_components_available);
|
||
mca_sharedfp_base_components_available_valid = false;
|
||
}
|
||
|
||
/* Close the framework output */
|
||
opal_output_close (mca_sharedfp_base_output);
|
||
mca_sharedfp_base_output = -1;
|
||
|
||
/* All done */
|
||
|
||
return OMPI_SUCCESS;
|
||
}
|