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

FT: fix compilation using --with-ft (5/5)

Просмотр исходного кода 
Enabling the FT code breaks compilation (again). This series
tries to fix the compiler errors. This is again only fixing
the compiler errors without any warranty that the result
might actually support FT again.

With the changes introduced in the previous patches in this series
some goto constructs for cleanup are no longer necessary and removed.
Этот коммит содержится в:
Adrian Reber 2015-01-15 17:27:58 +01:00
родитель 8ba41a834a
Коммит c08e234af7
3 изменённых файлов: 28 добавлений и 53 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

19
ompi/mca/pml/bfo/pml_bfo.c
Просмотреть файл

@ -690,8 +690,7 @@ int mca_pml_bfo_ft_event( int state )
*/
procs = ompi_proc_all(&num_procs);
if(NULL == procs) {
ret = OMPI_ERR_OUT_OF_RESOURCE;
goto clean;
return OMPI_ERR_OUT_OF_RESOURCE;
}
/*
@ -709,7 +708,7 @@ int mca_pml_bfo_ft_event( int state )
OBJ_RELEASE(procs[p]);
}
free (procs);
goto clean;
return ret;
}
}
}
@ -722,8 +721,7 @@ int mca_pml_bfo_ft_event( int state )
*/
procs = ompi_proc_all(&num_procs);
if(NULL == procs) {
ret = OMPI_ERR_OUT_OF_RESOURCE;
goto clean;
return OMPI_ERR_OUT_OF_RESOURCE;
}
/*
@ -749,7 +747,7 @@ int mca_pml_bfo_ft_event( int state )
OBJ_RELEASE(procs[p]);
}
free (procs);
goto clean;
return ret;
}
}
else if(OPAL_CRS_TERM == state ) {
@ -799,7 +797,7 @@ int mca_pml_bfo_ft_event( int state )
*/
if( OMPI_SUCCESS != (ret = mca_pml_bfo_add_procs(procs, num_procs) ) ) {
opal_output(0, "pml:bfo: ft_event(Restart): Failed in add_procs (%d)", ret);
goto clean;
return ret;
}
/* Is this barrier necessary ? JJH */
@ -837,7 +835,7 @@ int mca_pml_bfo_ft_event( int state )
*/
if( OMPI_SUCCESS != (ret = mca_pml_bfo_add_procs(procs, num_procs) ) ) {
opal_output(0, "pml:bfo: ft_event(Restart): Failed in add_procs (%d)", ret);
goto clean;
return ret;
}
/* Is this barrier necessary ? JJH */
@ -858,10 +856,7 @@ int mca_pml_bfo_ft_event( int state )
;
}
ret = OMPI_SUCCESS;
clean:
return ret;
return OMPI_SUCCESS;
}
#endif /* OPAL_ENABLE_FT_CR */

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

@ -819,8 +819,7 @@ int mca_pml_ob1_ft_event( int state )
*/
procs = ompi_proc_all(&num_procs);
if(NULL == procs) {
ret = OMPI_ERR_OUT_OF_RESOURCE;
goto clean;
return OMPI_ERR_OUT_OF_RESOURCE;
}
/*
@ -838,7 +837,7 @@ int mca_pml_ob1_ft_event( int state )
OBJ_RELEASE(procs[p]);
}
free (procs);
goto clean;
return ret;
}
}
}
@ -851,8 +850,7 @@ int mca_pml_ob1_ft_event( int state )
*/
procs = ompi_proc_all(&num_procs);
if(NULL == procs) {
ret = OMPI_ERR_OUT_OF_RESOURCE;
goto clean;
return OMPI_ERR_OUT_OF_RESOURCE;
}
/*
@ -878,7 +876,7 @@ int mca_pml_ob1_ft_event( int state )
OBJ_RELEASE(procs[p]);
}
free (procs);
goto clean;
return ret;
}
}
else if(OPAL_CRS_TERM == state ) {
@ -924,7 +922,7 @@ int mca_pml_ob1_ft_event( int state )
*/
if( OMPI_SUCCESS != (ret = mca_pml_ob1_add_procs(procs, num_procs) ) ) {
opal_output(0, "pml:ob1: ft_event(Restart): Failed in add_procs (%d)", ret);
goto clean;
return ret;
}
/* Is this barrier necessary ? JJH */
@ -962,7 +960,7 @@ int mca_pml_ob1_ft_event( int state )
*/
if( OMPI_SUCCESS != (ret = mca_pml_ob1_add_procs(procs, num_procs) ) ) {
opal_output(0, "pml:ob1: ft_event(Restart): Failed in add_procs (%d)", ret);
goto clean;
return ret;
}
/* Is this barrier necessary ? JJH */
@ -983,10 +981,7 @@ int mca_pml_ob1_ft_event( int state )
;
}
ret = OMPI_SUCCESS;
clean:
return ret;
return OMPI_SUCCESS;
}
#endif /* OPAL_ENABLE_FT_CR */

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

@ -199,8 +199,7 @@ static int rte_ft_event(int state)
*/
if( ORTE_SUCCESS != (ret = orte_snapc.ft_event(OPAL_CRS_CHECKPOINT))) {
ORTE_ERROR_LOG(ret);
exit_status = ret;
goto cleanup;
return ret;
}
/*
@ -208,8 +207,7 @@ static int rte_ft_event(int state)
*/
if( ORTE_SUCCESS != (ret = orte_routed.ft_event(OPAL_CRS_CHECKPOINT))) {
ORTE_ERROR_LOG(ret);
exit_status = ret;
goto cleanup;
return ret;
}
/*
@ -217,8 +215,7 @@ static int rte_ft_event(int state)
*/
if( ORTE_SUCCESS != (ret = orte_rml.ft_event(OPAL_CRS_CHECKPOINT))) {
ORTE_ERROR_LOG(ret);
exit_status = ret;
goto cleanup;
return ret;
}
}
/******** Continue Recovery ********/
@ -232,8 +229,7 @@ static int rte_ft_event(int state)
*/
if( ORTE_SUCCESS != (ret = orte_rml.ft_event(OPAL_CRS_CONTINUE))) {
ORTE_ERROR_LOG(ret);
exit_status = ret;
goto cleanup;
return ret;
}
/*
@ -241,8 +237,7 @@ static int rte_ft_event(int state)
*/
if( ORTE_SUCCESS != (ret = orte_routed.ft_event(OPAL_CRS_CONTINUE))) {
ORTE_ERROR_LOG(ret);
exit_status = ret;
goto cleanup;
return ret;
}
/*
@ -250,8 +245,7 @@ static int rte_ft_event(int state)
*/
if( ORTE_SUCCESS != (ret = orte_snapc.ft_event(OPAL_CRS_CONTINUE))) {
ORTE_ERROR_LOG(ret);
exit_status = ret;
goto cleanup;
return ret;
}
if (opal_cr_continue_like_restart) {
@ -292,8 +286,7 @@ static int rte_ft_event(int state)
*/
if( ORTE_SUCCESS != (ret = orte_rml.ft_event(OPAL_CRS_RESTART))) {
ORTE_ERROR_LOG(ret);
exit_status = ret;
goto cleanup;
return ret;
}
/*
@ -304,14 +297,12 @@ static int rte_ft_event(int state)
orte_process_info.proc_type = ORTE_PROC_TOOL;
if (ORTE_SUCCESS != (ret = orte_routed.finalize()) ) {
ORTE_ERROR_LOG(ret);
exit_status = ret;
goto cleanup;
return ret;
}
orte_process_info.proc_type = svtype;
if (ORTE_SUCCESS != (ret = orte_routed.initialize()) ) {
ORTE_ERROR_LOG(ret);
exit_status = ret;
goto cleanup;
return ret;
}
/* RHC: you can't pass NULL as the identifier - what you'll need to do is
@ -330,14 +321,12 @@ static int rte_ft_event(int state)
*/
if (ORTE_SUCCESS != (ret = orte_plm.finalize())) {
ORTE_ERROR_LOG(ret);
exit_status = ret;
goto cleanup;
return ret;
}
if (ORTE_SUCCESS != (ret = orte_plm.init())) {
ORTE_ERROR_LOG(ret);
exit_status = ret;
goto cleanup;
return ret;
}
/*
@ -345,8 +334,7 @@ static int rte_ft_event(int state)
*/
if (ORTE_SUCCESS != (ret = orte_rml.enable_comm())) {
ORTE_ERROR_LOG(ret);
exit_status = ret;
goto cleanup;
return ret;
}
/*
@ -354,8 +342,7 @@ static int rte_ft_event(int state)
*/
if( ORTE_SUCCESS != (ret = orte_routed.ft_event(OPAL_CRS_RESTART))) {
ORTE_ERROR_LOG(ret);
exit_status = ret;
goto cleanup;
return ret;
}
/*
@ -394,8 +381,7 @@ static int rte_ft_event(int state)
*/
if( ORTE_SUCCESS != (ret = orte_snapc.ft_event(OPAL_CRS_RESTART))) {
ORTE_ERROR_LOG(ret);
exit_status = ret;
goto cleanup;
return ret;
}
}
else if (OPAL_CRS_TERM == state ) {
@ -405,7 +391,6 @@ static int rte_ft_event(int state)
/* Error state = Nothing */
}
cleanup:
return exit_status;
}
#endif