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

OSC/UCX: opal progress register/unregister optimization

Просмотр исходного кода 
Signed-off-by: Sergey Oblomov <sergeyo@mellanox.com>
Этот коммит содержится в:
Sergey Oblomov 2018-07-19 12:07:26 +03:00
родитель 55b934bacf
Коммит 6f0a7a2005
1 изменённых файлов: 28 добавлений и 16 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

44
ompi/mca/osc/ucx/osc_ucx_component.c
Просмотреть файл

@ -110,10 +110,7 @@ static int component_register(void) {
} }
static int progress_callback(void) { static int progress_callback(void) {
if ((mca_osc_ucx_component.ucp_worker != NULL) && ucp_worker_progress(mca_osc_ucx_component.ucp_worker);
mca_osc_ucx_component.num_modules) {
ucp_worker_progress(mca_osc_ucx_component.ucp_worker);
}
return 0; return 0;
} }
@ -140,7 +137,6 @@ static int component_finalize(void) {
assert(mca_osc_ucx_component.num_incomplete_req_ops == 0); assert(mca_osc_ucx_component.num_incomplete_req_ops == 0);
if (mca_osc_ucx_component.env_initialized == true) { if (mca_osc_ucx_component.env_initialized == true) {
OBJ_DESTRUCT(&mca_osc_ucx_component.requests); OBJ_DESTRUCT(&mca_osc_ucx_component.requests);
opal_progress_unregister(progress_callback);
ucp_cleanup(mca_osc_ucx_component.ucp_context); ucp_cleanup(mca_osc_ucx_component.ucp_context);
mca_osc_ucx_component.env_initialized = false; mca_osc_ucx_component.env_initialized = false;
} }
@ -250,7 +246,7 @@ static int component_select(struct ompi_win_t *win, void **base, size_t size, in
ucs_status_t status; ucs_status_t status;
int i, comm_size = ompi_comm_size(comm); int i, comm_size = ompi_comm_size(comm);
int is_eps_ready; int is_eps_ready;
bool progress_registered = false, eps_created = false, env_initialized = false; bool eps_created = false, env_initialized = false;
ucp_address_t *my_addr = NULL; ucp_address_t *my_addr = NULL;
size_t my_addr_len; size_t my_addr_len;
char *recv_buf = NULL; char *recv_buf = NULL;
@ -327,13 +323,6 @@ static int component_select(struct ompi_win_t *win, void **base, size_t size, in
goto error_nomem; goto error_nomem;
} }
ret = opal_progress_register(progress_callback);
progress_registered = true;
if (OMPI_SUCCESS != ret) {
OSC_UCX_VERBOSE(1, "opal_progress_register failed: %d", ret);
goto error;
}
/* query UCP worker attributes */ /* query UCP worker attributes */
worker_attr.field_mask = UCP_WORKER_ATTR_FIELD_THREAD_MODE; worker_attr.field_mask = UCP_WORKER_ATTR_FIELD_THREAD_MODE;
status = ucp_worker_query(mca_osc_ucx_component.ucp_worker, &worker_attr); status = ucp_worker_query(mca_osc_ucx_component.ucp_worker, &worker_attr);
@ -617,6 +606,14 @@ static int component_select(struct ompi_win_t *win, void **base, size_t size, in
goto error; goto error;
} }
OSC_UCX_ASSERT(mca_osc_ucx_component.num_modules > 0);
if (1 == mca_osc_ucx_component.num_modules) {
ret = opal_progress_register(progress_callback);
if (OMPI_SUCCESS != ret) {
OSC_UCX_VERBOSE(1, "opal_progress_register failed: %d", ret);
goto error;
}
}
return ret; return ret;
error: error:
@ -644,9 +641,17 @@ static int component_select(struct ompi_win_t *win, void **base, size_t size, in
ucp_ep_destroy(ep); ucp_ep_destroy(ep);
} }
} }
if (progress_registered) opal_progress_unregister(progress_callback); if (module) {
if (module) free(module); free(module);
mca_osc_ucx_component.num_modules--; mca_osc_ucx_component.num_modules--;
OSC_UCX_ASSERT(mca_osc_ucx_component.num_modules >= 0);
if (0 == mca_osc_ucx_component.num_modules) {
ret = opal_progress_unregister(progress_callback);
if (OMPI_SUCCESS != ret) {
OSC_UCX_VERBOSE(1, "opal_progress_unregister failed: %d", ret);
}
}
}
error_nomem: error_nomem:
if (env_initialized == true) { if (env_initialized == true) {
@ -815,6 +820,13 @@ int ompi_osc_ucx_free(struct ompi_win_t *win) {
free(module); free(module);
mca_osc_ucx_component.num_modules--; mca_osc_ucx_component.num_modules--;
OSC_UCX_ASSERT(mca_osc_ucx_component.num_modules >= 0);
if (0 == mca_osc_ucx_component.num_modules) {
ret = opal_progress_unregister(progress_callback);
if (OMPI_SUCCESS != ret) {
OSC_UCX_VERBOSE(1, "opal_progress_unregister failed: %d", ret);
}
}
return ret; return ret;
} }