9cd955badf
This commit fixes the following bugs: - opal_output_finalize did not properly set internal state. This caused problems when calling the sequence opal_output_init (), opal_output_finalize (), opal_output_init (). - opal_info support called mca_base_open () but never called the matching mca_base_close (). mca_base_open () and mca_base_close () have been updated to use a open count instead of an open flag to allow mca_base_open to be called through multiple paths (as may be the case when MPI_T is in use). - orte_info support did not register opal variables. This can cause orte-info to not return opal variables. - opal_info, orte_info, and ompi_info support have been updated to use a register count. - When opening the dl framework the reference count was added to ensure the framework stuck around. The framework being closed prematurely was a bug in the MCA base that has since been corrected. The increment (and associated decrement) have been removed. - dl/dlopen did not set the value of mca_dl_dlopen_component.filename_suffixes_mca_storage on each call to register. Instead the value was set in the component structure. This caused the value to be lost when re-loading the component. Fixed by setting the default value in register. - Reset shmem framework state on close to avoid returning a stale component after reloading opal/shmem. - MCA base parameters were not properly deregistered when the MCA base was closed. This commit may fix #374. Signed-off-by: Nathan Hjelm <hjelmn@lanl.gov>
117 строки
3.5 KiB
C
117 строки
3.5 KiB
C
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
|
|
/*
|
|
* Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
|
|
* University Research and Technology
|
|
* Corporation. All rights reserved.
|
|
* Copyright (c) 2004-2011 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) 2006-2014 Cisco Systems, Inc. All rights reserved.
|
|
* Copyright (c) 2010-2015 Los Alamos National Security, LLC.
|
|
* All rights reserved.
|
|
* Copyright (c) 2011-2012 University of Houston. All rights reserved.
|
|
* $COPYRIGHT$
|
|
*
|
|
* Additional copyrights may follow
|
|
*
|
|
* $HEADER$
|
|
*/
|
|
|
|
#include "orte_config.h"
|
|
#include "orte/constants.h"
|
|
#include "orte/types.h"
|
|
|
|
#include "opal/class/opal_pointer_array.h"
|
|
#include "opal/util/argv.h"
|
|
#include "opal/runtime/opal_info_support.h"
|
|
|
|
#include "orte/include/orte/frameworks.h"
|
|
#include "orte/util/proc_info.h"
|
|
#include "orte/runtime/runtime.h"
|
|
#include "orte/runtime/orte_globals.h"
|
|
|
|
#include "orte/runtime/orte_info_support.h"
|
|
|
|
const char *orte_info_type_orte = "orte";
|
|
|
|
static int orte_info_registered = 0;
|
|
|
|
void orte_info_register_types(opal_pointer_array_t *mca_types)
|
|
{
|
|
int i;
|
|
|
|
/* add the top-level type */
|
|
opal_pointer_array_add(mca_types, "orte");
|
|
|
|
/* push all the types found by autogen */
|
|
for (i=0; NULL != orte_frameworks[i]; i++) {
|
|
opal_pointer_array_add(mca_types, orte_frameworks[i]->framework_name);
|
|
}
|
|
}
|
|
|
|
int orte_info_register_framework_params(opal_pointer_array_t *component_map)
|
|
{
|
|
int rc;
|
|
|
|
if (orte_info_registered++) {
|
|
return ORTE_SUCCESS;
|
|
}
|
|
|
|
/* Register the ORTE layer's MCA parameters */
|
|
|
|
if (ORTE_SUCCESS != (rc = orte_register_params()) &&
|
|
ORTE_ERR_BAD_PARAM != rc) {
|
|
fprintf(stderr, "orte_info_register: orte_register_params failed\n");
|
|
return rc;
|
|
}
|
|
|
|
rc = opal_info_register_framework_params(component_map);
|
|
if (OPAL_SUCCESS != rc) {
|
|
return rc;
|
|
}
|
|
|
|
return opal_info_register_project_frameworks("orte", orte_frameworks, component_map);
|
|
}
|
|
|
|
void orte_info_close_components(void)
|
|
{
|
|
int i;
|
|
|
|
assert (orte_info_registered);
|
|
if (--orte_info_registered) {
|
|
return;
|
|
}
|
|
|
|
for (i=0; NULL != orte_frameworks[i]; i++) {
|
|
(void) mca_base_framework_close(orte_frameworks[i]);
|
|
}
|
|
|
|
opal_info_close_components ();
|
|
}
|
|
|
|
void orte_info_show_orte_version(const char *scope)
|
|
{
|
|
char *tmp, *tmp2;
|
|
|
|
asprintf(&tmp, "%s:version:full", orte_info_type_orte);
|
|
tmp2 = opal_info_make_version_str(scope,
|
|
ORTE_MAJOR_VERSION, ORTE_MINOR_VERSION,
|
|
ORTE_RELEASE_VERSION,
|
|
ORTE_GREEK_VERSION,
|
|
ORTE_REPO_REV);
|
|
opal_info_out("Open RTE", tmp, tmp2);
|
|
free(tmp);
|
|
free(tmp2);
|
|
asprintf(&tmp, "%s:version:repo", orte_info_type_orte);
|
|
opal_info_out("Open RTE repo revision", tmp, ORTE_REPO_REV);
|
|
free(tmp);
|
|
asprintf(&tmp, "%s:version:release_date", orte_info_type_orte);
|
|
opal_info_out("Open RTE release date", tmp, ORTE_RELEASE_DATE);
|
|
free(tmp);
|
|
}
|
|
|