1
1

opal/common/ucx: Minor changes in wpool

Signed-off-by: Artem Polyakov <artpol84@gmail.com>
Этот коммит содержится в:
Xin Zhao 2018-11-28 16:14:03 -08:00 коммит произвёл Artem Polyakov
родитель 9fb9cfbe8e
Коммит 344bb641a1
2 изменённых файлов: 6 добавлений и 2 удалений

Просмотреть файл

@ -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_mem_type_t mem_type,
opal_common_ucx_exchange_func_t exchange_func, opal_common_ucx_exchange_func_t exchange_func,
void *exchange_metadata, 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_ptr)
{ {
opal_common_ucx_wpmem_t *mem = calloc(1, sizeof(*mem)); 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, ret = exchange_func(rkey_addr, rkey_addr_len,
&mem->mem_addrs, &mem->mem_displs, exchange_metadata); &mem->mem_addrs, &mem->mem_displs, exchange_metadata);
WPOOL_DBG_OUT(_dbg_mem, "\tcomplete exchange"); WPOOL_DBG_OUT(_dbg_mem, "\tcomplete exchange");
ucp_rkey_buffer_release(rkey_addr);
if (ret != OPAL_SUCCESS) { if (ret != OPAL_SUCCESS) {
goto error_rkey_pack; 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); pthread_key_create(&mem->mem_tls_key, NULL);
(*mem_ptr) = mem; (*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); WPOOL_DBG_OUT(_dbg_mem, "mem = %p. Done\n", (void *)mem);
return ret; return ret;

Просмотреть файл

@ -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_mem_type_t mem_type,
opal_common_ucx_exchange_func_t exchange_func, opal_common_ucx_exchange_func_t exchange_func,
void *exchange_metadata, 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_ptr);
OPAL_DECLSPEC int opal_common_ucx_wpmem_free(opal_common_ucx_wpmem_t *mem); OPAL_DECLSPEC int opal_common_ucx_wpmem_free(opal_common_ucx_wpmem_t *mem);