From 344bb641a1b46ac469b3f7b49fa1cb1a95931d42 Mon Sep 17 00:00:00 2001 From: Xin Zhao Date: Wed, 28 Nov 2018 16:14:03 -0800 Subject: [PATCH] opal/common/ucx: Minor changes in wpool Signed-off-by: Artem Polyakov --- opal/mca/common/ucx/common_ucx_wpool.c | 6 ++++-- opal/mca/common/ucx/common_ucx_wpool.h | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/opal/mca/common/ucx/common_ucx_wpool.c b/opal/mca/common/ucx/common_ucx_wpool.c index f3032baba1..e2e0dd7fae 100644 --- a/opal/mca/common/ucx/common_ucx_wpool.c +++ b/opal/mca/common/ucx/common_ucx_wpool.c @@ -543,6 +543,8 @@ int opal_common_ucx_wpmem_create(opal_common_ucx_ctx_t *ctx, opal_common_ucx_mem_type_t mem_type, opal_common_ucx_exchange_func_t exchange_func, void *exchange_metadata, + char **my_mem_addr, + int *my_mem_addr_size, opal_common_ucx_wpmem_t **mem_ptr) { opal_common_ucx_wpmem_t *mem = calloc(1, sizeof(*mem)); @@ -581,8 +583,6 @@ int opal_common_ucx_wpmem_create(opal_common_ucx_ctx_t *ctx, ret = exchange_func(rkey_addr, rkey_addr_len, &mem->mem_addrs, &mem->mem_displs, exchange_metadata); WPOOL_DBG_OUT(_dbg_mem, "\tcomplete exchange"); - - ucp_rkey_buffer_release(rkey_addr); if (ret != OPAL_SUCCESS) { goto error_rkey_pack; } @@ -592,6 +592,8 @@ int opal_common_ucx_wpmem_create(opal_common_ucx_ctx_t *ctx, pthread_key_create(&mem->mem_tls_key, NULL); (*mem_ptr) = mem; + (*my_mem_addr) = rkey_addr; + (*my_mem_addr_size) = rkey_addr_len; WPOOL_DBG_OUT(_dbg_mem, "mem = %p. Done\n", (void *)mem); return ret; diff --git a/opal/mca/common/ucx/common_ucx_wpool.h b/opal/mca/common/ucx/common_ucx_wpool.h index fc2745c542..5ad19e6e28 100644 --- a/opal/mca/common/ucx/common_ucx_wpool.h +++ b/opal/mca/common/ucx/common_ucx_wpool.h @@ -227,6 +227,8 @@ OPAL_DECLSPEC int opal_common_ucx_wpmem_create(opal_common_ucx_ctx_t *ctx, opal_common_ucx_mem_type_t mem_type, opal_common_ucx_exchange_func_t exchange_func, void *exchange_metadata, + char **my_mem_addr, + int *my_mem_addr_size, opal_common_ucx_wpmem_t **mem_ptr); OPAL_DECLSPEC int opal_common_ucx_wpmem_free(opal_common_ucx_wpmem_t *mem);