Wow. And I won't name who it was who did this. You know who you are! :-)
We had a public symbol named "already_opened". This commit changes the name to mca_btl_base_already_opened. I guess it's good we have the visibility stuff enabled by default! :-) This commit was SVN r19791.
Этот коммит содержится в:
родитель
9260f6b157
Коммит
238a6f851f
@ -10,6 +10,7 @@
|
|||||||
* Copyright (c) 2004-2005 The Regents of the University of California.
|
* Copyright (c) 2004-2005 The Regents of the University of California.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
* Copyright (c) 2006 Sun Microsystems, Inc. All rights reserved.
|
* Copyright (c) 2006 Sun Microsystems, Inc. All rights reserved.
|
||||||
|
* Copyright (c) 2008 Cisco Systems, Inc. All rights reserved.
|
||||||
* $COPYRIGHT$
|
* $COPYRIGHT$
|
||||||
*
|
*
|
||||||
* Additional copyrights may follow
|
* Additional copyrights may follow
|
||||||
@ -72,6 +73,7 @@ extern char* mca_btl_base_exclude;
|
|||||||
extern int mca_btl_base_warn_component_unused;
|
extern int mca_btl_base_warn_component_unused;
|
||||||
OMPI_DECLSPEC extern opal_list_t mca_btl_base_components_opened;
|
OMPI_DECLSPEC extern opal_list_t mca_btl_base_components_opened;
|
||||||
OMPI_DECLSPEC extern opal_list_t mca_btl_base_modules_initialized;
|
OMPI_DECLSPEC extern opal_list_t mca_btl_base_modules_initialized;
|
||||||
|
OMPI_DECLSPEC extern int mca_btl_base_already_opened;
|
||||||
|
|
||||||
END_C_DECLS
|
END_C_DECLS
|
||||||
|
|
||||||
|
@ -9,6 +9,7 @@
|
|||||||
* University of Stuttgart. All rights reserved.
|
* University of Stuttgart. All rights reserved.
|
||||||
* Copyright (c) 2004-2005 The Regents of the University of California.
|
* Copyright (c) 2004-2005 The Regents of the University of California.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
|
* Copyright (c) 2008 Cisco Systems, Inc. All rights reserved.
|
||||||
* $COPYRIGHT$
|
* $COPYRIGHT$
|
||||||
*
|
*
|
||||||
* Additional copyrights may follow
|
* Additional copyrights may follow
|
||||||
@ -28,17 +29,15 @@
|
|||||||
#include "ompi/mca/btl/btl.h"
|
#include "ompi/mca/btl/btl.h"
|
||||||
#include "ompi/mca/btl/base/base.h"
|
#include "ompi/mca/btl/base/base.h"
|
||||||
|
|
||||||
extern int already_opened;
|
|
||||||
|
|
||||||
int mca_btl_base_close(void)
|
int mca_btl_base_close(void)
|
||||||
{
|
{
|
||||||
opal_list_item_t *item;
|
opal_list_item_t *item;
|
||||||
mca_btl_base_selected_module_t *sm;
|
mca_btl_base_selected_module_t *sm;
|
||||||
|
|
||||||
if( already_opened <= 0 ) {
|
if( mca_btl_base_already_opened <= 0 ) {
|
||||||
return OMPI_ERROR;
|
return OMPI_ERROR;
|
||||||
} else {
|
} else {
|
||||||
if( --already_opened > 0 ) {
|
if( --mca_btl_base_already_opened > 0 ) {
|
||||||
return OMPI_SUCCESS;
|
return OMPI_SUCCESS;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -78,8 +78,7 @@ char* mca_btl_base_exclude = NULL;
|
|||||||
int mca_btl_base_warn_component_unused = 1;
|
int mca_btl_base_warn_component_unused = 1;
|
||||||
opal_list_t mca_btl_base_components_opened;
|
opal_list_t mca_btl_base_components_opened;
|
||||||
opal_list_t mca_btl_base_modules_initialized;
|
opal_list_t mca_btl_base_modules_initialized;
|
||||||
|
int mca_btl_base_already_opened = 0;
|
||||||
int already_opened = 0;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Function for finding and opening either all MCA components, or the one
|
* Function for finding and opening either all MCA components, or the one
|
||||||
@ -87,7 +86,7 @@ int already_opened = 0;
|
|||||||
*/
|
*/
|
||||||
int mca_btl_base_open(void)
|
int mca_btl_base_open(void)
|
||||||
{
|
{
|
||||||
if( ++already_opened > 1 ) return OMPI_SUCCESS;
|
if( ++mca_btl_base_already_opened > 1 ) return OMPI_SUCCESS;
|
||||||
|
|
||||||
/* Verbose output */
|
/* Verbose output */
|
||||||
mca_base_param_reg_int_name("btl",
|
mca_base_param_reg_int_name("btl",
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user