Open MPI logo

Open MPI Development Mailing List Archives

  |   Home   |   Support   |   FAQ   |   all Development mailing list

Subject: Re: [OMPI devel] [PATCH v3 2/2] Trying to get the C/R code to compile again. (send_*_nb)
From: Ralph Castain (rhc_at_[hidden])
Date: 2013-12-19 16:01:55


+1 from me

On Dec 19, 2013, at 12:54 PM, Adrian Reber <adrian_at_[hidden]> wrote:

> From: Adrian Reber <adrian.reber_at_[hidden]>
>
> This patch changes all send/send_buffer occurrences in the C/R code
> to send_nb/send_buffer_nb.
> 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
>
> Changes from V2:
> * just replace the blocking calls with the non-blocking calls
> * all #ifdef's introduced in V1 are gone
> * send_* returns error code or ORTE_SUCCESS (not the number of bytes)
>
> Signed-off-by: Adrian Reber <adrian.reber_at_[hidden]>
> ---
> ompi/mca/crcp/bkmrk/crcp_bkmrk_pml.c | 23 ++++++----
> orte/mca/errmgr/base/errmgr_base_tool.c | 4 +-
> orte/mca/rml/ftrm/rml_ftrm.h | 19 --------
> orte/mca/rml/ftrm/rml_ftrm_component.c | 2 -
> orte/mca/rml/ftrm/rml_ftrm_module.c | 61 +++----------------------
> orte/mca/snapc/full/snapc_full_app.c | 20 ++++++--
> orte/mca/snapc/full/snapc_full_global.c | 15 ++++--
> orte/mca/snapc/full/snapc_full_local.c | 4 +-
> orte/mca/sstore/central/sstore_central_app.c | 8 +++-
> orte/mca/sstore/central/sstore_central_global.c | 4 +-
> orte/mca/sstore/central/sstore_central_local.c | 12 +++--
> orte/mca/sstore/stage/sstore_stage_app.c | 8 +++-
> orte/mca/sstore/stage/sstore_stage_global.c | 4 +-
> orte/mca/sstore/stage/sstore_stage_local.c | 16 +++++--
> orte/tools/orte-checkpoint/orte-checkpoint.c | 4 +-
> orte/tools/orte-migrate/orte-migrate.c | 4 +-
> 16 files changed, 99 insertions(+), 109 deletions(-)
>
> diff --git a/ompi/mca/crcp/bkmrk/crcp_bkmrk_pml.c b/ompi/mca/crcp/bkmrk/crcp_bkmrk_pml.c
> index 05cd598..5ad9a3e 100644
> --- a/ompi/mca/crcp/bkmrk/crcp_bkmrk_pml.c
> +++ b/ompi/mca/crcp/bkmrk/crcp_bkmrk_pml.c
> @@ -5077,7 +5077,7 @@ static int wait_quiesce_drained(void)
> "crcp:bkmrk: %s --> %s Send ACKs to Peer\n",
> OMPI_NAME_PRINT(OMPI_PROC_MY_NAME),
> OMPI_NAME_PRINT(&(cur_peer_ref->proc_name)) ));
> -
> +
> /* Send All Clear to Peer */
> if (NULL == (buffer = OBJ_NEW(opal_buffer_t))) {
> exit_status = OMPI_ERROR;
> @@ -5087,7 +5087,9 @@ static int wait_quiesce_drained(void)
> PACK_BUFFER(buffer, response, 1, OPAL_SIZE, "");
>
> /* JJH - Performance Optimization? - Why not post all isends, then wait? */
> - if ( 0 > ( ret = ompi_rte_send_buffer(&(cur_peer_ref->proc_name), buffer, OMPI_CRCP_COORD_BOOKMARK_TAG, 0)) ) {
> + if (ORTE_SUCCESS != (ret = ompi_rte_send_buffer_nb(&(cur_peer_ref->proc_name),
> + buffer, OMPI_CRCP_COORD_BOOKMARK_TAG,
> + orte_rml_send_callback, NULL))) {
> exit_status = ret;
> goto cleanup;
> }
> @@ -5288,7 +5290,9 @@ static int send_bookmarks(int peer_idx)
> PACK_BUFFER(buffer, (peer_ref->total_msgs_recvd), 1, OPAL_UINT32,
> "crcp:bkmrk: send_bookmarks: Unable to pack total_msgs_recvd");
>
> - if ( 0 > ( ret = ompi_rte_send_buffer(&peer_name, buffer, OMPI_CRCP_COORD_BOOKMARK_TAG, 0)) ) {
> + if (ORTE_SUCCSS != (ret = ompi_rte_send_buffer_nb(&peer_name, buffer,
> + OMPI_CRCP_COORD_BOOKMARK_TAG,
> + orte_rml_send_callback, NULL))) {
> opal_output(mca_crcp_bkmrk_component.super.output_handle,
> "crcp:bkmrk: send_bookmarks: Failed to send bookmark to peer %s: Return %d\n",
> OMPI_NAME_PRINT(&peer_name),
> @@ -5567,13 +5571,14 @@ static int do_send_msg_detail(ompi_crcp_bkmrk_pml_peer_ref_t *peer_ref,
> /*
> * Do the send...
> */
> - if ( 0 > ( ret = ompi_rte_send_buffer(&peer_ref->proc_name, buffer,
> - OMPI_CRCP_COORD_BOOKMARK_TAG, 0)) ) {
> + if (ORTE_SUCCESS != (ret = ompi_rte_send_buffer_nb(&peer_ref->proc_name, buffer,
> + OMPI_CRCP_COORD_BOOKMARK_TAG,
> + orte_rml_send_callback, NULL))) {
> opal_output(mca_crcp_bkmrk_component.super.output_handle,
> "crcp:bkmrk: do_send_msg_detail: Unable to send message details to peer %s: Return %d\n",
> OMPI_NAME_PRINT(&peer_ref->proc_name),
> ret);
> -
> +
> exit_status = OMPI_ERROR;
> goto cleanup;
> }
> @@ -6185,8 +6190,10 @@ static int do_recv_msg_detail_resp(ompi_crcp_bkmrk_pml_peer_ref_t *peer_ref,
> "crcp:bkmrk: recv_msg_details: Unable to ask peer for more messages");
> PACK_BUFFER(buffer, total_found, 1, OPAL_UINT32,
> "crcp:bkmrk: recv_msg_details: Unable to ask peer for more messages");
> -
> - if ( 0 > ( ret = ompi_rte_send_buffer(&peer_ref->proc_name, buffer, OMPI_CRCP_COORD_BOOKMARK_TAG, 0)) ) {
> +
> + if (ORTE_SUCCESS != (ret = ompi_rte_send_buffer_nb(&peer_ref->proc_name, buffer,
> + OMPI_CRCP_COORD_BOOKMARK_TAG,
> + orte_rml_send_callback, NULL))) {
> opal_output(mca_crcp_bkmrk_component.super.output_handle,
> "crcp:bkmrk: recv_msg_detail_resp: Unable to send message detail response to peer %s: Return %d\n",
> OMPI_NAME_PRINT(&peer_ref->proc_name),
> diff --git a/orte/mca/errmgr/base/errmgr_base_tool.c b/orte/mca/errmgr/base/errmgr_base_tool.c
> index 0b7890a..227c2d0 100644
> --- a/orte/mca/errmgr/base/errmgr_base_tool.c
> +++ b/orte/mca/errmgr/base/errmgr_base_tool.c
> @@ -221,7 +221,9 @@ int orte_errmgr_base_migrate_update(int status)
> goto cleanup;
> }
>
> - if (0 > (ret = orte_rml.send_buffer(&errmgr_cmdline_sender, loc_buffer, ORTE_RML_TAG_MIGRATE, 0))) {
> + if (ORTE_SUCCESS != (ret = orte_rml.send_buffer_nb(&errmgr_cmdline_sender,
> + loc_buffer, ORTE_RML_TAG_MIGRATE,
> + orte_rml_send_callback, NULL))) {
> opal_output(orte_errmgr_base_framework.framework_output,
> "errmgr:base:tool:update() Error: Send (status) Failure (ret = %d)\n",
> ret);
> diff --git a/orte/mca/rml/ftrm/rml_ftrm.h b/orte/mca/rml/ftrm/rml_ftrm.h
> index 055c891..98c9968 100644
> --- a/orte/mca/rml/ftrm/rml_ftrm.h
> +++ b/orte/mca/rml/ftrm/rml_ftrm.h
> @@ -71,40 +71,21 @@ BEGIN_C_DECLS
> int orte_rml_ftrm_ping(const char* uri, const struct timeval* tv);
>
> /*
> - * Send
> - */
> - int orte_rml_ftrm_send(orte_process_name_t* peer,
> - struct iovec *msg,
> - int count,
> - int tag,
> - int flags);
> -
> - /*
> * Send Non-blocking
> */
> int orte_rml_ftrm_send_nb(orte_process_name_t* peer,
> struct iovec* msg,
> int count,
> orte_rml_tag_t tag,
> - int flags,
> orte_rml_callback_fn_t cbfunc,
> void* cbdata);
>
> /*
> - * Send Buffer
> - */
> - int orte_rml_ftrm_send_buffer(orte_process_name_t* peer,
> - opal_buffer_t* buffer,
> - orte_rml_tag_t tag,
> - int flags);
> -
> - /*
> * Send Buffer Non-blocking
> */
> int orte_rml_ftrm_send_buffer_nb(orte_process_name_t* peer,
> opal_buffer_t* buffer,
> orte_rml_tag_t tag,
> - int flags,
> 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 0ffa79c..7cd5a69 100644
> --- a/orte/mca/rml/ftrm/rml_ftrm_component.c
> +++ b/orte/mca/rml/ftrm/rml_ftrm_component.c
> @@ -68,9 +68,7 @@ orte_rml_module_t orte_rml_ftrm_module = {
>
> orte_rml_ftrm_ping,
>
> - orte_rml_ftrm_send,
> orte_rml_ftrm_send_nb,
> - orte_rml_ftrm_send_buffer,
> orte_rml_ftrm_send_buffer_nb,
>
> orte_rml_ftrm_recv_nb,
> diff --git a/orte/mca/rml/ftrm/rml_ftrm_module.c b/orte/mca/rml/ftrm/rml_ftrm_module.c
> index 4ba6f2d..589ef65 100644
> --- a/orte/mca/rml/ftrm/rml_ftrm_module.c
> +++ b/orte/mca/rml/ftrm/rml_ftrm_module.c
> @@ -126,71 +126,23 @@ int orte_rml_ftrm_ping(const char* uri, const struct timeval* tv)
>
>
> /*
> - * Send
> - */
> -int orte_rml_ftrm_send(orte_process_name_t* peer,
> - struct iovec *msg,
> - int count,
> - int tag,
> - int flags)
> -{
> - int ret;
> -
> - opal_output_verbose(20, rml_ftrm_output_handle,
> - "orte_rml_ftrm: send(%s, %d, %d, %d )",
> - ORTE_NAME_PRINT(peer), count, tag, flags);
> -
> - if( NULL != orte_rml_ftrm_wrapped_module.send ) {
> - if( ORTE_SUCCESS != (ret = orte_rml_ftrm_wrapped_module.send(peer, msg, count, tag, flags) ) ) {
> - return ret;
> - }
> - }
> -
> - return ORTE_SUCCESS;
> -}
> -
> -/*
> * Send Non-blocking
> */
> int orte_rml_ftrm_send_nb(orte_process_name_t* peer,
> struct iovec* msg,
> int count,
> orte_rml_tag_t tag,
> - int flags,
> orte_rml_callback_fn_t cbfunc,
> void* cbdata)
> {
> int ret;
>
> opal_output_verbose(20, rml_ftrm_output_handle,
> - "orte_rml_ftrm: send_nb(%s, %d, %d, %d )",
> - ORTE_NAME_PRINT(peer), count, tag, flags);
> + "orte_rml_ftrm: send_nb(%s, %d, %d )",
> + ORTE_NAME_PRINT(peer), count, tag);
>
> if( NULL != orte_rml_ftrm_wrapped_module.send_nb ) {
> - if( ORTE_SUCCESS != (ret = orte_rml_ftrm_wrapped_module.send_nb(peer, msg, count, tag, flags, cbfunc, cbdata) ) ) {
> - return ret;
> - }
> - }
> -
> - return ORTE_SUCCESS;
> -}
> -
> -/*
> - * Send Buffer
> - */
> -int orte_rml_ftrm_send_buffer(orte_process_name_t* peer,
> - opal_buffer_t* buffer,
> - orte_rml_tag_t tag,
> - int flags)
> -{
> - int ret;
> -
> - opal_output_verbose(20, rml_ftrm_output_handle,
> - "orte_rml_ftrm: send_buffer(%s, %d, %d )",
> - ORTE_NAME_PRINT(peer), tag, flags);
> -
> - if( NULL != orte_rml_ftrm_wrapped_module.send_buffer ) {
> - if( ORTE_SUCCESS != (ret = orte_rml_ftrm_wrapped_module.send_buffer(peer, buffer, tag, flags) ) ) {
> + if(ORTE_SUCCESS != (ret = orte_rml_ftrm_wrapped_module.send_nb(peer, msg, count, tag, cbfunc, cbdata))) {
> return ret;
> }
> }
> @@ -204,18 +156,17 @@ int orte_rml_ftrm_send_buffer(orte_process_name_t* peer,
> int orte_rml_ftrm_send_buffer_nb(orte_process_name_t* peer,
> opal_buffer_t* buffer,
> orte_rml_tag_t tag,
> - int flags,
> orte_rml_buffer_callback_fn_t cbfunc,
> void* cbdata)
> {
> int ret;
>
> opal_output_verbose(20, rml_ftrm_output_handle,
> - "orte_rml_ftrm: send_buffer_nb(%s, %d, %d )",
> - ORTE_NAME_PRINT(peer), tag, flags);
> + "orte_rml_ftrm: send_buffer_nb(%s, %d )",
> + ORTE_NAME_PRINT(peer), tag);
>
> if( NULL != orte_rml_ftrm_wrapped_module.send_buffer_nb ) {
> - if( ORTE_SUCCESS != (ret = orte_rml_ftrm_wrapped_module.send_buffer_nb(peer, buffer, tag, flags, cbfunc, cbdata) ) ) {
> + if(ORTE_SUCCESS != (ret = orte_rml_ftrm_wrapped_module.send_buffer_nb(peer, buffer, tag, cbfunc, cbdata))) {
> return ret;
> }
> }
> diff --git a/orte/mca/snapc/full/snapc_full_app.c b/orte/mca/snapc/full/snapc_full_app.c
> index 862c9be..d79442e 100644
> --- a/orte/mca/snapc/full/snapc_full_app.c
> +++ b/orte/mca/snapc/full/snapc_full_app.c
> @@ -197,7 +197,9 @@ int app_coord_init()
> goto cleanup;
> }
>
> - if (0 > (ret = orte_rml.send_buffer(ORTE_PROC_MY_HNP, &buffer, ORTE_RML_TAG_SNAPC_FULL, 0))) {
> + if (ORTE_SUCCESS != (ret = orte_rml.send_buffer_nb(ORTE_PROC_MY_HNP, &buffer,
> + ORTE_RML_TAG_SNAPC_FULL,
> + orte_rml_send_callback, 0))) {
> ORTE_ERROR_LOG(ret);
> exit_status = ret;
> OBJ_DESTRUCT(&buffer);
> @@ -272,7 +274,9 @@ int app_coord_finalize()
> goto cleanup;
> }
>
> - if (0 > (ret = orte_rml.send_buffer(ORTE_PROC_MY_HNP, &buffer, ORTE_RML_TAG_SNAPC_FULL, 0))) {
> + if (ORTE_SUCCESS != (ret = orte_rml.send_buffer_nb(ORTE_PROC_MY_HNP, &buffer,
> + ORTE_RML_TAG_SNAPC_FULL,
> + orte_rml_send_callback, 0))) {
> ORTE_ERROR_LOG(ret);
> exit_status = ret;
> OBJ_DESTRUCT(&buffer);
> @@ -838,7 +842,9 @@ static int snapc_full_app_finished_msg(int cr_state) {
> goto cleanup;
> }
>
> - if (0 > (ret = orte_rml.send_buffer(ORTE_PROC_MY_DAEMON, &buffer, ORTE_RML_TAG_SNAPC, 0))) {
> + if (ORTE_SUCCESS != (ret = orte_rml.send_buffer_nb(ORTE_PROC_MY_DAEMON, &buffer,
> + ORTE_RML_TAG_SNAPC,
> + orte_rml_send_callback, 0))) {
> ORTE_ERROR_LOG(ret);
> exit_status = ret;
> goto cleanup;
> @@ -1271,7 +1277,9 @@ static int snapc_full_app_ft_event_update_process_info(orte_process_name_t proc,
> }
> #endif
>
> - if (0 > (ret = orte_rml.send_buffer(ORTE_PROC_MY_DAEMON, &buffer, ORTE_RML_TAG_SNAPC, 0))) {
> + if (ORTE_SUCCESS != (ret = orte_rml.send_buffer_nb(ORTE_PROC_MY_DAEMON, &buffer,
> + ORTE_RML_TAG_SNAPC,
> + orte_rml_send_callback, 0))) {
> ORTE_ERROR_LOG(ret);
> exit_status = ret;
> goto cleanup;
> @@ -1484,7 +1492,9 @@ int app_coord_request_op(orte_snapc_base_request_op_t *datum)
> }
> }
>
> - if (0 > (ret = orte_rml.send_buffer(ORTE_PROC_MY_HNP, &buffer, ORTE_RML_TAG_SNAPC_FULL, 0))) {
> + if (ORTE_SUCCESS != (ret = orte_rml.send_buffer_nb(ORTE_PROC_MY_HNP, &buffer,
> + ORTE_RML_TAG_SNAPC_FULL,
> + orte_rml_send_callback, 0))) {
> ORTE_ERROR_LOG(ret);
> exit_status = ret;
> OBJ_DESTRUCT(&buffer);
> diff --git a/orte/mca/snapc/full/snapc_full_global.c b/orte/mca/snapc/full/snapc_full_global.c
> index 9787591..0422aac 100644
> --- a/orte/mca/snapc/full/snapc_full_global.c
> +++ b/orte/mca/snapc/full/snapc_full_global.c
> @@ -1243,8 +1243,11 @@ static void snapc_full_process_request_op_cmd(orte_process_name_t* sender,
> goto cleanup;
> }
>
> - if (0 > (ret = orte_rml.send_buffer(sender, &buffer, ORTE_RML_TAG_SNAPC_FULL, 0))) {
> + if (ORTE_SUCCESS != (ret = orte_rml.send_buffer_nb(sender, &buffer,
> + ORTE_RML_TAG_SNAPC_FULL,
> + orte_rml_send_callback, NULL))) {
> ORTE_ERROR_LOG(ret);
> + /* FIXME: buffer not cleaned up */
> goto cleanup;
> }
> OBJ_DESTRUCT(&buffer);
> @@ -1296,8 +1299,11 @@ static void snapc_full_process_request_op_cmd(orte_process_name_t* sender,
> goto cleanup;
> }
>
> - if (0 > (ret = orte_rml.send_buffer(sender, &buffer, ORTE_RML_TAG_SNAPC_FULL, 0))) {
> + if (ORTE_SUCCESS != (ret = orte_rml.send_buffer_nb(sender, &buffer,
> + ORTE_RML_TAG_SNAPC_FULL,
> + orte_rml_send_callback, NULL))) {
> ORTE_ERROR_LOG(ret);
> + /* FIXME: buffer not cleaned up */
> goto cleanup;
> }
> OBJ_DESTRUCT(&buffer);
> @@ -1437,8 +1443,11 @@ static void snapc_full_process_request_op_cmd(orte_process_name_t* sender,
> goto cleanup;
> }
>
> - if (0 > (ret = orte_rml.send_buffer(sender, &buffer, ORTE_RML_TAG_SNAPC_FULL, 0))) {
> + if (ORTE_SUCCESS != (ret = orte_rml.send_buffer_nb(sender, &buffer,
> + ORTE_RML_TAG_SNAPC_FULL,
> + orte_rml_send_callback, NULL))) {
> ORTE_ERROR_LOG(ret);
> + /* FIXME: buffer not cleaned up */
> goto cleanup;
> }
> OBJ_DESTRUCT(&buffer);
> diff --git a/orte/mca/snapc/full/snapc_full_local.c b/orte/mca/snapc/full/snapc_full_local.c
> index 33215ac..0965571 100644
> --- a/orte/mca/snapc/full/snapc_full_local.c
> +++ b/orte/mca/snapc/full/snapc_full_local.c
> @@ -1345,7 +1345,9 @@ static int snapc_full_local_update_coord(int state, bool quick)
> }
>
> send_data:
> - if (0 > (ret = orte_rml.send_buffer(ORTE_PROC_MY_HNP, &buffer, ORTE_RML_TAG_SNAPC_FULL, 0))) {
> + if (ORTE_SUCCESS != (ret = orte_rml.send_buffer_nb(ORTE_PROC_MY_HNP, &buffer,
> + ORTE_RML_TAG_SNAPC_FULL,
> + orte_rml_send_callback, 0))) {
> ORTE_ERROR_LOG(ret);
> exit_status = ret;
> goto cleanup;
> diff --git a/orte/mca/sstore/central/sstore_central_app.c b/orte/mca/sstore/central/sstore_central_app.c
> index a7d6689..e32fb97 100644
> --- a/orte/mca/sstore/central/sstore_central_app.c
> +++ b/orte/mca/sstore/central/sstore_central_app.c
> @@ -462,7 +462,9 @@ static int pull_handle_info(orte_sstore_central_app_snapshot_info_t *handle_info
> goto cleanup;
> }
>
> - if (0 > (ret = orte_rml.send_buffer(ORTE_PROC_MY_DAEMON, &buffer, ORTE_RML_TAG_SSTORE_INTERNAL, 0))) {
> + if (ORTE_SUCCESS != (ret = orte_rml.send_buffer_nb(ORTE_PROC_MY_DAEMON, &buffer,
> + ORTE_RML_TAG_SSTORE_INTERNAL,
> + orte_rml_send_callback, NULL))) {
> ORTE_ERROR_LOG(ret);
> exit_status = ret;
> goto cleanup;
> @@ -586,7 +588,9 @@ static int push_handle_info(orte_sstore_central_app_snapshot_info_t *handle_info
> }
> }
>
> - if (0 > (ret = orte_rml.send_buffer(ORTE_PROC_MY_DAEMON, &buffer, ORTE_RML_TAG_SSTORE_INTERNAL, 0))) {
> + if (ORTE_SUCCESS != (ret = orte_rml.send_buffer_nb(ORTE_PROC_MY_DAEMON, &buffer,
> + ORTE_RML_TAG_SSTORE_INTERNAL,
> + orte_rml_send_callback, NULL))) {
> ORTE_ERROR_LOG(ret);
> exit_status = ret;
> goto cleanup;
> diff --git a/orte/mca/sstore/central/sstore_central_global.c b/orte/mca/sstore/central/sstore_central_global.c
> index 698910b..b18944d 100644
> --- a/orte/mca/sstore/central/sstore_central_global.c
> +++ b/orte/mca/sstore/central/sstore_central_global.c
> @@ -926,7 +926,9 @@ static int process_local_pull(orte_process_name_t* peer, opal_buffer_t* buffer,
> goto cleanup;
> }
>
> - if (0 > (ret = orte_rml.send_buffer(peer, &loc_buffer, ORTE_RML_TAG_SSTORE_INTERNAL, 0))) {
> + if (ORTE_SUCCESS != (ret = orte_rml.send_buffer_nb(peer, &loc_buffer,
> + ORTE_RML_TAG_SSTORE_INTERNAL,
> + orte_rml_send_callback, NULL))) {
> ORTE_ERROR_LOG(ret);
> exit_status = ret;
> goto cleanup;
> diff --git a/orte/mca/sstore/central/sstore_central_local.c b/orte/mca/sstore/central/sstore_central_local.c
> index 6df04ef..b3d498e 100644
> --- a/orte/mca/sstore/central/sstore_central_local.c
> +++ b/orte/mca/sstore/central/sstore_central_local.c
> @@ -760,7 +760,9 @@ static int process_app_pull(orte_process_name_t* peer, opal_buffer_t* buffer, or
> goto cleanup;
> }
>
> - if (0 > (ret = orte_rml.send_buffer(peer, &loc_buffer, ORTE_RML_TAG_SSTORE_INTERNAL, 0))) {
> + if (ORTE_SUCCESS != (ret = orte_rml.send_buffer_nb(peer, &loc_buffer,
> + ORTE_RML_TAG_SSTORE_INTERNAL,
> + orte_rml_send_callback, NULL))) {
> ORTE_ERROR_LOG(ret);
> exit_status = ret;
> goto cleanup;
> @@ -877,7 +879,9 @@ static int pull_handle_info(orte_sstore_central_local_snapshot_info_t *handle_in
> goto cleanup;
> }
>
> - if (0 > (ret = orte_rml.send_buffer(ORTE_PROC_MY_HNP, &buffer, ORTE_RML_TAG_SSTORE_INTERNAL, 0))) {
> + if (ORTE_SUCCESS != (ret = orte_rml.send_buffer_nb(ORTE_PROC_MY_HNP, &buffer,
> + ORTE_RML_TAG_SSTORE_INTERNAL,
> + orte_rml_send_callback, NULL))) {
> ORTE_ERROR_LOG(ret);
> exit_status = ret;
> goto cleanup;
> @@ -949,7 +953,9 @@ static int push_handle_info(orte_sstore_central_local_snapshot_info_t *handle_in
> }
> }
>
> - if (0 > (ret = orte_rml.send_buffer(ORTE_PROC_MY_HNP, &buffer, ORTE_RML_TAG_SSTORE_INTERNAL, 0))) {
> + if (ORTE_SUCCESS != (ret = orte_rml.send_buffer_nb(ORTE_PROC_MY_HNP, &buffer,
> + ORTE_RML_TAG_SSTORE_INTERNAL,
> + orte_rml_send_callback, NULL))) {
> ORTE_ERROR_LOG(ret);
> exit_status = ret;
> goto cleanup;
> diff --git a/orte/mca/sstore/stage/sstore_stage_app.c b/orte/mca/sstore/stage/sstore_stage_app.c
> index 88b6484..0a115e1 100644
> --- a/orte/mca/sstore/stage/sstore_stage_app.c
> +++ b/orte/mca/sstore/stage/sstore_stage_app.c
> @@ -451,7 +451,9 @@ static int pull_handle_info(orte_sstore_stage_app_snapshot_info_t *handle_info )
> goto cleanup;
> }
>
> - if (0 > (ret = orte_rml.send_buffer(ORTE_PROC_MY_DAEMON, &buffer, ORTE_RML_TAG_SSTORE_INTERNAL, 0))) {
> + if (ORTE_SUCCESS != (ret = orte_rml.send_buffer_nb(ORTE_PROC_MY_DAEMON, &buffer,
> + ORTE_RML_TAG_SSTORE_INTERNAL,
> + orte_rml_send_callback, NULL))) {
> ORTE_ERROR_LOG(ret);
> exit_status = ret;
> goto cleanup;
> @@ -566,7 +568,9 @@ static int push_handle_info(orte_sstore_stage_app_snapshot_info_t *handle_info )
> }
> }
>
> - if (0 > (ret = orte_rml.send_buffer(ORTE_PROC_MY_DAEMON, &buffer, ORTE_RML_TAG_SSTORE_INTERNAL, 0))) {
> + if (ORTE_SUCCESS != (ret = orte_rml.send_buffer_nb(ORTE_PROC_MY_DAEMON, &buffer,
> + ORTE_RML_TAG_SSTORE_INTERNAL,
> + orte_rml_send_callback, NULL))) {
> ORTE_ERROR_LOG(ret);
> exit_status = ret;
> goto cleanup;
> diff --git a/orte/mca/sstore/stage/sstore_stage_global.c b/orte/mca/sstore/stage/sstore_stage_global.c
> index 5af66d0..8f6a30e 100644
> --- a/orte/mca/sstore/stage/sstore_stage_global.c
> +++ b/orte/mca/sstore/stage/sstore_stage_global.c
> @@ -1151,7 +1151,9 @@ static int process_local_pull(orte_process_name_t* peer, opal_buffer_t* buffer,
> goto cleanup;
> }
>
> - if (0 > (ret = orte_rml.send_buffer(peer, &loc_buffer, ORTE_RML_TAG_SSTORE_INTERNAL, 0))) {
> + if (ORTE_SUCCESS != (ret = orte_rml.send_buffer_nb(peer, &loc_buffer,
> + ORTE_RML_TAG_SSTORE_INTERNAL,
> + orte_rml_send_callback, NULL))) {
> ORTE_ERROR_LOG(ret);
> exit_status = ret;
> goto cleanup;
> diff --git a/orte/mca/sstore/stage/sstore_stage_local.c b/orte/mca/sstore/stage/sstore_stage_local.c
> index 95d89a8..292c173 100644
> --- a/orte/mca/sstore/stage/sstore_stage_local.c
> +++ b/orte/mca/sstore/stage/sstore_stage_local.c
> @@ -1310,7 +1310,9 @@ static int process_global_remove(orte_process_name_t* peer, opal_buffer_t* buffe
> goto cleanup;
> }
>
> - if (0 > (ret = orte_rml.send_buffer(peer, &loc_buffer, ORTE_RML_TAG_SSTORE_INTERNAL, 0))) {
> + if (ORTE_SUCCESS != (ret = orte_rml.send_buffer_nb(peer, &loc_buffer,
> + ORTE_RML_TAG_SSTORE_INTERNAL,
> + orte_rml_send_callback, NULL))) {
> ORTE_ERROR_LOG(ret);
> exit_status = ret;
> goto cleanup;
> @@ -1388,7 +1390,9 @@ static int process_app_pull(orte_process_name_t* peer, opal_buffer_t* buffer, or
> goto cleanup;
> }
>
> - if (0 > (ret = orte_rml.send_buffer(peer, &loc_buffer, ORTE_RML_TAG_SSTORE_INTERNAL, 0))) {
> + if (ORTE_SUCCESS != (ret = orte_rml.send_buffer_nb(peer, &loc_buffer,
> + ORTE_RML_TAG_SSTORE_INTERNAL,
> + orte_rml_send_callback, NULL))) {
> ORTE_ERROR_LOG(ret);
> exit_status = ret;
> goto cleanup;
> @@ -1654,7 +1658,9 @@ static int pull_handle_info(orte_sstore_stage_local_snapshot_info_t *handle_info
> goto cleanup;
> }
>
> - if (0 > (ret = orte_rml.send_buffer(ORTE_PROC_MY_HNP, &buffer, ORTE_RML_TAG_SSTORE_INTERNAL, 0))) {
> + if (ORTE_SUCCESS != (ret = orte_rml.send_buffer_nb(ORTE_PROC_MY_HNP, &buffer,
> + ORTE_RML_TAG_SSTORE_INTERNAL,
> + orte_rml_send_callback, NULL))) {
> ORTE_ERROR_LOG(ret);
> exit_status = ret;
> goto cleanup;
> @@ -1739,7 +1745,9 @@ static int push_handle_info(orte_sstore_stage_local_snapshot_info_t *handle_info
> }
> }
>
> - if (0 > (ret = orte_rml.send_buffer(ORTE_PROC_MY_HNP, &buffer, ORTE_RML_TAG_SSTORE_INTERNAL, 0))) {
> + if (ORTE_SUCCESS != (ret = orte_rml.send_buffer_nb(ORTE_PROC_MY_HNP, &buffer,
> + ORTE_RML_TAG_SSTORE_INTERNAL,
> + orte_rml_send_callback, NULL))) {
> ORTE_ERROR_LOG(ret);
> exit_status = ret;
> goto cleanup;
> diff --git a/orte/tools/orte-checkpoint/orte-checkpoint.c b/orte/tools/orte-checkpoint/orte-checkpoint.c
> index e0f7b01..7106342 100644
> --- a/orte/tools/orte-checkpoint/orte-checkpoint.c
> +++ b/orte/tools/orte-checkpoint/orte-checkpoint.c
> @@ -833,7 +833,9 @@ static int notify_process_for_checkpoint(opal_crs_base_ckpt_options_t *options)
> goto cleanup;
> }
>
> - if ( 0 > (ret = orte_rml.send_buffer(&(orterun_hnp->name), buffer, ORTE_RML_TAG_CKPT, 0)) ) {
> + if (ORTE_SUCCESS != (ret = orte_rml.send_buffer_nb(&(orterun_hnp->name), buffer,
> + ORTE_RML_TAG_CKPT, hnp_receiver,
> + NULL))) {
> exit_status = ret;
> goto cleanup;
> }
> diff --git a/orte/tools/orte-migrate/orte-migrate.c b/orte/tools/orte-migrate/orte-migrate.c
> index b606e41..56f0d1f 100644
> --- a/orte/tools/orte-migrate/orte-migrate.c
> +++ b/orte/tools/orte-migrate/orte-migrate.c
> @@ -681,7 +681,9 @@ static int notify_hnp(void)
> goto cleanup;
> }
>
> - if ( 0 > (ret = orte_rml.send_buffer(&(orterun_hnp->name), buffer, ORTE_RML_TAG_MIGRATE, 0)) ) {
> + if (ORTE_SUCCESS != (ret = orte_rml.send_buffer_nb(&(orterun_hnp->name), buffer,
> + ORTE_RML_TAG_MIGRATE, orte_rml_send_callback,
> + NULL))) {
> exit_status = ret;
> goto cleanup;
> }
> --
> 1.8.4.2
>
> _______________________________________________
> devel mailing list
> devel_at_[hidden]
> http://www.open-mpi.org/mailman/listinfo.cgi/devel