fceabb2498
This is a fairly intrusive change, but outside of the moving of opal/event to opal/mca/event, the only changes involved (a) changing all calls to opal_event functions to reflect the new framework instead, and (b) ensuring that all opal_event_t objects are properly constructed since they are now true opal_objects. Note: Shiqing has just returned from vacation and has not yet had a chance to complete the Windows integration. Thus, this commit almost certainly breaks Windows support on the trunk. However, I want this to have a chance to soak for as long as possible before I become less available a week from today (going to be at a class for 5 days, and thus will only be sparingly available) so we can find and fix any problems. Biggest change is moving the libevent code from opal/event to a new opal/mca/event framework. This was done to make it much easier to update libevent in the future. New versions can be inserted as a new component and tested in parallel with the current version until validated, then we can remove the earlier version if we so choose. This is a statically built framework ala installdirs, so only one component will build at a time. There is no selection logic - the sole compiled component simply loads its function pointers into the opal_event struct. I have gone thru the code base and converted all the libevent calls I could find. However, I cannot compile nor test every environment. It is therefore quite likely that errors remain in the system. Please keep an eye open for two things: 1. compile-time errors: these will be obvious as calls to the old functions (e.g., opal_evtimer_new) must be replaced by the new framework APIs (e.g., opal_event.evtimer_new) 2. run-time errors: these will likely show up as segfaults due to missing constructors on opal_event_t objects. It appears that it became a typical practice for people to "init" an opal_event_t by simply using memset to zero it out. This will no longer work - you must either OBJ_NEW or OBJ_CONSTRUCT an opal_event_t. I tried to catch these cases, but may have missed some. Believe me, you'll know when you hit it. There is also the issue of the new libevent "no recursion" behavior. As I described on a recent email, we will have to discuss this and figure out what, if anything, we need to do. This commit was SVN r23925.
303 строки
11 KiB
C
303 строки
11 KiB
C
/*
|
|
* Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
|
|
* University Research and Technology
|
|
* Corporation. All rights reserved.
|
|
* Copyright (c) 2004-2007 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-2006 The Regents of the University of California.
|
|
* All rights reserved.
|
|
* Copyright (c) 2007 Los Alamos National Security, LLC. All rights
|
|
* reserved.
|
|
* Copyright (c) 2008 Cisco Systems, Inc. All rights reserved.
|
|
* $COPYRIGHT$
|
|
*
|
|
* Additional copyrights may follow
|
|
*
|
|
* $HEADER$
|
|
*/
|
|
|
|
#include "ompi_config.h"
|
|
#include "opal/util/output.h"
|
|
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include "ompi/runtime/ompi_cr.h"
|
|
#include "ompi/mca/bml/base/base.h"
|
|
#include "ompi/mca/btl/base/base.h"
|
|
#include "ompi/mca/bml/base/bml_base_btl.h"
|
|
#include "ompi/mca/pml/base/base.h"
|
|
#include "orte/mca/grpcomm/grpcomm.h"
|
|
#include "ompi/proc/proc.h"
|
|
|
|
#include "bml_r2.h"
|
|
#include "bml_r2_ft.h"
|
|
|
|
int mca_bml_r2_ft_event(int state)
|
|
{
|
|
static bool first_continue_pass = false;
|
|
ompi_proc_t** procs = NULL;
|
|
size_t num_procs;
|
|
size_t btl_idx;
|
|
int ret, p;
|
|
int loc_state;
|
|
int param_type = -1;
|
|
char *param_list = NULL;
|
|
|
|
if(OPAL_CRS_CHECKPOINT == state) {
|
|
/* Do nothing for now */
|
|
}
|
|
else if(OPAL_CRS_CONTINUE == state) {
|
|
first_continue_pass = !first_continue_pass;
|
|
|
|
/* Since nothing in Checkpoint, we are fine here (unless required by BTL) */
|
|
if( orte_cr_continue_like_restart && !first_continue_pass) {
|
|
procs = ompi_proc_all(&num_procs);
|
|
if(NULL == procs) {
|
|
return OMPI_ERR_OUT_OF_RESOURCE;
|
|
}
|
|
}
|
|
}
|
|
else if(OPAL_CRS_RESTART_PRE == state ) {
|
|
/* Nothing here */
|
|
}
|
|
else if(OPAL_CRS_RESTART == state ) {
|
|
procs = ompi_proc_all(&num_procs);
|
|
if(NULL == procs) {
|
|
return OMPI_ERR_OUT_OF_RESOURCE;
|
|
}
|
|
}
|
|
else if(OPAL_CRS_TERM == state ) {
|
|
;
|
|
}
|
|
else {
|
|
;
|
|
}
|
|
|
|
/* Never call the ft_event functions attached to the BTLs on the second
|
|
* pass of RESTART since on the first pass they were unloaded and therefore
|
|
* no longer exist.
|
|
*/
|
|
if( OPAL_CRS_RESTART != state ) {
|
|
if( OPAL_CRS_CONTINUE == state && !first_continue_pass ) {
|
|
;
|
|
} else {
|
|
/* Since we only ever call into the BTLs once during the first restart
|
|
* pass, just lie to them on this pass for a bit of local clarity.
|
|
*/
|
|
if( OPAL_CRS_RESTART_PRE == state ) {
|
|
loc_state = OPAL_CRS_RESTART;
|
|
} else {
|
|
loc_state = state;
|
|
}
|
|
|
|
/*
|
|
* Call ft_event in:
|
|
* - BTL modules
|
|
* - MPool modules
|
|
*
|
|
* These should be cleaning out stale state, and memory references in
|
|
* preparation for being shut down.
|
|
*/
|
|
for(btl_idx = 0; btl_idx < mca_bml_r2.num_btl_modules; btl_idx++) {
|
|
/*
|
|
* Notify Mpool
|
|
*/
|
|
if( NULL != (mca_bml_r2.btl_modules[btl_idx])->btl_mpool &&
|
|
NULL != (mca_bml_r2.btl_modules[btl_idx])->btl_mpool->mpool_ft_event ) {
|
|
opal_output_verbose(10, ompi_cr_output,
|
|
"bml:r2: ft_event: Notify the %s MPool.\n",
|
|
(mca_bml_r2.btl_modules[btl_idx])->btl_mpool->mpool_component->mpool_version.mca_component_name);
|
|
if(OMPI_SUCCESS != (ret = (mca_bml_r2.btl_modules[btl_idx])->btl_mpool->mpool_ft_event(loc_state) ) ) {
|
|
continue;
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Notify BTL
|
|
*/
|
|
if( NULL != (mca_bml_r2.btl_modules[btl_idx])->btl_ft_event) {
|
|
opal_output_verbose(10, ompi_cr_output,
|
|
"bml:r2: ft_event: Notify the %s BTL.\n",
|
|
(mca_bml_r2.btl_modules[btl_idx])->btl_component->btl_version.mca_component_name);
|
|
if(OMPI_SUCCESS != (ret = (mca_bml_r2.btl_modules[btl_idx])->btl_ft_event(loc_state) ) ) {
|
|
continue;
|
|
}
|
|
}
|
|
}
|
|
} /* OPAL_CRS_CONTINUE == state && !first_continue_pass */
|
|
}
|
|
|
|
if(OPAL_CRS_CHECKPOINT == state) {
|
|
;
|
|
}
|
|
else if(OPAL_CRS_CONTINUE == state) {
|
|
/* Matches OPAL_CRS_RESTART_PRE */
|
|
if( orte_cr_continue_like_restart && first_continue_pass) {
|
|
if( OMPI_SUCCESS != (ret = mca_bml_r2_finalize()) ) {
|
|
opal_output(0, "bml:r2: ft_event(Restart): Failed to finalize BML framework\n");
|
|
return ret;
|
|
}
|
|
if( OMPI_SUCCESS != (ret = mca_btl_base_close()) ) {
|
|
opal_output(0, "bml:r2: ft_event(Restart): Failed to close BTL framework\n");
|
|
return ret;
|
|
}
|
|
}
|
|
/* Matches OPAL_CRS_RESTART */
|
|
else if( orte_cr_continue_like_restart && !first_continue_pass ) {
|
|
/*
|
|
* Barrier to make all processes have been successfully restarted before
|
|
* we try to remove some restart only files.
|
|
*/
|
|
if (OMPI_SUCCESS != (ret = orte_grpcomm.barrier())) {
|
|
opal_output(0, "bml:r2: ft_event(Restart): Failed in orte_grpcomm.barrier (%d)", ret);
|
|
return ret;
|
|
}
|
|
|
|
/*
|
|
* Re-open the BTL framework to get the full list of components.
|
|
*/
|
|
if( OMPI_SUCCESS != (ret = mca_btl_base_open()) ) {
|
|
opal_output(0, "bml:r2: ft_event(Restart): Failed to open BTL framework\n");
|
|
return ret;
|
|
}
|
|
|
|
/*
|
|
* Re-select the BTL components/modules
|
|
* This will cause the BTL components to discover the available
|
|
* network options on this machine, and post proper modex informaiton.
|
|
*/
|
|
if( OMPI_SUCCESS != (ret = mca_btl_base_select(OMPI_ENABLE_PROGRESS_THREADS,
|
|
OMPI_ENABLE_THREAD_MULTIPLE) ) ) {
|
|
opal_output(0, "bml:r2: ft_event(Restart): Failed to select in BTL framework\n");
|
|
return ret;
|
|
}
|
|
|
|
/*
|
|
* Clear some structures so we can properly repopulate them
|
|
*/
|
|
mca_bml_r2.btls_added = false;
|
|
|
|
for(p = 0; p < (int)num_procs; ++p) {
|
|
if( NULL != procs[p]->proc_bml) {
|
|
OBJ_RELEASE(procs[p]->proc_bml);
|
|
procs[p]->proc_bml = NULL;
|
|
}
|
|
|
|
OBJ_RELEASE(procs[p]);
|
|
}
|
|
|
|
if( NULL != procs ) {
|
|
free(procs);
|
|
procs = NULL;
|
|
}
|
|
}
|
|
}
|
|
else if(OPAL_CRS_RESTART_PRE == state ) {
|
|
opal_output_verbose(10, ompi_cr_output,
|
|
"bml:r2: ft_event(Restart): Finalize BML\n");
|
|
|
|
/*
|
|
* Finalize the BML
|
|
* - Flush progress functions
|
|
* - Flush module references
|
|
* - mca_btl_base_close()
|
|
* Need to do this because we may have BTL components that were
|
|
* unloaded in the first selection that may be available now.
|
|
* Conversely we may have BTL components loaded now that
|
|
* are not available now.
|
|
*/
|
|
if( OMPI_SUCCESS != (ret = mca_bml_r2_finalize()) ) {
|
|
opal_output(0, "bml:r2: ft_event(Restart): Failed to finalize BML framework\n");
|
|
return ret;
|
|
}
|
|
if( OMPI_SUCCESS != (ret = mca_btl_base_close()) ) {
|
|
opal_output(0, "bml:r2: ft_event(Restart): Failed to close BTL framework\n");
|
|
return ret;
|
|
}
|
|
}
|
|
else if(OPAL_CRS_RESTART == state ) {
|
|
|
|
/*
|
|
* Barrier to make all processes have been successfully restarted before
|
|
* we try to remove some restart only files.
|
|
*/
|
|
if (OMPI_SUCCESS != (ret = orte_grpcomm.barrier())) {
|
|
opal_output(0, "bml:r2: ft_event(Restart): Failed in orte_grpcomm.barrier (%d)", ret);
|
|
return ret;
|
|
}
|
|
|
|
/*
|
|
* Re-open the BTL framework to get the full list of components.
|
|
* - but first clear the MCA value that was there
|
|
*/
|
|
param_type = mca_base_param_find("btl", NULL, NULL);
|
|
mca_base_param_lookup_string(param_type, ¶m_list);
|
|
opal_output_verbose(11, ompi_cr_output,
|
|
"Restart (Previous BTL MCA): <%s>\n", param_list);
|
|
if( NULL != param_list ) {
|
|
free(param_list);
|
|
param_list = NULL;
|
|
}
|
|
|
|
/* Deregister the old value, and refresh the file cache to grab any updates */
|
|
mca_base_param_deregister(param_type);
|
|
mca_base_param_recache_files(false);
|
|
|
|
if( OMPI_SUCCESS != (ret = mca_btl_base_open()) ) {
|
|
opal_output(0, "bml:r2: ft_event(Restart): Failed to open BTL framework\n");
|
|
return ret;
|
|
}
|
|
|
|
param_type = mca_base_param_find("btl", NULL, NULL);
|
|
mca_base_param_lookup_string(param_type, ¶m_list);
|
|
opal_output_verbose(11, ompi_cr_output,
|
|
"Restart (New BTL MCA): <%s>\n", param_list);
|
|
if( NULL != param_list ) {
|
|
free(param_list);
|
|
param_list = NULL;
|
|
}
|
|
|
|
/*
|
|
* Re-select the BTL components/modules
|
|
* This will cause the BTL components to discover the available
|
|
* network options on this machine, and post proper modex informaiton.
|
|
*/
|
|
if( OMPI_SUCCESS != (ret = mca_btl_base_select(OMPI_ENABLE_PROGRESS_THREADS,
|
|
OMPI_ENABLE_THREAD_MULTIPLE) ) ) {
|
|
opal_output(0, "bml:r2: ft_event(Restart): Failed to select in BTL framework\n");
|
|
return ret;
|
|
}
|
|
|
|
/*
|
|
* Clear some structures so we can properly repopulate them
|
|
*/
|
|
mca_bml_r2.btls_added = false;
|
|
|
|
for(p = 0; p < (int)num_procs; ++p) {
|
|
if( NULL != procs[p]->proc_bml) {
|
|
OBJ_RELEASE(procs[p]->proc_bml);
|
|
procs[p]->proc_bml = NULL;
|
|
}
|
|
|
|
OBJ_RELEASE(procs[p]);
|
|
}
|
|
|
|
if( NULL != procs ) {
|
|
free(procs);
|
|
procs = NULL;
|
|
}
|
|
}
|
|
else if(OPAL_CRS_TERM == state ) {
|
|
;
|
|
}
|
|
else {
|
|
;
|
|
}
|
|
|
|
return OMPI_SUCCESS;
|
|
}
|