Hi Adrian
No point in keeping the old code for those places where you update the syntax
of a non-blocking recv (i.e., you remove the no-longer-reqd extra param). I
would only keep it where you have to replace a blocking recv with a
non-blocking one as that is where the behavior will change.
Other than that, it looks fine to me.
On Dec 18, 2013, at 6:42 AM, Adrian Reber <adr...@lisas.de> wrote:
> From: Adrian Reber <adrian.re...@hs-esslingen.de>
>
> This patch changes all recv/recv_buffer occurrences in the C/R code
> to recv_nb/recv_buffer_nb.
> The old code is still there but disabled using ifdefs (ENABLE_FT_FIXED).
> The new code compiles but does not work.
>
> Changes from V1:
> * #ifdef out the code (so it is preserved for later re-design)
> * marked the broken C/R code with ENABLE_FT_FIXED
>
> Signed-off-by: Adrian Reber <adrian.re...@hs-esslingen.de>
> ---
> ompi/mca/crcp/bkmrk/crcp_bkmrk_pml.c | 19 ++++++
> orte/mca/errmgr/base/errmgr_base_tool.c | 6 +-
> orte/mca/rml/ftrm/rml_ftrm.h | 27 ++-------
> orte/mca/rml/ftrm/rml_ftrm_component.c | 2 -
> orte/mca/rml/ftrm/rml_ftrm_module.c | 78 +++----------------------
> orte/mca/snapc/full/snapc_full_app.c | 12 ++++
> orte/mca/snapc/full/snapc_full_global.c | 25 ++++----
> orte/mca/snapc/full/snapc_full_local.c | 24 ++++----
> orte/mca/sstore/central/sstore_central_app.c | 6 ++
> orte/mca/sstore/central/sstore_central_global.c | 11 ++--
> orte/mca/sstore/central/sstore_central_local.c | 11 ++--
> orte/mca/sstore/stage/sstore_stage_app.c | 5 ++
> orte/mca/sstore/stage/sstore_stage_global.c | 11 ++--
> orte/mca/sstore/stage/sstore_stage_local.c | 11 ++--
> orte/tools/orte-checkpoint/orte-checkpoint.c | 9 ++-
> orte/tools/orte-migrate/orte-migrate.c | 9 ++-
> 16 files changed, 124 insertions(+), 142 deletions(-)
>
> diff --git a/ompi/mca/crcp/bkmrk/crcp_bkmrk_pml.c
> b/ompi/mca/crcp/bkmrk/crcp_bkmrk_pml.c
> index 5d4005f..cba7586 100644
> --- a/ompi/mca/crcp/bkmrk/crcp_bkmrk_pml.c
> +++ b/ompi/mca/crcp/bkmrk/crcp_bkmrk_pml.c
> @@ -4739,6 +4739,8 @@ static int ft_event_post_drain_acks(void)
> drain_msg_ack = (ompi_crcp_bkmrk_pml_drain_message_ack_ref_t*)item;
>
> /* Post the receive */
> +#ifdef ENABLE_FT_FIXED
> + /* This is the old, now broken code */
> if( OMPI_SUCCESS != (ret = ompi_rte_recv_buffer_nb(
> &drain_msg_ack->peer,
>
> OMPI_CRCP_COORD_BOOKMARK_TAG,
> 0,
> @@ -4750,6 +4752,9 @@ static int ft_event_post_drain_acks(void)
> OMPI_NAME_PRINT(&(drain_msg_ack->peer)));
> return ret;
> }
> +#endif /* ENABLE_FT_FIXED */
> + ompi_rte_recv_buffer_nb(&drain_msg_ack->peer,
> OMPI_CRCP_COORD_BOOKMARK_TAG,
> + 0, drain_message_ack_cbfunc, NULL);
> }
>
> return OMPI_SUCCESS;
> @@ -5330,6 +5335,8 @@ static int recv_bookmarks(int peer_idx)
> peer_name.jobid = OMPI_PROC_MY_NAME->jobid;
> peer_name.vpid = peer_idx;
>
> +#ifdef ENABLE_FT_FIXED
> + /* This is the old, now broken code */
> if ( 0 > (ret = ompi_rte_recv_buffer_nb(&peer_name,
> OMPI_CRCP_COORD_BOOKMARK_TAG,
> 0,
> @@ -5342,6 +5349,9 @@ static int recv_bookmarks(int peer_idx)
> exit_status = ret;
> goto cleanup;
> }
> +#endif /* ENABLE_FT_FIXED */
> + ompi_rte_recv_buffer_nb(&peer_name, OMPI_CRCP_COORD_BOOKMARK_TAG,
> + 0, recv_bookmarks_cbfunc, NULL);
>
> ++total_recv_bookmarks;
>
> @@ -5616,6 +5626,8 @@ static int
> do_send_msg_detail(ompi_crcp_bkmrk_pml_peer_ref_t *peer_ref,
> /*
> * Recv the ACK msg
> */
> +#ifdef ENABLE_FT_FIXED
> + /* This is the old, now broken code */
> if ( 0 > (ret = ompi_rte_recv_buffer(&peer_ref->proc_name, buffer,
> OMPI_CRCP_COORD_BOOKMARK_TAG, 0) ) )
> {
> opal_output(mca_crcp_bkmrk_component.super.output_handle,
> @@ -5626,6 +5638,9 @@ static int
> do_send_msg_detail(ompi_crcp_bkmrk_pml_peer_ref_t *peer_ref,
> exit_status = ret;
> goto cleanup;
> }
> +#endif /* ENABLE_FT_FIXED */
> + ompi_rte_recv_buffer_nb(&peer_ref->proc_name,
> OMPI_CRCP_COORD_BOOKMARK_TAG, 0,
> + orte_rml_recv_callback, NULL);
>
> UNPACK_BUFFER(buffer, recv_response, 1, OPAL_UINT32,
> "crcp:bkmrk: send_msg_details: Failed to unpack the ACK
> from peer buffer.");
> @@ -5790,6 +5805,8 @@ static int
> do_recv_msg_detail(ompi_crcp_bkmrk_pml_peer_ref_t *peer_ref,
> /*
> * Recv the msg
> */
> +#ifdef ENABLE_FT_FIXED
> + /* This is the old, now broken code */
> if ( 0 > (ret = ompi_rte_recv_buffer(&peer_ref->proc_name, buffer,
> OMPI_CRCP_COORD_BOOKMARK_TAG, 0) ) ) {
> opal_output(mca_crcp_bkmrk_component.super.output_handle,
> "crcp:bkmrk: do_recv_msg_detail: %s <-- %s Failed to
> receive buffer from peer. Return %d\n",
> @@ -5799,6 +5816,8 @@ static int
> do_recv_msg_detail(ompi_crcp_bkmrk_pml_peer_ref_t *peer_ref,
> exit_status = ret;
> goto cleanup;
> }
> +#endif /* ENABLE_FT_FIXED */
> + ompi_rte_recv_buffer_nb(&peer_ref->proc_name,
> OMPI_CRCP_COORD_BOOKMARK_TAG, 0, orte_rml_recv_callback, NULL);
>
> /* Pull out the communicator ID */
> UNPACK_BUFFER(buffer, (*comm_id), 1, OPAL_UINT32,
> diff --git a/orte/mca/errmgr/base/errmgr_base_tool.c
> b/orte/mca/errmgr/base/errmgr_base_tool.c
> index 20d76e5..b982e46 100644
> --- a/orte/mca/errmgr/base/errmgr_base_tool.c
> +++ b/orte/mca/errmgr/base/errmgr_base_tool.c
> @@ -262,6 +262,8 @@ static int errmgr_base_tool_start_cmdline_listener(void)
> */
> errmgr_cmdline_sender.jobid = ORTE_JOBID_INVALID;
> errmgr_cmdline_sender.vpid = ORTE_VPID_INVALID;
> +#ifdef ENABLE_FT_FIXED
> + /* This is the old, now broken code */
> if (ORTE_SUCCESS != (ret = orte_rml.recv_buffer_nb(ORTE_NAME_WILDCARD,
> ORTE_RML_TAG_MIGRATE,
> 0,
> @@ -271,10 +273,12 @@ static int errmgr_base_tool_start_cmdline_listener(void)
> exit_status = ret;
> goto cleanup;
> }
> +#endif /* ENABLE_FT_FIXED */
> + orte_rml.recv_buffer_nb(ORTE_NAME_WILDCARD, ORTE_RML_TAG_MIGRATE,
> + 0, errmgr_base_tool_cmdline_recv, NULL);
>
> errmgr_cmdline_recv_issued = true;
>
> - cleanup:
> return exit_status;
> }
>
> diff --git a/orte/mca/rml/ftrm/rml_ftrm.h b/orte/mca/rml/ftrm/rml_ftrm.h
> index a1bd48a..055c891 100644
> --- a/orte/mca/rml/ftrm/rml_ftrm.h
> +++ b/orte/mca/rml/ftrm/rml_ftrm.h
> @@ -109,39 +109,20 @@ BEGIN_C_DECLS
> void* cbdata);
>
> /*
> - * Recv
> - */
> - int orte_rml_ftrm_recv(orte_process_name_t* peer,
> - struct iovec *msg,
> - int count,
> - orte_rml_tag_t tag,
> - int flags);
> -
> - /*
> * Recv Non-blocking
> */
> - int orte_rml_ftrm_recv_nb(orte_process_name_t* peer,
> - struct iovec* msg,
> - int count,
> + void orte_rml_ftrm_recv_nb(orte_process_name_t* peer,
> orte_rml_tag_t tag,
> - int flags,
> + bool persistent,
> orte_rml_callback_fn_t cbfunc,
> void* cbdata);
>
> /*
> - * Recv Buffer
> - */
> - int orte_rml_ftrm_recv_buffer(orte_process_name_t* peer,
> - opal_buffer_t *buf,
> - orte_rml_tag_t tag,
> - int flags);
> -
> - /*
> * Recv Buffer Non-blocking
> */
> - int orte_rml_ftrm_recv_buffer_nb(orte_process_name_t* peer,
> + void orte_rml_ftrm_recv_buffer_nb(orte_process_name_t* peer,
> orte_rml_tag_t tag,
> - int flags,
> + bool persistent,
> orte_rml_buffer_callback_fn_t cbfunc,
> void* cbdata);
>
> diff --git a/orte/mca/rml/ftrm/rml_ftrm_component.c
> b/orte/mca/rml/ftrm/rml_ftrm_component.c
> index 6923c44..0ffa79c 100644
> --- a/orte/mca/rml/ftrm/rml_ftrm_component.c
> +++ b/orte/mca/rml/ftrm/rml_ftrm_component.c
> @@ -73,9 +73,7 @@ orte_rml_module_t orte_rml_ftrm_module = {
> orte_rml_ftrm_send_buffer,
> orte_rml_ftrm_send_buffer_nb,
>
> - orte_rml_ftrm_recv,
> orte_rml_ftrm_recv_nb,
> - orte_rml_ftrm_recv_buffer,
> orte_rml_ftrm_recv_buffer_nb,
> orte_rml_ftrm_recv_cancel,
>
> diff --git a/orte/mca/rml/ftrm/rml_ftrm_module.c
> b/orte/mca/rml/ftrm/rml_ftrm_module.c
> index 85b288e..4ba6f2d 100644
> --- a/orte/mca/rml/ftrm/rml_ftrm_module.c
> +++ b/orte/mca/rml/ftrm/rml_ftrm_module.c
> @@ -224,101 +224,41 @@ int orte_rml_ftrm_send_buffer_nb(orte_process_name_t*
> peer,
> }
>
>
> -/*
> - * Recv
> - */
> -int orte_rml_ftrm_recv(orte_process_name_t* peer,
> - struct iovec *msg,
> - int count,
> - orte_rml_tag_t tag,
> - int flags)
> -{
> - int ret;
> -
> - opal_output_verbose(20, rml_ftrm_output_handle,
> - "orte_rml_ftrm: recv(%s, %d, %d, %d )",
> - ORTE_NAME_PRINT(peer), count, tag, flags);
> -
> - if( NULL != orte_rml_ftrm_wrapped_module.recv ) {
> - if( ORTE_SUCCESS != (ret = orte_rml_ftrm_wrapped_module.recv(peer,
> msg, count, tag, flags) ) ) {
> - return ret;
> - }
> - }
> -
> - return ORTE_SUCCESS;
> -}
>
> /*
> * Recv Non-blocking
> */
> -int orte_rml_ftrm_recv_nb(orte_process_name_t* peer,
> - struct iovec* msg,
> - int count,
> +void orte_rml_ftrm_recv_nb(orte_process_name_t* peer,
> orte_rml_tag_t tag,
> - int flags,
> + bool persistent,
> orte_rml_callback_fn_t cbfunc,
> void* cbdata)
> {
> - int ret;
> -
> opal_output_verbose(20, rml_ftrm_output_handle,
> - "orte_rml_ftrm: recv_nb(%s, %d, %d, %d )",
> - ORTE_NAME_PRINT(peer), count, tag, flags);
> + "orte_rml_ftrm: recv_nb(%s, %d, %d )",
> + ORTE_NAME_PRINT(peer), tag, persistent);
>
> if( NULL != orte_rml_ftrm_wrapped_module.recv_nb ) {
> - if( ORTE_SUCCESS != (ret =
> orte_rml_ftrm_wrapped_module.recv_nb(peer, msg, count, tag, flags, cbfunc,
> cbdata) ) ) {
> - return ret;
> - }
> + orte_rml_ftrm_wrapped_module.recv_nb(peer, tag, persistent, cbfunc,
> cbdata);
> }
> -
> - return ORTE_SUCCESS;
> -}
> -
> -/*
> - * Recv Buffer
> - */
> -int orte_rml_ftrm_recv_buffer(orte_process_name_t* peer,
> - opal_buffer_t *buf,
> - orte_rml_tag_t tag,
> - int flags)
> -{
> - int ret;
> -
> - opal_output_verbose(20, rml_ftrm_output_handle,
> - "orte_rml_ftrm: recv_buffer(%s, %d )",
> - ORTE_NAME_PRINT(peer), tag);
> -
> - if( NULL != orte_rml_ftrm_wrapped_module.recv_buffer ) {
> - if( ORTE_SUCCESS != (ret =
> orte_rml_ftrm_wrapped_module.recv_buffer(peer, buf, tag, flags) ) ) {
> - return ret;
> - }
> - }
> -
> - return ORTE_SUCCESS;
> }
>
> /*
> * Recv Buffer Non-blocking
> */
> -int orte_rml_ftrm_recv_buffer_nb(orte_process_name_t* peer,
> +void orte_rml_ftrm_recv_buffer_nb(orte_process_name_t* peer,
> orte_rml_tag_t tag,
> - int flags,
> + bool persistent,
> orte_rml_buffer_callback_fn_t cbfunc,
> void* cbdata)
> {
> - int ret;
> -
> opal_output_verbose(20, rml_ftrm_output_handle,
> "orte_rml_ftrm: recv_buffer_nb(%s, %d, %d)",
> - ORTE_NAME_PRINT(peer), tag, flags);
> + ORTE_NAME_PRINT(peer), tag, persistent);
>
> if( NULL != orte_rml_ftrm_wrapped_module.recv_buffer_nb ) {
> - if( ORTE_SUCCESS != (ret =
> orte_rml_ftrm_wrapped_module.recv_buffer_nb(peer, tag, flags, cbfunc, cbdata)
> ) ) {
> - return ret;
> - }
> + orte_rml_ftrm_wrapped_module.recv_buffer_nb(peer, tag, persistent,
> cbfunc, cbdata);
> }
> -
> - return ORTE_SUCCESS;
> }
>
> /*
> diff --git a/orte/mca/snapc/full/snapc_full_app.c
> b/orte/mca/snapc/full/snapc_full_app.c
> index c7438f1..862c9be 100644
> --- a/orte/mca/snapc/full/snapc_full_app.c
> +++ b/orte/mca/snapc/full/snapc_full_app.c
> @@ -289,12 +289,16 @@ int app_coord_finalize()
> * need to wait until the checkpoint is finished before finishing.
> */
> OBJ_CONSTRUCT(&buffer, opal_buffer_t);
> +#ifdef ENABLE_FT_FIXED
> + /* This is the old, now broken code */
> if (0 > (ret = orte_rml.recv_buffer(ORTE_PROC_MY_HNP, &buffer,
> ORTE_RML_TAG_SNAPC_FULL, 0))) {
> ORTE_ERROR_LOG(ret);
> exit_status = ret;
> OBJ_DESTRUCT(&buffer);
> goto cleanup;
> }
> +#endif /* ENABLE_FT_FIXED */
> + orte_rml.recv_buffer_nb(ORTE_PROC_MY_HNP, ORTE_RML_TAG_SNAPC_FULL,
> 0, snapc_full_app_callback_recv, NULL);
>
> count = 1;
> if (ORTE_SUCCESS != (ret = opal_dss.unpack(&buffer, &command, &count,
> ORTE_SNAPC_FULL_CMD))) {
> @@ -1534,12 +1538,16 @@ int app_coord_request_op(orte_snapc_base_request_op_t
> *datum)
> /*
> * Wait for a response regarding completion
> */
> +#ifdef ENABLE_FT_FIXED
> + /* This is the old, now broken code */
> if (0 > (ret = orte_rml.recv_buffer(ORTE_PROC_MY_HNP, &buffer,
> ORTE_RML_TAG_SNAPC_FULL, 0))) {
> ORTE_ERROR_LOG(ret);
> exit_status = ret;
> OBJ_DESTRUCT(&buffer);
> goto cleanup;
> }
> +#endif /* ENABLE_FT_FIXED */
> + orte_rml.recv_buffer_nb(ORTE_PROC_MY_HNP,
> ORTE_RML_TAG_SNAPC_FULL, 0, snapc_full_app_callback_recv, NULL);
>
> count = 1;
> if (ORTE_SUCCESS != (ret = opal_dss.unpack(&buffer, &command,
> &count, ORTE_SNAPC_FULL_CMD))) {
> @@ -1604,12 +1612,16 @@ int app_coord_request_op(orte_snapc_base_request_op_t
> *datum)
> /*
> * Wait for a response regarding completion
> */
> +#ifdef ENABLE_FT_FIXED
> + /* This is the old, now broken code */
> if (0 > (ret = orte_rml.recv_buffer(ORTE_PROC_MY_HNP, &buffer,
> ORTE_RML_TAG_SNAPC_FULL, 0))) {
> ORTE_ERROR_LOG(ret);
> exit_status = ret;
> OBJ_DESTRUCT(&buffer);
> goto cleanup;
> }
> +#endif /* ENABLE_FT_FIXED */
> + orte_rml.recv_buffer_nb(ORTE_PROC_MY_HNP,
> ORTE_RML_TAG_SNAPC_FULL, 0, snapc_full_app_callback_recv, NULL);
>
> count = 1;
> if (ORTE_SUCCESS != (ret = opal_dss.unpack(&buffer, &command,
> &count, ORTE_SNAPC_FULL_CMD))) {
> diff --git a/orte/mca/snapc/full/snapc_full_global.c
> b/orte/mca/snapc/full/snapc_full_global.c
> index 9f6da34..efd202d 100644
> --- a/orte/mca/snapc/full/snapc_full_global.c
> +++ b/orte/mca/snapc/full/snapc_full_global.c
> @@ -875,18 +875,18 @@ static int global_refresh_job_structs(void)
> *****************/
> static int snapc_full_global_start_listener(void)
> {
> - int ret, exit_status = ORTE_SUCCESS;
> -
> if (snapc_orted_recv_issued && ORTE_PROC_IS_HNP) {
> return ORTE_SUCCESS;
> }
> -
> +
> OPAL_OUTPUT_VERBOSE((5, mca_snapc_full_component.super.output_handle,
> "Global) Startup Coordinator Channel"));
>
> /*
> * Coordinator command listener
> */
> +#ifdef ENABLE_FT_FIXED
> + /* This is the old, now broken code */
> if (ORTE_SUCCESS != (ret = orte_rml.recv_buffer_nb(ORTE_NAME_WILDCARD,
>
> ORTE_RML_TAG_SNAPC_FULL,
> ORTE_RML_PERSISTENT,
> @@ -896,11 +896,13 @@ static int snapc_full_global_start_listener(void)
> exit_status = ret;
> goto cleanup;
> }
> +#endif /* ENABLE_FT_FIXED */
> + orte_rml.recv_buffer_nb(ORTE_NAME_WILDCARD, ORTE_RML_TAG_SNAPC_FULL,
> + ORTE_RML_PERSISTENT,
> snapc_full_global_orted_recv, NULL);
>
> snapc_orted_recv_issued = true;
> -
> - cleanup:
> - return exit_status;
> +
> + return ORTE_SUCCESS;
> }
>
> static int snapc_full_global_stop_listener(void)
> @@ -920,8 +922,6 @@ static int snapc_full_global_stop_listener(void)
>
> static int snapc_full_global_start_cmdline_listener(void)
> {
> - int ret, exit_status = ORTE_SUCCESS;
> -
> if (snapc_cmdline_recv_issued && ORTE_PROC_IS_HNP) {
> return ORTE_SUCCESS;
> }
> @@ -932,6 +932,8 @@ static int snapc_full_global_start_cmdline_listener(void)
> /*
> * Coordinator command listener
> */
> +#ifdef ENABLE_FT_FIXED
> + /* This is the old, now broken code */
> if (ORTE_SUCCESS != (ret = orte_rml.recv_buffer_nb(ORTE_NAME_WILDCARD,
> ORTE_RML_TAG_CKPT,
> 0,
> @@ -941,11 +943,12 @@ static int
> snapc_full_global_start_cmdline_listener(void)
> exit_status = ret;
> goto cleanup;
> }
> +#endif /* ENABLE_FT_FIXED */
> + orte_rml.recv_buffer_nb(ORTE_NAME_WILDCARD, ORTE_RML_TAG_CKPT, 0,
> + snapc_full_global_cmdline_recv, NULL);
>
> snapc_cmdline_recv_issued = true;
> -
> - cleanup:
> - return exit_status;
> + return ORTE_SUCCESS;
> }
>
> static int snapc_full_global_stop_cmdline_listener(void)
> diff --git a/orte/mca/snapc/full/snapc_full_local.c
> b/orte/mca/snapc/full/snapc_full_local.c
> index b13fce9..6413413 100644
> --- a/orte/mca/snapc/full/snapc_full_local.c
> +++ b/orte/mca/snapc/full/snapc_full_local.c
> @@ -341,8 +341,6 @@ int local_coord_release_job(orte_jobid_t jobid)
> ******************/
> static int snapc_full_local_start_hnp_listener(void)
> {
> - int ret, exit_status = ORTE_SUCCESS;
> -
> /*
> * Global Coordinator: Do not register a Local listener
> */
> @@ -360,6 +358,8 @@ static int snapc_full_local_start_hnp_listener(void)
> /*
> * Coordinator command listener
> */
> +#ifdef ENABLE_FT_FIXED
> + /* This is the old, now broken code */
> if (ORTE_SUCCESS != (ret = orte_rml.recv_buffer_nb(ORTE_NAME_WILDCARD,
>
> ORTE_RML_TAG_SNAPC_FULL,
> ORTE_RML_PERSISTENT,
> @@ -369,11 +369,13 @@ static int snapc_full_local_start_hnp_listener(void)
> exit_status = ret;
> goto cleanup;
> }
> +#endif /* ENABLE_FT_FIXED */
> + orte_rml.recv_buffer_nb(ORTE_NAME_WILDCARD, ORTE_RML_TAG_SNAPC_FULL,
> + ORTE_RML_PERSISTENT,
> snapc_full_local_hnp_cmd_recv, NULL);
>
> snapc_local_hnp_recv_issued = true;
> -
> - cleanup:
> - return exit_status;
> +
> + return ORTE_SUCCESS;
> }
>
> static int snapc_full_local_stop_hnp_listener(void)
> @@ -400,8 +402,6 @@ static int snapc_full_local_stop_hnp_listener(void)
>
> static int snapc_full_local_start_app_listener(void)
> {
> - int ret, exit_status = ORTE_SUCCESS;
> -
> if (snapc_local_app_recv_issued) {
> return ORTE_SUCCESS;
> }
> @@ -412,6 +412,8 @@ static int snapc_full_local_start_app_listener(void)
> /*
> * Coordinator command listener
> */
> +#ifdef ENABLE_FT_FIXED
> + /* This is the old, now broken code */
> if (ORTE_SUCCESS != (ret = orte_rml.recv_buffer_nb(ORTE_NAME_WILDCARD,
> ORTE_RML_TAG_SNAPC,
> ORTE_RML_PERSISTENT,
> @@ -421,11 +423,13 @@ static int snapc_full_local_start_app_listener(void)
> exit_status = ret;
> goto cleanup;
> }
> +#endif /* ENABLE_FT_FIXED */
> + orte_rml.recv_buffer_nb(ORTE_NAME_WILDCARD, ORTE_RML_TAG_SNAPC,
> + ORTE_RML_PERSISTENT,
> snapc_full_local_app_cmd_recv,
> + NULL);
>
> snapc_local_app_recv_issued = true;
> -
> - cleanup:
> - return exit_status;
> + return ORTE_SUCCESS;
> }
>
> static int snapc_full_local_stop_app_listener(void)
> diff --git a/orte/mca/sstore/central/sstore_central_app.c
> b/orte/mca/sstore/central/sstore_central_app.c
> index e717065..a7d6689 100644
> --- a/orte/mca/sstore/central/sstore_central_app.c
> +++ b/orte/mca/sstore/central/sstore_central_app.c
> @@ -477,6 +477,8 @@ static int
> pull_handle_info(orte_sstore_central_app_snapshot_info_t *handle_info
> "sstore:central:(app): pull() from %s -> %s",
> ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
> ORTE_NAME_PRINT(ORTE_PROC_MY_DAEMON)));
> +#ifdef ENABLE_FT_FIXED
> + /* This is the old, now broken code */
> if( ORTE_SUCCESS != (ret = orte_rml.recv_buffer(ORTE_PROC_MY_DAEMON,
> &buffer,
>
> ORTE_RML_TAG_SSTORE_INTERNAL,
> @@ -485,6 +487,10 @@ static int
> pull_handle_info(orte_sstore_central_app_snapshot_info_t *handle_info
> exit_status = ret;
> goto cleanup;
> }
> +#endif /* ENABLE_FT_FIXED */
> +
> + orte_rml.recv_buffer_nb(ORTE_PROC_MY_DAEMON,
> ORTE_RML_TAG_SSTORE_INTERNAL,
> + 0, orte_rml_recv_callback, NULL);
>
> count = 1;
> if (ORTE_SUCCESS != (ret = opal_dss.unpack(&buffer, &command, &count,
> ORTE_SSTORE_CENTRAL_CMD))) {
> diff --git a/orte/mca/sstore/central/sstore_central_global.c
> b/orte/mca/sstore/central/sstore_central_global.c
> index 935b6fe..2685a55 100644
> --- a/orte/mca/sstore/central/sstore_central_global.c
> +++ b/orte/mca/sstore/central/sstore_central_global.c
> @@ -800,12 +800,12 @@ static orte_sstore_central_global_snapshot_info_t
> *find_handle_info_from_ref(cha
>
> static int sstore_central_global_start_listener(void)
> {
> - int ret, exit_status = ORTE_SUCCESS;
> -
> if( is_global_listener_active ) {
> return ORTE_SUCCESS;
> }
>
> +#ifdef ENABLE_FT_FIXED
> + /* This is the old, now broken code */
> if (ORTE_SUCCESS != (ret = orte_rml.recv_buffer_nb(ORTE_NAME_WILDCARD,
>
> ORTE_RML_TAG_SSTORE_INTERNAL,
> ORTE_RML_PERSISTENT,
> @@ -815,11 +815,12 @@ static int sstore_central_global_start_listener(void)
> exit_status = ret;
> goto cleanup;
> }
> +#endif /* ENABLE_FT_FIXED */
> + orte_rml.recv_buffer_nb(ORTE_NAME_WILDCARD, ORTE_RML_TAG_SSTORE_INTERNAL,
> + ORTE_RML_PERSISTENT, sstore_central_global_recv,
> NULL);
>
> is_global_listener_active = true;
> -
> - cleanup:
> - return exit_status;
> + return ORTE_SUCCESS;
> }
>
> static int sstore_central_global_stop_listener(void)
> diff --git a/orte/mca/sstore/central/sstore_central_local.c
> b/orte/mca/sstore/central/sstore_central_local.c
> index 35ef518..0393107 100644
> --- a/orte/mca/sstore/central/sstore_central_local.c
> +++ b/orte/mca/sstore/central/sstore_central_local.c
> @@ -619,12 +619,12 @@ static orte_sstore_central_local_app_snapshot_info_t
> *find_app_handle_info(orte_
>
> static int sstore_central_local_start_listener(void)
> {
> - int ret, exit_status = ORTE_SUCCESS;
> -
> if( is_global_listener_active ) {
> return ORTE_SUCCESS;
> }
>
> +#ifdef ENABLE_FT_FIXED
> + /* This is the old, now broken code */
> if (ORTE_SUCCESS != (ret = orte_rml.recv_buffer_nb(ORTE_NAME_WILDCARD,
>
> ORTE_RML_TAG_SSTORE_INTERNAL,
> ORTE_RML_PERSISTENT,
> @@ -634,11 +634,12 @@ static int sstore_central_local_start_listener(void)
> exit_status = ret;
> goto cleanup;
> }
> +#endif /* ENABLE_FT_FIXED */
> + orte_rml.recv_buffer_nb(ORTE_NAME_WILDCARD, ORTE_RML_TAG_SSTORE_INTERNAL,
> + ORTE_RML_PERSISTENT,
> orte_sstore_central_local_recv, NULL);
>
> is_global_listener_active = true;
> -
> - cleanup:
> - return exit_status;
> + return ORTE_SUCCESS;
> }
>
> static int sstore_central_local_stop_listener(void)
> diff --git a/orte/mca/sstore/stage/sstore_stage_app.c
> b/orte/mca/sstore/stage/sstore_stage_app.c
> index 10d38ad..88b6484 100644
> --- a/orte/mca/sstore/stage/sstore_stage_app.c
> +++ b/orte/mca/sstore/stage/sstore_stage_app.c
> @@ -466,6 +466,8 @@ static int
> pull_handle_info(orte_sstore_stage_app_snapshot_info_t *handle_info )
> "sstore:stage:(app): pull() from %s -> %s",
> ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
> ORTE_NAME_PRINT(ORTE_PROC_MY_DAEMON)));
> +#ifdef ENABLE_FT_FIXED
> + /* This is the old, now broken code */
> if( ORTE_SUCCESS != (ret = orte_rml.recv_buffer(ORTE_PROC_MY_DAEMON,
> &buffer,
>
> ORTE_RML_TAG_SSTORE_INTERNAL,
> @@ -475,6 +477,9 @@ static int
> pull_handle_info(orte_sstore_stage_app_snapshot_info_t *handle_info )
> goto cleanup;
> }
>
> +#endif /* ENABLE_FT_FIXED */
> + orte_rml.recv_buffer_nb(ORTE_PROC_MY_DAEMON,
> ORTE_RML_TAG_SSTORE_INTERNAL,
> + 0, orte_rml_recv_callback, NULL);
> count = 1;
> if (ORTE_SUCCESS != (ret = opal_dss.unpack(&buffer, &command, &count,
> ORTE_SSTORE_STAGE_CMD))) {
> ORTE_ERROR_LOG(ret);
> diff --git a/orte/mca/sstore/stage/sstore_stage_global.c
> b/orte/mca/sstore/stage/sstore_stage_global.c
> index 1c8847a..1c94845 100644
> --- a/orte/mca/sstore/stage/sstore_stage_global.c
> +++ b/orte/mca/sstore/stage/sstore_stage_global.c
> @@ -992,12 +992,12 @@ static orte_sstore_stage_global_snapshot_info_t
> *find_handle_info(orte_sstore_ba
>
> static int sstore_stage_global_start_listener(void)
> {
> - int ret, exit_status = ORTE_SUCCESS;
> -
> if( is_global_listener_active ) {
> return ORTE_SUCCESS;
> }
>
> +#ifdef ENABLE_FT_FIXED
> + /* This is the old, now broken code */
> if (ORTE_SUCCESS != (ret = orte_rml.recv_buffer_nb(ORTE_NAME_WILDCARD,
>
> ORTE_RML_TAG_SSTORE_INTERNAL,
> ORTE_RML_PERSISTENT,
> @@ -1007,11 +1007,12 @@ static int sstore_stage_global_start_listener(void)
> exit_status = ret;
> goto cleanup;
> }
> +#endif /* ENABLE_FT_FIXED */
> + orte_rml.recv_buffer_nb(ORTE_NAME_WILDCARD, ORTE_RML_TAG_SSTORE_INTERNAL,
> + ORTE_RML_PERSISTENT, sstore_stage_global_recv,
> NULL);
>
> is_global_listener_active = true;
> -
> - cleanup:
> - return exit_status;
> + return ORTE_SUCCESS;
> }
>
> static int sstore_stage_global_stop_listener(void)
> diff --git a/orte/mca/sstore/stage/sstore_stage_local.c
> b/orte/mca/sstore/stage/sstore_stage_local.c
> index 792c1a2..88ded55 100644
> --- a/orte/mca/sstore/stage/sstore_stage_local.c
> +++ b/orte/mca/sstore/stage/sstore_stage_local.c
> @@ -1043,12 +1043,12 @@ static orte_sstore_stage_local_app_snapshot_info_t
> *find_app_handle_info(orte_ss
>
> static int sstore_stage_local_start_listener(void)
> {
> - int ret, exit_status = ORTE_SUCCESS;
> -
> if( is_global_listener_active ) {
> return ORTE_SUCCESS;
> }
>
> +#ifdef ENABLE_FT_FIXED
> + /* This is the old, now broken code */
> if (ORTE_SUCCESS != (ret = orte_rml.recv_buffer_nb(ORTE_NAME_WILDCARD,
>
> ORTE_RML_TAG_SSTORE_INTERNAL,
> ORTE_RML_PERSISTENT,
> @@ -1058,11 +1058,12 @@ static int sstore_stage_local_start_listener(void)
> exit_status = ret;
> goto cleanup;
> }
> +#endif /* ENABLE_FT_FIXED */
> + orte_rml.recv_buffer_nb(ORTE_NAME_WILDCARD, ORTE_RML_TAG_SSTORE_INTERNAL,
> + ORTE_RML_PERSISTENT, sstore_stage_local_recv,
> NULL);
>
> is_global_listener_active = true;
> -
> - cleanup:
> - return exit_status;
> + return ORTE_SUCCESS;
> }
>
> static int sstore_stage_local_stop_listener(void)
> diff --git a/orte/tools/orte-checkpoint/orte-checkpoint.c
> b/orte/tools/orte-checkpoint/orte-checkpoint.c
> index caa5949..62cb651 100644
> --- a/orte/tools/orte-checkpoint/orte-checkpoint.c
> +++ b/orte/tools/orte-checkpoint/orte-checkpoint.c
> @@ -652,6 +652,8 @@ static int ckpt_finalize(void) {
>
> static int start_listener(void)
> {
> +#ifdef ENABLE_FT_FIXED
> + /* This is the old, now broken code */
> int ret, exit_status = ORTE_SUCCESS;
>
> if (ORTE_SUCCESS != (ret = orte_rml.recv_buffer_nb(ORTE_NAME_WILDCARD,
> @@ -662,11 +664,12 @@ static int start_listener(void)
> exit_status = ret;
> goto cleanup;
> }
> +#endif /* ENABLE_FT_FIXED */
> + orte_rml.recv_buffer_nb(ORTE_NAME_WILDCARD, ORTE_RML_TAG_CKPT,
> + ORTE_RML_PERSISTENT, hnp_receiver, NULL);
>
> listener_started = true;
> -
> - cleanup:
> - return exit_status;
> + return ORTE_SUCCESS;
> }
>
> static int stop_listener(void)
> diff --git a/orte/tools/orte-migrate/orte-migrate.c
> b/orte/tools/orte-migrate/orte-migrate.c
> index 7ba2074..fe6f32e 100644
> --- a/orte/tools/orte-migrate/orte-migrate.c
> +++ b/orte/tools/orte-migrate/orte-migrate.c
> @@ -513,6 +513,8 @@ static int tool_finalize(void) {
>
> static int start_listener(void)
> {
> +#ifdef ENABLE_FT_FIXED
> + /* This is the old, now broken code */
> int ret, exit_status = ORTE_SUCCESS;
>
> if (ORTE_SUCCESS != (ret = orte_rml.recv_buffer_nb(ORTE_NAME_WILDCARD,
> @@ -523,11 +525,12 @@ static int start_listener(void)
> exit_status = ret;
> goto cleanup;
> }
> +#endif /* ENABLE_FT_FIXED */
> + orte_rml.recv_buffer_nb(ORTE_NAME_WILDCARD, ORTE_RML_TAG_MIGRATE,
> + ORTE_RML_PERSISTENT, hnp_receiver, NULL);
>
> listener_started = true;
> -
> - cleanup:
> - return exit_status;
> + return ORTE_SUCCESS;
> }
>
> static int stop_listener(void)
> --
> 1.8.4.2
>
> _______________________________________________
> devel mailing list
> de...@open-mpi.org
> http://www.open-mpi.org/mailman/listinfo.cgi/devel
