ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

Fix the configure logic for --with-ft so that it properly takes a comma separated list.

Просмотр исходного кода 
Many of the OPAL_ENABLE_FT should be OPAL_ENABLE_FT_CR, so fix those.

The OPAL Layer INC should call opal_output on restart so that it can refresh the string it prints to reflect the current pid/hostname which may have changed.

This commit was SVN r22824.
Этот коммит содержится в:
Josh Hursey 2010-03-12 23:57:50 +00:00
родитель f3848f169b
Коммит e9b5162d79
58 изменённых файлов: 252 добавлений и 229 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
ompi/mca/btl/mx/btl_mx.c
Просмотреть файл

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
* Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
* University Research and Technology
* Corporation. All rights reserved.
* Copyright (c) 2004-2008 The University of Tennessee and The University
@ -19,7 +19,7 @@
#include "ompi_config.h"
#include "opal/class/opal_bitmap.h"
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
#include "ompi/runtime/ompi_cr.h"
#endif
@ -621,7 +621,7 @@ int mca_btl_mx_finalize( struct mca_btl_base_module_t* btl )
}
#if OPAL_ENABLE_FT == 0
#if OPAL_ENABLE_FT_CR == 0
int mca_btl_mx_ft_event(int state) {
return OMPI_SUCCESS;
}
@ -667,7 +667,7 @@ int mca_btl_mx_ft_event(int state) {
return OMPI_SUCCESS;
}
#endif /* OPAL_ENABLE_FT */
#endif /* OPAL_ENABLE_FT_CR */
mca_btl_mx_module_t mca_btl_mx_module = {
{

8
ompi/mca/btl/openib/btl_openib.c
Просмотреть файл

@ -1,6 +1,6 @@
/* -*- Mode: C; c-basic-offset:4 ; -*- */
/*
* Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
* Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
* University Research and Technology
* Corporation. All rights reserved.
* Copyright (c) 2004-2008 The University of Tennessee and The University
@ -36,7 +36,7 @@
#include "ompi/mca/btl/btl.h"
#include "ompi/mca/btl/base/btl_base_error.h"
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
#include "ompi/runtime/ompi_cr.h"
#endif
@ -1711,7 +1711,7 @@ int mca_btl_openib_get(mca_btl_base_module_t* btl,
return OMPI_SUCCESS;
}
#if OPAL_ENABLE_FT == 0
#if OPAL_ENABLE_FT_CR == 0
int mca_btl_openib_ft_event(int state) {
return OMPI_SUCCESS;
}
@ -1760,4 +1760,4 @@ int mca_btl_openib_ft_event(int state) {
return OMPI_SUCCESS;
}
#endif /* OPAL_ENABLE_FT */
#endif /* OPAL_ENABLE_FT_CR */

8
ompi/mca/btl/sm/btl_sm.c
Просмотреть файл

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
* Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
* University Research and Technology
* Corporation. All rights reserved.
* Copyright (c) 2004-2009 The University of Tennessee and The University
@ -47,7 +47,7 @@
#include <knem_io.h>
#endif
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
#include "opal/mca/crs/base/base.h"
#include "opal/util/basename.h"
#include "ompi/runtime/ompi_cr.h"
@ -1091,7 +1091,7 @@ int mca_btl_sm_get_async(struct mca_btl_base_module_t* btl,
#endif
#if OPAL_ENABLE_FT == 0
#if OPAL_ENABLE_FT_CR == 0
int mca_btl_sm_ft_event(int state) {
return OMPI_SUCCESS;
}
@ -1158,4 +1158,4 @@ int mca_btl_sm_ft_event(int state) {
return OMPI_SUCCESS;
}
#endif /* OPAL_ENABLE_FT */
#endif /* OPAL_ENABLE_FT_CR */

6
ompi/mca/btl/sm/btl_sm_component.c
Просмотреть файл

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
* Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
* University Research and Technology
* Corporation. All rights reserved.
* Copyright (c) 2004-2009 The University of Tennessee and The University
@ -51,7 +51,7 @@
#include "ompi/mca/common/sm/common_sm_mmap.h"
#include "ompi/mca/btl/base/btl_base_error.h"
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
#include "opal/runtime/opal_cr.h"
#endif
@ -277,7 +277,7 @@ int mca_btl_sm_component_close(void)
* to it are gone - no error checking, since we want all procs
* to call this, so that in an abnormal termination scenario,
* this file will still get cleaned up */
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
/* Only unlink the file if we are *not* restarting
* If we are restarting the file will be unlinked at a later time.
*/

4
ompi/mca/crcp/bkmrk/configure.m4
Просмотреть файл

@ -1,6 +1,6 @@
# -*- shell-script -*-
#
# Copyright (c) 2004-2007 The Trustees of Indiana University.
# Copyright (c) 2004-2010 The Trustees of Indiana University.
# All rights reserved.
# Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
# All rights reserved.
@ -19,7 +19,7 @@
# -----------------------------------------------------------
AC_DEFUN([MCA_crcp_bkmrk_CONFIG],[
# If we don't want FT, don't compile this component
AS_IF([test "$ompi_want_ft" = "1"],
AS_IF([test "$ompi_want_ft_cr" = "1"],
[$1],
[$2])
])dnl

4
ompi/mca/crcp/crcp.h
Просмотреть файл

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana
* Copyright (c) 2004-2010 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
@ -349,7 +349,7 @@ OMPI_DECLSPEC extern ompi_crcp_base_module_t ompi_crcp;
/**
* Macro to call the CRCP Request Complete function
*/
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
#define OMPI_CRCP_REQUEST_COMPLETE(req) \
if( NULL != ompi_crcp.request_complete) { \
ompi_crcp.request_complete(req); \

4
ompi/mca/mpool/sm/mpool_sm_component.c
Просмотреть файл

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
* Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
* University Research and Technology
* Corporation. All rights reserved.
* Copyright (c) 2004-2006 The University of Tennessee and The University
@ -36,7 +36,7 @@
#include "ompi/mca/common/sm/common_sm_mmap.h"
#include "ompi/proc/proc.h"
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
#include "opal/runtime/opal_cr.h"
#endif

10
ompi/mca/mpool/sm/mpool_sm_module.c
Просмотреть файл

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
* Copyright (c) 2004-2010 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
@ -29,7 +29,7 @@
#include "opal/mca/maffinity/base/base.h"
#include "orte/util/proc_info.h"
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
#include "ompi/mca/mpool/base/base.h"
#include "ompi/runtime/ompi_cr.h"
#endif
@ -135,7 +135,7 @@ static void sm_module_finalize(mca_mpool_base_module_t* module)
if (NULL != sm_module->sm_common_mmap) {
if (OMPI_SUCCESS ==
mca_common_sm_mmap_fini(sm_module->sm_common_mmap)) {
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
/* Only unlink the file if we are *not* restarting. If we
are restarting the file will be unlinked at a later
time. */
@ -152,7 +152,7 @@ static void sm_module_finalize(mca_mpool_base_module_t* module)
}
}
#if OPAL_ENABLE_FT == 0
#if OPAL_ENABLE_FT_CR == 0
int mca_mpool_sm_ft_event(int state) {
return OMPI_SUCCESS;
}
@ -209,4 +209,4 @@ int mca_mpool_sm_ft_event(int state) {
return OMPI_SUCCESS;
}
#endif /* OPAL_ENABLE_FT */
#endif /* OPAL_ENABLE_FT_CR */

6
ompi/mca/pml/base/pml_base_open.c
Просмотреть файл

@ -1,6 +1,6 @@
/* -*- Mode: C; c-basic-offset:4 ; -*- */
/*
* Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
* 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
@ -91,7 +91,7 @@ opal_pointer_array_t mca_pml_base_pml;
int mca_pml_base_open(void)
{
int value;
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
char* wrapper_pml = NULL;
#endif
@ -160,7 +160,7 @@ int mca_pml_base_open(void)
opal_pointer_array_add(&mca_pml_base_pml, strdup(default_pml));
}
}
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
/*
* Which PML Wrapper component to use, if any
* - NULL or "" = No wrapper

12
ompi/mca/pml/base/pml_base_select.c
Просмотреть файл

@ -1,6 +1,6 @@
/* -*- Mode: C; c-basic-offset:4 ; -*- */
/*
* Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
* 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
@ -69,7 +69,7 @@ int mca_pml_base_select(bool enable_progress_threads,
opal_list_t opened;
opened_component_t *om = NULL;
bool found_pml;
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
mca_pml_base_component_t *wrapper_component = NULL;
mca_pml_base_module_t *wrapper_module = NULL;
int wrapper_priority = -1;
@ -140,7 +140,7 @@ int mca_pml_base_select(bool enable_progress_threads,
opal_output_verbose( 10, mca_pml_base_output,
"select: init returned priority %d", priority );
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
/* Determine if this is the wrapper component */
if( priority <= PML_SELECT_WRAPPER_PRIORITY) {
opal_output_verbose( 10, mca_pml_base_output,
@ -205,7 +205,7 @@ int mca_pml_base_select(bool enable_progress_threads,
om = (opened_component_t *) item;
if (om->om_component != best_component
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
&& om->om_component != wrapper_component
#endif
) {
@ -228,7 +228,7 @@ int mca_pml_base_select(bool enable_progress_threads,
}
OBJ_DESTRUCT( &opened );
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
/* Remove the wrapper component from the mca_pml_base_components_available list
* so we don't unload it prematurely in the next call
*/
@ -266,7 +266,7 @@ int mca_pml_base_select(bool enable_progress_threads,
&mca_pml_base_components_available,
(mca_base_component_t *) best_component);
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
/* If we have a wrapper then initalize it */
if( NULL != wrapper_component ) {
priority = PML_SELECT_WRAPPER_PRIORITY;

4
ompi/mca/pml/crcpw/configure.m4
Просмотреть файл

@ -1,6 +1,6 @@
# -*- shell-script -*-
#
# Copyright (c) 2004-2007 The Trustees of Indiana University.
# Copyright (c) 2004-2010 The Trustees of Indiana University.
# All rights reserved.
# Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
# All rights reserved.
@ -19,7 +19,7 @@
# -----------------------------------------------------------
AC_DEFUN([MCA_pml_crcpw_CONFIG],[
# If we don't want FT, don't compile this component
AS_IF([test "$ompi_want_ft" = "1"],
AS_IF([test "$ompi_want_ft_cr" = "1"],
[$1],
[$2])
])dnl

8
ompi/mca/pml/csum/pml_csum.c
Просмотреть файл

@ -1,6 +1,6 @@
/* -*- Mode: C; c-basic-offset:4 ; -*- */
/*
* Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana
* Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
* University Research and Technology
* Corporation. All rights reserved.
* Copyright (c) 2004-2009 The University of Tennessee and The University
@ -340,7 +340,7 @@ int mca_pml_csum_add_procs(ompi_proc_t** procs, size_t nprocs)
* return failure as all processes will return the wrapper PML
* component in use instead of the wrapped PML component underneath.
*/
#if OPAL_ENABLE_FT == 0
#if OPAL_ENABLE_FT_CR == 0
/* make sure remote procs are using the same PML as us */
if (OMPI_SUCCESS != (rc = mca_pml_base_pml_check_selected("csum",
procs,
@ -637,7 +637,7 @@ void mca_pml_csum_error_handler(
orte_errmgr.abort(-1, NULL);
}
#if OPAL_ENABLE_FT == 0
#if OPAL_ENABLE_FT_CR == 0
int mca_pml_csum_ft_event( int state ) {
return OMPI_SUCCESS;
}
@ -858,7 +858,7 @@ int mca_pml_csum_ft_event( int state )
return OMPI_SUCCESS;
}
#endif /* OPAL_ENABLE_FT */
#endif /* OPAL_ENABLE_FT_CR */
int mca_pml_csum_com_btl_comp(const void *v1, const void *v2)
{

8
ompi/mca/pml/ob1/pml_ob1.c
Просмотреть файл

@ -1,6 +1,6 @@
/* -*- Mode: C; c-basic-offset:4 ; -*- */
/*
* Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana
* Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
* University Research and Technology
* Corporation. All rights reserved.
* Copyright (c) 2004-2009 The University of Tennessee and The University
@ -313,7 +313,7 @@ int mca_pml_ob1_add_procs(ompi_proc_t** procs, size_t nprocs)
* return failure as all processes will return the wrapper PML
* component in use instead of the wrapped PML component underneath.
*/
#if OPAL_ENABLE_FT == 0
#if OPAL_ENABLE_FT_CR == 0
/* make sure remote procs are using the same PML as us */
if (OMPI_SUCCESS != (rc = mca_pml_base_pml_check_selected("ob1",
procs,
@ -606,7 +606,7 @@ void mca_pml_ob1_error_handler(
orte_errmgr.abort(-1, NULL);
}
#if OPAL_ENABLE_FT == 0
#if OPAL_ENABLE_FT_CR == 0
int mca_pml_ob1_ft_event( int state ) {
return OMPI_SUCCESS;
}
@ -827,7 +827,7 @@ int mca_pml_ob1_ft_event( int state )
return OMPI_SUCCESS;
}
#endif /* OPAL_ENABLE_FT */
#endif /* OPAL_ENABLE_FT_CR */
int mca_pml_ob1_com_btl_comp(const void *v1, const void *v2)
{

10
ompi/request/req_wait.c
Просмотреть файл

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
* Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
* University Research and Technology
* Corporation. All rights reserved.
* Copyright (c) 2004-2006 The University of Tennessee and The University
@ -36,7 +36,7 @@ int ompi_request_default_wait(
ompi_request_wait_completion(req);
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
OMPI_CRCP_REQUEST_COMPLETE(req);
#endif
@ -193,7 +193,7 @@ finished:
*index = completed;
}
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
if( opal_cr_is_enabled) {
rptr = requests;
for (i = 0; i < count; i++, rptr++) {
@ -276,7 +276,7 @@ int ompi_request_default_wait_all( size_t count,
OPAL_THREAD_UNLOCK(&ompi_request_lock);
}
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
if( opal_cr_is_enabled) {
rptr = requests;
for (i = 0; i < count; i++, rptr++) {
@ -442,7 +442,7 @@ int ompi_request_default_wait_some(
finished:
#endif /* OPAL_ENABLE_PROGRESS_THREADS */
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
if( opal_cr_is_enabled) {
rptr = requests;
for (i = 0; i < count; i++, rptr++) {

6
ompi/runtime/ompi_mpi_finalize.c
Просмотреть файл

@ -1,6 +1,6 @@
/* -*- Mode: C; c-basic-offset:4 ; -*- */
/*
* Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
* Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
* University Research and Technology
* Corporation. All rights reserved.
* Copyright (c) 2004-2009 The University of Tennessee and The University
@ -78,7 +78,7 @@
#include "ompi/mca/dpm/base/base.h"
#include "ompi/mca/pubsub/base/base.h"
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
#include "ompi/mca/crcp/crcp.h"
#include "ompi/mca/crcp/base/base.h"
#endif
@ -308,7 +308,7 @@ int ompi_mpi_finalize(void)
/* shut down buffered send code */
mca_pml_base_bsend_fini();
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
/*
* Shutdown the CRCP Framework, must happen after PML shutdown
*/

8
ompi/runtime/ompi_mpi_init.c
Просмотреть файл

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
* Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
* University Research and Technology
* Corporation. All rights reserved.
* Copyright (c) 2004-2008 The University of Tennessee and The University
@ -90,7 +90,7 @@
#include "ompi/mca/dpm/base/base.h"
#include "ompi/mca/pubsub/base/base.h"
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
#include "ompi/mca/crcp/crcp.h"
#include "ompi/mca/crcp/base/base.h"
#endif
@ -546,7 +546,7 @@ int ompi_mpi_init(int argc, char **argv, int requested, int *provided)
goto error;
}
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
if (OMPI_SUCCESS != (ret = ompi_crcp_base_open())) {
error = "ompi_crcp_base_open() failed";
goto error;
@ -596,7 +596,7 @@ int ompi_mpi_init(int argc, char **argv, int requested, int *provided)
goto error;
}
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
if (OMPI_SUCCESS != (ret = ompi_crcp_base_select() ) ) {
error = "ompi_crcp_base_select() failed";
goto error;

7
ompi/tools/ompi-probe/ompi-probe.c
Просмотреть файл

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
* Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
* University Research and Technology
* Corporation. All rights reserved.
* Copyright (c) 2004-2006 The University of Tennessee and The University
@ -59,7 +59,7 @@ int main(int argc, char *argv[])
exit(1);
}
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
/* Disable the checkpoint notification routine for this
* tool. As we will never need to checkpoint this tool.
* Note: This must happen before opal_init().
@ -80,8 +80,9 @@ int main(int argc, char *argv[])
"1",
true, &environ);
free(tmp_env_var);
#endif
#else
tmp_env_var = NULL; /* Silence compiler warning */
#endif
/* open up and select all the frameworks - this will generate the
* profiled output

7
ompi/tools/ompi-server/ompi-server.c
Просмотреть файл

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
* Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
* University Research and Technology
* Corporation. All rights reserved.
* Copyright (c) 2004-2006 The University of Tennessee and The University
@ -160,7 +160,7 @@ int main(int argc, char *argv[])
opal_daemon_init(NULL);
}
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
/* Disable the checkpoint notification routine for this
* tool. As we will never need to checkpoint this tool.
* Note: This must happen before opal_init().
@ -181,8 +181,9 @@ int main(int argc, char *argv[])
"1",
true, &environ);
free(tmp_env_var);
#endif
#else
tmp_env_var = NULL; /* Silence compiler warning */
#endif
/* Perform the standard init, but flag that we are a tool
* so that we only open up the communications infrastructure. No

20
ompi/tools/ompi_info/components.c
Просмотреть файл

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
* Copyright (c) 2004-2010 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
@ -46,7 +46,7 @@
#include "opal/mca/timer/base/base.h"
#include "opal/mca/installdirs/installdirs.h"
#include "opal/mca/installdirs/base/base.h"
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
#include "opal/mca/crs/crs.h"
#include "opal/mca/crs/base/base.h"
#endif
@ -73,7 +73,7 @@
#include "ompi/mca/dpm/base/base.h"
#include "ompi/mca/op/base/base.h"
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
#include "ompi/mca/crcp/crcp.h"
#include "ompi/mca/crcp/base/base.h"
#endif
@ -107,7 +107,7 @@
#include "orte/mca/routed/base/base.h"
#include "orte/mca/plm/plm.h"
#include "orte/mca/plm/base/base.h"
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
#include "orte/mca/snapc/snapc.h"
#include "orte/mca/snapc/base/base.h"
#endif
@ -306,7 +306,7 @@ void ompi_info_open_components(void)
map->components = &opal_timer_base_components_opened;
opal_pointer_array_add(&component_map, map);
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
if (OPAL_SUCCESS != opal_crs_base_open()) {
goto error;
}
@ -435,7 +435,7 @@ void ompi_info_open_components(void)
map->components = &orte_plm_base.available_components;
opal_pointer_array_add(&component_map, map);
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
if (ORTE_SUCCESS != orte_snapc_base_open()) {
goto error;
}
@ -566,7 +566,7 @@ void ompi_info_open_components(void)
map->components = &ompi_op_base_components_opened;
opal_pointer_array_add(&component_map, map);
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
if (OMPI_SUCCESS != ompi_crcp_base_open()) {
goto error;
}
@ -622,7 +622,7 @@ void ompi_info_close_components()
* error?
*/
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
(void) ompi_crcp_base_close();
#endif
(void) ompi_op_base_close();
@ -643,7 +643,7 @@ void ompi_info_close_components()
(void) orte_ess_base_close();
(void) orte_show_help_finalize();
#if !ORTE_DISABLE_FULL_SUPPORT
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
(void) orte_snapc_base_close();
#endif
(void) orte_filem_base_close();
@ -667,7 +667,7 @@ void ompi_info_close_components()
(void) opal_carto_base_close();
(void) opal_maffinity_base_close();
(void) opal_timer_base_close();
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
(void) opal_crs_base_close();
#endif

8
ompi/tools/ompi_info/ompi_info.c
Просмотреть файл

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
* Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
* University Research and Technology
* Corporation. All rights reserved.
* Copyright (c) 2004-2006 The University of Tennessee and The University
@ -194,7 +194,7 @@ int main(int argc, char *argv[])
opal_pointer_array_add(&mca_types, "maffinity");
opal_pointer_array_add(&mca_types, "timer");
opal_pointer_array_add(&mca_types, "installdirs");
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
opal_pointer_array_add(&mca_types, "crs");
#endif
opal_pointer_array_add(&mca_types, "dpm");
@ -212,7 +212,7 @@ int main(int argc, char *argv[])
opal_pointer_array_add(&mca_types, "osc");
opal_pointer_array_add(&mca_types, "op");
opal_pointer_array_add(&mca_types, "common");
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
opal_pointer_array_add(&mca_types, "crcp");
#endif
@ -226,7 +226,7 @@ int main(int argc, char *argv[])
opal_pointer_array_add(&mca_types, "rml");
opal_pointer_array_add(&mca_types, "routed");
opal_pointer_array_add(&mca_types, "plm");
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
opal_pointer_array_add(&mca_types, "snapc");
#endif
opal_pointer_array_add(&mca_types, "filem");

47
opal/config/opal_configure_options.m4
Просмотреть файл

@ -1,6 +1,6 @@
dnl -*- shell-script -*-
dnl
dnl Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
dnl Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
dnl University Research and Technology
dnl Corporation. All rights reserved.
dnl Copyright (c) 2004-2005 The University of Tennessee and The University
@ -368,27 +368,32 @@ else
ompi_want_ft_cr=0
ompi_want_ft_type=none
# Default value
if test "$with_ft" = "" -o "$with_ft" = "yes"; then
ompi_want_ft_type=cr
ompi_want_ft_cr=1
elif test "$with_ft" = "LAM"; then
ompi_want_ft_type=lam
ompi_want_ft_cr=1
elif test "$with_ft" = "lam"; then
ompi_want_ft_type=lam
ompi_want_ft_cr=1
elif test "$with_ft" = "CR"; then
ompi_want_ft_type=cr
ompi_want_ft_cr=1
elif test "$with_ft" = "cr"; then
ompi_want_ft_type=cr
ompi_want_ft_cr=1
else
AC_MSG_RESULT([Unrecognized FT TYPE: $with_ft])
AC_MSG_ERROR([Cannot continue])
as_save_IFS=$IFS
IFS=","
for opt in $with_ft; do
IFS=$as_save_IFS
# Default value
if test "$opt" = "" -o "$opt" = "yes"; then
ompi_want_ft_cr=1
elif test "$opt" = "LAM"; then
ompi_want_ft_cr=1
elif test "$opt" = "lam"; then
ompi_want_ft_cr=1
elif test "$opt" = "CR"; then
ompi_want_ft_cr=1
elif test "$opt" = "cr"; then
ompi_want_ft_cr=1
else
AC_MSG_RESULT([Unrecognized FT TYPE: $opt])
AC_MSG_ERROR([Cannot continue])
fi
done
if test "$ompi_want_ft_cr" = 1; then
ompi_want_ft_type="cr"
fi
AC_MSG_RESULT([Enabled $with_ft ($ompi_want_ft_type)])
AC_MSG_RESULT([Enabled $ompi_want_ft_type (Specified $with_ft)])
AC_MSG_WARN([**************************************************])
AC_MSG_WARN([*** Fault Tolerance Integration into Open MPI is *])
AC_MSG_WARN([*** a research quality implementation, and care *])

4
opal/mca/crs/blcr/configure.m4
Просмотреть файл

@ -1,6 +1,6 @@
# -*- shell-script -*-
#
# Copyright (c) 2004-2007 The Trustees of Indiana University.
# Copyright (c) 2004-2010 The Trustees of Indiana University.
# All rights reserved.
# Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
# All rights reserved.
@ -31,7 +31,7 @@ AC_DEFUN([MCA_crs_blcr_CONFIG],[
check_crs_blcr_good="no"
# If we do not want FT, don't compile this component
AS_IF([test "$ompi_want_ft" = "0"],
AS_IF([test "$ompi_want_ft_cr" = "0"],
[$2
check_crs_blcr_good="no"],
[check_crs_blcr_good="yes"])

4
opal/mca/crs/self/configure.m4
Просмотреть файл

@ -1,6 +1,6 @@
# -*- shell-script -*-
#
# Copyright (c) 2004-2009 The Trustees of Indiana University.
# Copyright (c) 2004-2010 The Trustees of Indiana University.
# All rights reserved.
# Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
# All rights reserved.
@ -19,7 +19,7 @@
# -----------------------------------------------------------
AC_DEFUN([MCA_crs_self_CONFIG],[
# If we don't want FT, don't compile this component
AS_IF([test "$ompi_want_ft" = "1"],
AS_IF([test "$ompi_want_ft_cr" = "1"],
[crs_self_good="yes"],
[crs_self_good="no"])

7
opal/runtime/opal_cr.c
Просмотреть файл

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004-2009 The Trustees of Indiana University and Indiana
* Copyright (c) 2004-2010 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
@ -352,7 +352,7 @@ int opal_cr_init(void )
* the tools that this is not a checkpointable job.
* We don't need the CRS framework to be initalized.
*/
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
/*
* Open the checkpoint / restart service components
*/
@ -441,7 +441,7 @@ int opal_cr_finalize(void)
opal_cr_pipe_dir = NULL;
}
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
/*
* Close the checkpoint / restart service components
*/
@ -676,6 +676,7 @@ int opal_cr_coord(int state)
* functions will call it when needed. Just make sure we
* finalized this code so we don't get old socket addrs.
*/
opal_output_reopen_all();
}
else if (OPAL_CRS_TERM == state ) {
/* Do Continue Phase work in prep to terminate the application */

10
opal/runtime/opal_cr.h
Просмотреть файл

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004-2009 The Trustees of Indiana University and Indiana
* Copyright (c) 2004-2010 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
@ -149,7 +149,7 @@ typedef enum opal_cr_ckpt_cmd_state_t opal_cr_ckpt_cmd_state_t;
/*
* If not using FT then make the #defines noops
*/
#if OPAL_ENABLE_FT == 0
#if OPAL_ENABLE_FT == 0 || OPAL_ENABLE_FT_CR == 0
#define OPAL_CR_TEST_CHECKPOINT_READY() ;
#define OPAL_CR_TEST_CHECKPOINT_READY_STALL() ;
#define OPAL_CR_INIT_LIBRARY() ;
@ -158,12 +158,12 @@ typedef enum opal_cr_ckpt_cmd_state_t opal_cr_ckpt_cmd_state_t;
#define OPAL_CR_ENTER_LIBRARY() ;
#define OPAL_CR_EXIT_LIBRARY() ;
#define OPAL_CR_NOOP_PROGRESS() ;
#endif /* #if OPAL_ENABLE_FT == 0 */
#endif /* #if OPAL_ENABLE_FT == 0 || OPAL_ENABLE_FT_CR == 0 */
/*
* If using FT
*/
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
#define OPAL_CR_TEST_CHECKPOINT_READY() \
{ \
if(OPAL_UNLIKELY(opal_cr_is_enabled) ) { \
@ -216,7 +216,7 @@ typedef enum opal_cr_ckpt_cmd_state_t opal_cr_ckpt_cmd_state_t;
}
#endif /* OPAL_ENABLE_FT_THREAD == 1 */
#endif /* OPAL_ENABLE_FT == 1 */
#endif /* OPAL_ENABLE_FT_CR == 1 */
/*******************************
* Notification Routines

20
opal/util/output.c
Просмотреть файл

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
* Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
* University Research and Technology
* Corporation. All rights reserved.
* Copyright (c) 2004-2008 The University of Tennessee and The University
@ -216,6 +216,23 @@ bool opal_output_switch(int output_id, bool enable)
*/
void opal_output_reopen_all(void)
{
char *str;
char hostname[32];
str = getenv("OPAL_OUTPUT_STDERR_FD");
if (NULL != str) {
default_stderr_fd = atoi(str);
} else {
default_stderr_fd = -1;
}
gethostname(hostname, sizeof(hostname));
if( NULL != verbose.lds_prefix ) {
free(verbose.lds_prefix);
verbose.lds_prefix = NULL;
}
asprintf(&verbose.lds_prefix, "[%s:%05d] ", hostname, getpid());
#if 0
int i;
opal_output_stream_t lds;
@ -255,6 +272,7 @@ void opal_output_reopen_all(void)
*/
opal_output_open(&lds);
}
#endif
}

8
orte/mca/ess/base/ess_base_std_app.c
Просмотреть файл

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
* Copyright (c) 2004-2010 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
@ -42,7 +42,7 @@
#include "orte/mca/rmcast/base/base.h"
#include "orte/mca/plm/plm.h"
#include "orte/mca/filem/base/base.h"
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
#include "orte/mca/snapc/base/base.h"
#endif
#include "orte/util/proc_info.h"
@ -166,7 +166,7 @@ int orte_ess_base_app_setup(void)
}
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
/*
* Setup the SnapC
*/
@ -245,7 +245,7 @@ int orte_ess_base_app_finalize(void)
orte_cr_finalize();
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
orte_snapc_base_close();
#endif
orte_filem_base_close();

8
orte/mca/ess/base/ess_base_std_orted.c
Просмотреть файл

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
* Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
* University Research and Technology
* Corporation. All rights reserved.
* Copyright (c) 2004-2009 The University of Tennessee and The University
@ -47,7 +47,7 @@
#include "orte/mca/plm/base/base.h"
#include "orte/mca/odls/base/base.h"
#include "orte/mca/errmgr/errmgr.h"
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
#include "orte/mca/snapc/base/base.h"
#endif
#include "orte/mca/filem/base/base.h"
@ -343,7 +343,7 @@ int orte_ess_base_orted_setup(char **hosts)
goto error;
}
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
/*
* Setup the SnapC
*/
@ -419,7 +419,7 @@ int orte_ess_base_orted_finalize(void)
orte_cr_finalize();
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
orte_snapc_base_close();
#endif
orte_filem_base_close();

8
orte/mca/ess/base/ess_base_std_tool.c
Просмотреть файл

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004-2009 The Trustees of Indiana University and Indiana
* Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
* University Research and Technology
* Corporation. All rights reserved.
* Copyright (c) 2004-2009 The University of Tennessee and The University
@ -37,7 +37,7 @@
#include "orte/mca/routed/base/base.h"
#include "orte/mca/errmgr/errmgr.h"
#include "orte/mca/iof/base/base.h"
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
#include "orte/mca/snapc/base/base.h"
#endif
#include "orte/util/proc_info.h"
@ -153,7 +153,7 @@ int orte_ess_base_tool_setup(void)
}
}
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
/*
* Setup the SnapC
*/
@ -186,7 +186,7 @@ int orte_ess_base_tool_finalize(void)
{
orte_wait_finalize();
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
orte_snapc_base_close();
#endif

10
orte/mca/ess/env/ess_env_module.c поставляемый
Просмотреть файл

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
* Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
* University Research and Technology
* Corporation. All rights reserved.
* Copyright (c) 2004-2009 The University of Tennessee and The University
@ -55,7 +55,7 @@
#include "orte/mca/plm/base/base.h"
#include "orte/mca/rmaps/base/base.h"
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
#include "orte/mca/snapc/base/base.h"
#endif
#include "orte/mca/filem/base/base.h"
@ -85,7 +85,7 @@ static orte_node_rank_t proc_get_node_rank(orte_process_name_t *proc);
static int update_pidmap(opal_byte_object_t *bo);
static int update_nidmap(opal_byte_object_t *bo);
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
static int rte_ft_event(int state);
#endif
@ -100,7 +100,7 @@ orte_ess_base_module_t orte_ess_env_module = {
proc_get_node_rank,
update_pidmap,
update_nidmap,
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
rte_ft_event
#else
NULL
@ -409,7 +409,7 @@ static int env_set_name(void)
return ORTE_SUCCESS;
}
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
static int rte_ft_event(int state)
{
int ret, exit_status = ORTE_SUCCESS;

8
orte/mca/ess/hnp/ess_hnp_module.c
Просмотреть файл

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
* Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
* University Research and Technology
* Corporation. All rights reserved.
* Copyright (c) 2004-2009 The University of Tennessee and The University
@ -56,7 +56,7 @@
#include "orte/mca/rmcast/base/base.h"
#include "orte/mca/rmaps/base/base.h"
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
#include "orte/mca/snapc/base/base.h"
#endif
#include "orte/mca/filem/base/base.h"
@ -502,7 +502,7 @@ static int rte_init(void)
goto error;
}
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
/*
* Setup the SnapC
*/
@ -611,7 +611,7 @@ static int rte_finalize(void)
orte_cr_finalize();
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
orte_snapc_base_close();
#endif
orte_filem_base_close();

10
orte/mca/ess/slave/ess_slave_module.c
Просмотреть файл

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
* Copyright (c) 2004-2010 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
@ -53,7 +53,7 @@
#include "orte/mca/plm/base/base.h"
#include "orte/mca/rmaps/base/base.h"
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
#include "orte/mca/snapc/base/base.h"
#endif
#include "orte/mca/filem/base/base.h"
@ -83,7 +83,7 @@ static orte_node_rank_t proc_get_node_rank(orte_process_name_t *proc);
static int update_pidmap(opal_byte_object_t *bo);
static int update_nidmap(opal_byte_object_t *bo);
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
static int rte_ft_event(int state);
static int ess_slave_ft_event_update_process_info(orte_process_name_t proc, pid_t pid);
#endif
@ -99,7 +99,7 @@ orte_ess_base_module_t orte_ess_slave_module = {
proc_get_node_rank,
update_pidmap,
update_nidmap,
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
rte_ft_event
#else
NULL
@ -283,7 +283,7 @@ static int slave_set_name(void)
return ORTE_SUCCESS;
}
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
static int rte_ft_event(int state)
{
int ret, exit_status = ORTE_SUCCESS;

9
orte/mca/odls/base/odls_base_default_fns.c
Просмотреть файл

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
* Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
* University Research and Technology
* Corporation. All rights reserved.
* Copyright (c) 2004-2008 The University of Tennessee and The University
@ -67,7 +67,7 @@
#include "orte/runtime/orte_wait.h"
#include "orte/orted/orted.h"
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
#include "orte/mca/snapc/snapc.h"
#include "orte/mca/snapc/base/base.h"
#include "opal/mca/crs/crs.h"
@ -1344,7 +1344,7 @@ int orte_odls_base_default_launch_local(orte_jobid_t job,
apps = jobdat->apps;
num_apps = jobdat->num_apps;
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
/*
* Notify the local SnapC component regarding new job
*/
@ -1840,7 +1840,6 @@ int orte_odls_base_default_launch_local(orte_jobid_t job,
opal_condition_signal(&orte_odls_globals.cond);
OPAL_THREAD_UNLOCK(&orte_odls_globals.mutex);
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
/*
* OPAL CRS components need the opportunity to take action before a process
@ -1862,7 +1861,7 @@ int orte_odls_base_default_launch_local(orte_jobid_t job,
}
}
#endif
#endif
if (5 < opal_output_get_verbosity(orte_odls_globals.output)) {
opal_output(orte_odls_globals.output, "%s odls:launch: spawning child %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),

4
orte/mca/oob/tcp/oob_tcp.c
Просмотреть файл

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
* 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
@ -1900,7 +1900,7 @@ int mca_oob_tcp_set_addr(const orte_process_name_t* name, const char* uri)
/* Dummy function for when we are not using FT. */
#if OPAL_ENABLE_FT == 0
#if OPAL_ENABLE_FT_CR == 0
int mca_oob_tcp_ft_event(int state) {
return ORTE_SUCCESS;
}

6
orte/mca/plm/base/plm_base_launch_support.c
Просмотреть файл

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004-2009 The Trustees of Indiana University and Indiana
* Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
* University Research and Technology
* Corporation. All rights reserved.
* Copyright (c) 2004-2008 The University of Tennessee and The University
@ -46,7 +46,7 @@
#include "orte/mca/routed/routed.h"
#include "orte/mca/grpcomm/grpcomm.h"
#include "orte/mca/odls/odls.h"
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
#include "orte/mca/snapc/snapc.h"
#endif
#include "orte/mca/filem/filem.h"
@ -216,7 +216,7 @@ int orte_plm_base_setup_job(orte_job_t *jdata)
*** IS NOTHING WE NEED DO HERE TO SETUP IOF
***/
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
/*
* Notify the Global SnapC component regarding new job
*/

4
orte/mca/rml/ftrm/configure.m4
Просмотреть файл

@ -1,6 +1,6 @@
# -*- shell-script -*-
#
# Copyright (c) 2004-2007 The Trustees of Indiana University.
# Copyright (c) 2004-2010 The Trustees of Indiana University.
# All rights reserved.
# Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
# All rights reserved.
@ -19,7 +19,7 @@
# -----------------------------------------------------------
AC_DEFUN([MCA_rml_ftrm_CONFIG],[
# If we don't want FT, don't compile this component
AS_IF([test "$ompi_want_ft" = "1"],
AS_IF([test "$ompi_want_ft_cr" = "1"],
[$1],
[$2])
])dnl

4
orte/mca/rml/ftrm/rml_ftrm_component.c
Просмотреть файл

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
* Copyright (c) 2004-2010 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
@ -135,7 +135,7 @@ static int orte_rml_ftrm_open(void)
/* Enable this wrapper = RML_SELECT_WRAPPER_PRIORITY
* ow = -1 or never selected
*/
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
ftrm_priority = value;
#else
ftrm_priority = -1;

6
orte/mca/routed/binomial/routed_binomial.c
Просмотреть файл

@ -46,7 +46,7 @@ static orte_vpid_t get_routing_tree(opal_list_t *children);
static int get_wireup_info(opal_buffer_t *buf);
static int set_lifeline(orte_process_name_t *proc);
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
static int binomial_ft_event(int state);
#endif
@ -63,7 +63,7 @@ orte_routed_module_t orte_routed_binomial_module = {
update_routing_tree,
get_routing_tree,
get_wireup_info,
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
binomial_ft_event
#else
NULL
@ -916,7 +916,7 @@ static int get_wireup_info(opal_buffer_t *buf)
}
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
static int binomial_ft_event(int state)
{
int ret, exit_status = ORTE_SUCCESS;

6
orte/mca/routed/cm/routed_cm.c
Просмотреть файл

@ -46,7 +46,7 @@ static orte_vpid_t get_routing_tree(opal_list_t *children);
static int get_wireup_info(opal_buffer_t *buf);
static int set_lifeline(orte_process_name_t *proc);
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
static int cm_ft_event(int state);
#endif
@ -63,7 +63,7 @@ orte_routed_module_t orte_routed_cm_module = {
update_routing_tree,
get_routing_tree,
get_wireup_info,
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
cm_ft_event
#else
NULL
@ -783,7 +783,7 @@ static int get_wireup_info(opal_buffer_t *buf)
}
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
static int cm_ft_event(int state)
{
int ret, exit_status = ORTE_SUCCESS;

6
orte/mca/routed/direct/routed_direct.c
Просмотреть файл

@ -40,7 +40,7 @@ static orte_vpid_t get_routing_tree(opal_list_t *children);
static int get_wireup_info(opal_buffer_t *buf);
static int set_lifeline(orte_process_name_t *proc);
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
static int direct_ft_event(int state);
#endif
@ -57,7 +57,7 @@ orte_routed_module_t orte_routed_direct_module = {
update_routing_tree,
get_routing_tree,
get_wireup_info,
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
direct_ft_event
#else
NULL
@ -349,7 +349,7 @@ static int get_wireup_info(opal_buffer_t *buf)
}
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
static int direct_ft_event(int state)
{
int ret, exit_status = ORTE_SUCCESS;

6
orte/mca/routed/linear/routed_linear.c
Просмотреть файл

@ -45,7 +45,7 @@ static orte_vpid_t get_routing_tree(opal_list_t *children);
static int get_wireup_info(opal_buffer_t *buf);
static int set_lifeline(orte_process_name_t *proc);
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
static int linear_ft_event(int state);
#endif
@ -62,7 +62,7 @@ orte_routed_module_t orte_routed_linear_module = {
update_routing_tree,
get_routing_tree,
get_wireup_info,
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
linear_ft_event
#else
NULL
@ -788,7 +788,7 @@ static int get_wireup_info(opal_buffer_t *buf)
return ORTE_SUCCESS;
}
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
static int linear_ft_event(int state)
{
int ret, exit_status = ORTE_SUCCESS;

6
orte/mca/routed/radix/routed_radix.c
Просмотреть файл

@ -46,7 +46,7 @@ static orte_vpid_t get_routing_tree(opal_list_t *children);
static int get_wireup_info(opal_buffer_t *buf);
static int set_lifeline(orte_process_name_t *proc);
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
static int radix_ft_event(int state);
#endif
@ -63,7 +63,7 @@ orte_routed_module_t orte_routed_radix_module = {
update_routing_tree,
get_routing_tree,
get_wireup_info,
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
radix_ft_event
#else
NULL
@ -907,7 +907,7 @@ static int get_wireup_info(opal_buffer_t *buf)
return ORTE_SUCCESS;
}
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
static int radix_ft_event(int state)
{
int ret, exit_status = ORTE_SUCCESS;

6
orte/mca/routed/slave/routed_slave.c
Просмотреть файл

@ -41,7 +41,7 @@ static orte_vpid_t get_routing_tree(opal_list_t *children);
static int get_wireup_info(opal_buffer_t *buf);
static int set_lifeline(orte_process_name_t *proc);
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
static int slave_ft_event(int state);
#endif
@ -58,7 +58,7 @@ orte_routed_module_t orte_routed_slave_module = {
update_routing_tree,
get_routing_tree,
get_wireup_info,
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
slave_ft_event
#else
NULL
@ -288,7 +288,7 @@ static int get_wireup_info(opal_buffer_t *buf)
}
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
static int slave_ft_event(int state)
{
int ret, exit_status = ORTE_SUCCESS;

4
orte/mca/snapc/full/configure.m4
Просмотреть файл

@ -1,6 +1,6 @@
# -*- shell-script -*-
#
# Copyright (c) 2004-2007 The Trustees of Indiana University.
# Copyright (c) 2004-2010 The Trustees of Indiana University.
# All rights reserved.
# Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
# All rights reserved.
@ -19,7 +19,7 @@
# -----------------------------------------------------------
AC_DEFUN([MCA_snapc_full_CONFIG],[
# If we don't want FT, don't compile this component
AS_IF([test "$ompi_want_ft" = "1"],
AS_IF([test "$ompi_want_ft_cr" = "1"],
[$1],
[$2])
])dnl

4
orte/orted/orted_main.c
Просмотреть файл

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
* Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
* University Research and Technology
* Corporation. All rights reserved.
* Copyright (c) 2004-2008 The University of Tennessee and The University
@ -330,7 +330,7 @@ int orte_daemon(int argc, char *argv[])
if (1000 < i) i=0;
}
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
/* Mark as a tool program */
tmp_env_var = mca_base_param_env_var("opal_cr_is_tool");
opal_setenv(tmp_env_var,

6
orte/runtime/data_type_support/orte_dt_packing_fns.c
Просмотреть файл

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
* Copyright (c) 2004-2010 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
@ -305,7 +305,7 @@ int orte_dt_pack_job(opal_buffer_t *buffer, const void *src,
return rc;
}
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
/* pack the ckpt state */
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
(void*)(&(jobs[i]->ckpt_state)), 1, OPAL_SIZE))) {
@ -491,7 +491,7 @@ int orte_dt_pack_proc(opal_buffer_t *buffer, const void *src,
return rc;
}
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
/* pack the ckpt state */
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
(void*)(&(procs[i]->ckpt_state)), 1, OPAL_SIZE))) {

6
orte/runtime/data_type_support/orte_dt_size_fns.c
Просмотреть файл

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004-2005 The Trustees of Indiana University.
* Copyright (c) 2004-2010 The Trustees of Indiana University.
* All rights reserved.
* Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
* All rights reserved.
@ -134,7 +134,7 @@ int orte_dt_size_job(size_t *size, orte_job_t *src, opal_data_type_t type)
*size += sz;
}
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
if (NULL != src->ckpt_snapshot_ref) {
*size += strlen(src->ckpt_snapshot_ref);
}
@ -193,7 +193,7 @@ int orte_dt_size_proc(size_t *size, orte_proc_t *src, opal_data_type_t type)
*size += strlen(src->slot_list);
}
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
if (NULL != src->ckpt_snapshot_ref) {
*size += strlen(src->ckpt_snapshot_ref);
}

6
orte/runtime/data_type_support/orte_dt_unpacking_fns.c
Просмотреть файл

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
* Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
* University Research and Technology
* Corporation. All rights reserved.
* Copyright (c) 2004-2008 The University of Tennessee and The University
@ -307,7 +307,7 @@ int orte_dt_unpack_job(opal_buffer_t *buffer, void *dest,
return rc;
}
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
/* unpack the ckpt state */
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
(&(jobs[i]->ckpt_state)), &n, OPAL_SIZE))) {
@ -522,7 +522,7 @@ int orte_dt_unpack_proc(opal_buffer_t *buffer, void *dest,
return rc;
}
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
/* unpack the ckpt state */
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
(&(procs[i]->ckpt_state)), &n, OPAL_SIZE))) {

10
orte/runtime/orte_globals.c
Просмотреть файл

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
* Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
* University Research and Technology
* Corporation. All rights reserved.
* Copyright (c) 2004-2008 The University of Tennessee and The University
@ -607,7 +607,7 @@ static void orte_job_construct(orte_job_t* job)
job->err_cbdata = NULL;
job->max_restarts = INT32_MAX;
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
job->ckpt_state = 0;
job->ckpt_snapshot_ref = NULL;
job->ckpt_snapshot_loc = NULL;
@ -652,7 +652,7 @@ static void orte_job_destruct(orte_job_t* job)
}
OBJ_RELEASE(job->procs);
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
if (NULL != job->ckpt_snapshot_ref) {
free(job->ckpt_snapshot_ref);
job->ckpt_snapshot_ref = NULL;
@ -789,7 +789,7 @@ static void orte_proc_construct(orte_proc_t* proc)
proc->rml_uri = NULL;
proc->beat = 0;
proc->restarts = 0;
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
proc->ckpt_state = 0;
proc->ckpt_snapshot_ref = NULL;
proc->ckpt_snapshot_loc = NULL;
@ -819,7 +819,7 @@ static void orte_proc_destruct(orte_proc_t* proc)
proc->rml_uri = NULL;
}
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
if (NULL != proc->ckpt_snapshot_ref) {
free(proc->ckpt_snapshot_ref);
proc->ckpt_snapshot_ref = NULL;

6
orte/runtime/orte_globals.h
Просмотреть файл

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
* Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
* University Research and Technology
* Corporation. All rights reserved.
* Copyright (c) 2004-2008 The University of Tennessee and The University
@ -388,7 +388,7 @@ typedef struct {
void *err_cbdata;
/* max number of times a process can be restarted */
int32_t max_restarts;
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
/* ckpt state */
size_t ckpt_state;
/* snapshot reference */
@ -440,7 +440,7 @@ struct orte_proc_t {
int beat;
/* number of times this process has been restarted */
int32_t restarts;
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
/* ckpt state */
size_t ckpt_state;
/* snapshot reference */

2
orte/tools/orte-checkpoint/orte-checkpoint.c
Просмотреть файл

@ -384,7 +384,7 @@ static int parse_args(int argc, char *argv[]) {
goto cleanup;
}
#if OPAL_ENABLE_FT == 0
#if OPAL_ENABLE_FT_CR == 0
/* Warn and exit if not configured with Checkpoint/Restart */
{
char *args = NULL;

9
orte/tools/orte-clean/orte-clean.c
Просмотреть файл

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
* Copyright (c) 2004-2010 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
@ -63,7 +63,7 @@
#include "orte/util/proc_info.h"
#include "opal/runtime/opal.h"
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
#include "opal/runtime/opal_cr.h"
#endif
#include "orte/runtime/runtime.h"
@ -135,7 +135,7 @@ main(int argc, char *argv[])
return ret;
}
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
/* Disable the checkpoint notification routine for this
* tool. As we will never need to checkpoint this tool.
* Note: This must happen before opal_init().
@ -154,8 +154,9 @@ main(int argc, char *argv[])
opal_setenv(tmp_env_var,
"1", true, NULL);
free(tmp_env_var);
#endif
#else
tmp_env_var = NULL; /* Silence compiler warning */
#endif
if (ORTE_SUCCESS != (ret = orte_init(&argc, &argv, ORTE_PROC_TOOL))) {
return ret;

14
orte/tools/orte-info/components.c
Просмотреть файл

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
* Copyright (c) 2004-2010 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
@ -45,7 +45,7 @@
#include "opal/mca/timer/base/base.h"
#include "opal/mca/installdirs/installdirs.h"
#include "opal/mca/installdirs/base/base.h"
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
#include "opal/mca/crs/crs.h"
#include "opal/mca/crs/base/base.h"
#endif
@ -81,7 +81,7 @@
#include "orte/mca/routed/base/base.h"
#include "orte/mca/plm/plm.h"
#include "orte/mca/plm/base/base.h"
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
#include "orte/mca/snapc/snapc.h"
#include "orte/mca/snapc/base/base.h"
#endif
@ -273,7 +273,7 @@ void orte_info_open_components(void)
map->components = &opal_timer_base_components_opened;
opal_pointer_array_add(&component_map, map);
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
if (OPAL_SUCCESS != opal_crs_base_open()) {
goto error;
}
@ -402,7 +402,7 @@ void orte_info_open_components(void)
map->components = &orte_plm_base.available_components;
opal_pointer_array_add(&component_map, map);
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
if (ORTE_SUCCESS != orte_snapc_base_open()) {
goto error;
}
@ -472,7 +472,7 @@ void orte_info_close_components()
(void) orte_ess_base_close();
(void) orte_show_help_finalize();
#if !ORTE_DISABLE_FULL_SUPPORT
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
(void) orte_snapc_base_close();
#endif
(void) orte_filem_base_close();
@ -495,7 +495,7 @@ void orte_info_close_components()
(void) opal_carto_base_close();
(void) opal_maffinity_base_close();
(void) opal_timer_base_close();
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
(void) opal_crs_base_close();
#endif

6
orte/tools/orte-info/orte-info.c
Просмотреть файл

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
* Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
* University Research and Technology
* Corporation. All rights reserved.
* Copyright (c) 2004-2006 The University of Tennessee and The University
@ -192,7 +192,7 @@ int main(int argc, char *argv[])
opal_pointer_array_add(&mca_types, "maffinity");
opal_pointer_array_add(&mca_types, "timer");
opal_pointer_array_add(&mca_types, "installdirs");
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
opal_pointer_array_add(&mca_types, "crs");
#endif
@ -206,7 +206,7 @@ int main(int argc, char *argv[])
opal_pointer_array_add(&mca_types, "rml");
opal_pointer_array_add(&mca_types, "routed");
opal_pointer_array_add(&mca_types, "plm");
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
opal_pointer_array_add(&mca_types, "snapc");
#endif
opal_pointer_array_add(&mca_types, "filem");

7
orte/tools/orte-iof/orte-iof.c
Просмотреть файл

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
* Copyright (c) 2004-2010 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
@ -63,8 +63,6 @@
#include "opal/mca/base/base.h"
#include "opal/mca/base/mca_base_param.h"
#include "opal/runtime/opal.h"
#if OPAL_ENABLE_FT == 1
#endif
#include "orte/runtime/runtime.h"
#include "orte/util/hnp_contact.h"
@ -73,9 +71,6 @@
#include "orte/util/proc_info.h"
#include "orte/mca/errmgr/errmgr.h"
#include "orte/mca/iof/iof.h"
#if OPAL_ENABLE_FT == 1
#include "orte/mca/snapc/base/base.h"
#endif
/*****************************************

25
orte/tools/orte-ps/orte-ps.c
Просмотреть файл

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004-2009 The Trustees of Indiana University and Indiana
* 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
@ -59,7 +59,7 @@
#include "opal/mca/base/base.h"
#include "opal/mca/base/mca_base_param.h"
#include "opal/runtime/opal.h"
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
#include "opal/runtime/opal_cr.h"
#endif
@ -71,7 +71,7 @@
#include "orte/mca/errmgr/errmgr.h"
#include "orte/util/comm/comm.h"
#include "orte/mca/ras/ras_types.h"
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
#include "orte/mca/snapc/base/base.h"
#endif
#include "orte/runtime/orte_globals.h"
@ -358,7 +358,7 @@ static int orte_ps_init(int argc, char *argv[]) {
orte_ps_globals.output = 0; /* Default=STDERR */
}
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
/* Disable the checkpoint notification routine for this
* tool. As we will never need to checkpoint this tool.
* Note: This must happen before opal_init().
@ -378,8 +378,9 @@ static int orte_ps_init(int argc, char *argv[]) {
"1",
true, &environ);
free(tmp_env_var);
#endif
#else
tmp_env_var = NULL; /* Silence compiler warning */
#endif
/***************************
* We need all of OPAL and the TOOL portion of ORTE
@ -517,7 +518,7 @@ static int pretty_print_jobs(orte_job_t **jobs, orte_std_cntr_t num_jobs) {
strlen(pretty_job_state(job->state)));
len_slots = 6;
len_vpid_r = (int) strlen("Num Procs");
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
orte_snapc_ckpt_state_str(&state_str, job->ckpt_state);
len_ckpt_s = (int) (strlen(state_str) < strlen("Ckpt State") ?
strlen("Ckpt State") :
@ -554,7 +555,7 @@ static int pretty_print_jobs(orte_job_t **jobs, orte_std_cntr_t num_jobs) {
printf("%*s | ", len_state , "State");
printf("%*s | ", len_slots , "Slots");
printf("%*s | ", len_vpid_r , "Num Procs");
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
printf("%*s | ", len_ckpt_s , "Ckpt State");
printf("%*s | ", len_ckpt_r , "Ckpt Ref");
printf("%*s |", len_ckpt_l , "Ckpt Loc");
@ -570,7 +571,7 @@ static int pretty_print_jobs(orte_job_t **jobs, orte_std_cntr_t num_jobs) {
printf("%*s | ", len_state , pretty_job_state(job->state));
printf("%*d | ", len_slots , (uint)job->total_slots_alloc);
printf("%*d | ", len_vpid_r, job->num_procs);
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
printf("%*s | ", len_ckpt_s, state_str);
printf("%*s | ", len_ckpt_r, (NULL == job->ckpt_snapshot_ref ?
"" :
@ -615,7 +616,7 @@ static int pretty_print_vpids(orte_job_t *job) {
len_pid = 6;
len_state = 0;
len_node = 0;
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
len_ckpt_s = strlen("Ckpt State");
len_ckpt_r = strlen("Ckpt Ref");
len_ckpt_l = strlen("Ckpt Loc");
@ -670,7 +671,7 @@ static int pretty_print_vpids(orte_job_t *job) {
if( (int)strlen(pretty_vpid_state(vpid->state)) > len_state)
len_state = strlen(pretty_vpid_state(vpid->state));
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
orte_snapc_ckpt_state_str(&state_str, vpid->ckpt_state);
if( (int)strlen(state_str) > len_ckpt_s)
len_ckpt_s = strlen(state_str);
@ -708,7 +709,7 @@ static int pretty_print_vpids(orte_job_t *job) {
printf("%*s | ", len_pid , "PID");
printf("%*s | ", len_node , "Node");
printf("%*s | ", len_state , "State");
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
printf("%*s | ", len_ckpt_s , "Ckpt State");
printf("%*s | ", len_ckpt_r , "Ckpt Ref");
printf("%*s |", len_ckpt_l , "Ckpt Loc");
@ -749,7 +750,7 @@ static int pretty_print_vpids(orte_job_t *job) {
printf("%*s | ", len_node , (NULL == vpid->nodename) ? "Unknown" : vpid->nodename);
printf("%*s | ", len_state , pretty_vpid_state(vpid->state));
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
printf("%*s | ", len_ckpt_s, state_str);
printf("%*s | ", len_ckpt_r, (NULL == vpid->ckpt_snapshot_ref ?
"" :

2
orte/tools/orte-restart/orte-restart.c
Просмотреть файл

@ -396,7 +396,7 @@ static int parse_args(int argc, char *argv[])
* Now start parsing our specific arguments
*/
#if OPAL_ENABLE_FT == 0
#if OPAL_ENABLE_FT_CR == 0
/* Warn and exit if not configured with Checkpoint/Restart */
{
char *args = NULL;

11
orte/tools/orterun/orterun.c
Просмотреть файл

@ -1,6 +1,6 @@
/* -*- C -*-
*
* Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
* Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
* University Research and Technology
* Corporation. All rights reserved.
* Copyright (c) 2004-2008 The University of Tennessee and The University
@ -59,7 +59,7 @@
#include "opal/util/opal_getcwd.h"
#include "orte/util/show_help.h"
#include "opal/sys/atomic.h"
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
#include "opal/runtime/opal_cr.h"
#endif
@ -554,7 +554,7 @@ int orterun(int argc, char *argv[])
*/
orte_launch_environ = opal_argv_copy(environ);
#if OPAL_ENABLE_FT == 1
#if OPAL_ENABLE_FT_CR == 1
/* Disable OPAL CR notifications for this tool */
opal_cr_set_enabled(false);
tmp_env_var = mca_base_param_env_var("opal_cr_is_tool");
@ -562,9 +562,10 @@ int orterun(int argc, char *argv[])
"1",
true, &environ);
free(tmp_env_var);
#endif
#else
tmp_env_var = NULL; /* Silence compiler warning */
#endif
/* Intialize our Open RTE environment
* Set the flag telling orte_init that I am NOT a
* singleton, but am "infrastructure" - prevents setting