7c95ecf859
This commit also fixes a problem with the lazy opening of topo components. The topo framework incorrectly: 1) checked if the topo framework was open by checking the length of the components list, and 2) called the framework open directly instead of using mca_base_framework_open. fixes #544 Signed-off-by: Nathan Hjelm <hjelmn@lanl.gov>
53 строки
1.8 KiB
C
53 строки
1.8 KiB
C
/*
|
|
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
|
* University Research and Technology
|
|
* Corporation. All rights reserved.
|
|
* Copyright (c) 2004-2015 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) 2009 Cisco Systems, Inc. All rights reserved.
|
|
* Copyright (c) 2012-2015 Inria. All rights reserved.
|
|
* $COPYRIGHT$
|
|
*
|
|
* Additional copyrights may follow
|
|
*
|
|
* $HEADER$
|
|
*/
|
|
|
|
#include "ompi_config.h"
|
|
|
|
#include <stdio.h>
|
|
|
|
#include "ompi/constants.h"
|
|
#include "ompi/mca/topo/base/base.h"
|
|
|
|
|
|
/* This function is invoked by the top-level MPI API functions to
|
|
lazily load the topo framework components (if it wasn't already --
|
|
it's safe to invoke this function multiple times). We do this
|
|
because most MPI apps don't use MPI topology functions, so we might
|
|
as well not load them unless we have to. */
|
|
int mca_topo_base_lazy_init(void)
|
|
{
|
|
int err;
|
|
|
|
if (!mca_base_framework_is_open (&ompi_topo_base_framework)) {
|
|
/**
|
|
* Register and open all available components, giving them a chance to access the MCA parameters.
|
|
*/
|
|
mca_base_framework_open (&ompi_topo_base_framework, MCA_BASE_REGISTER_DEFAULT);
|
|
if (OMPI_SUCCESS !=
|
|
(err = mca_topo_base_find_available(OPAL_ENABLE_PROGRESS_THREADS,
|
|
OMPI_ENABLE_THREAD_MULTIPLE))) {
|
|
return err;
|
|
}
|
|
}
|
|
|
|
return OMPI_SUCCESS;
|
|
}
|
|
|