78a13bc3ea
yesterday and set it to "true" in orte_init(). But ompi_mpi_init() doesn't call orte_init() -- it calls orte_init_stage1() and orte_init_stage2(). So orte_initialized was never set to true, and Badness happend from there (w.r.t. ompi_mpi_abort()). This patch moves the setting of orte_initialized to orte_init_stage2() so that everyone will always get it set properly. It also moves setting orte_universe_info.state to RUNNING into stage2() as well -- Ralph confirmed that that should have been there for the same reasons that orte_initialized needs to be there. This commit was SVN r13374.
58 строки
1.5 KiB
C
58 строки
1.5 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) 2007 Cisco Systems, Inc. All rights reserved.
|
|
* $COPYRIGHT$
|
|
*
|
|
* Additional copyrights may follow
|
|
*
|
|
* $HEADER$
|
|
*/
|
|
|
|
/** @file **/
|
|
|
|
#include "orte_config.h"
|
|
|
|
#include "orte/orte_constants.h"
|
|
#include "orte/mca/errmgr/errmgr.h"
|
|
#include "orte/runtime/params.h"
|
|
|
|
#include "opal/runtime/opal.h"
|
|
#include "orte/runtime/runtime.h"
|
|
|
|
/**
|
|
* Initialze and setup a process in the ORTE.
|
|
*
|
|
* @retval ORTE_SUCCESS Upon success.
|
|
* @retval ORTE_ERROR Upon failure.
|
|
*/
|
|
|
|
int orte_init(bool infrastructure)
|
|
{
|
|
int rc;
|
|
|
|
if (orte_initialized) {
|
|
return ORTE_SUCCESS;
|
|
}
|
|
|
|
if (ORTE_SUCCESS != (rc = opal_init())) {
|
|
ORTE_ERROR_LOG(rc);
|
|
return rc;
|
|
}
|
|
|
|
if (ORTE_SUCCESS != (rc = orte_system_init(infrastructure))) {
|
|
ORTE_ERROR_LOG(rc);
|
|
return rc;
|
|
}
|
|
|
|
return ORTE_SUCCESS;
|
|
}
|