Reverting r32346. Will do it the correct way and update the patch in Refs trac:32346
This commit was SVN r32348. The following SVN revision numbers were found above: r32346 --> open-mpi/ompi@5be6ff07d5 The following Trac tickets were found above: Ticket 32346 --> https://svn.open-mpi.org/trac/ompi/ticket/32346
Этот коммит содержится в:
родитель
98ccae8f28
Коммит
7a694cb95e
@ -265,17 +265,6 @@ static int btl_openib_component_close(void)
|
||||
opal_btl_openib_fd_finalize();
|
||||
opal_btl_openib_ini_finalize();
|
||||
|
||||
if (NULL != mca_btl_openib_component.receive_queues
|
||||
&& BTL_OPENIB_RQ_SOURCE_DEFAULT ==
|
||||
mca_btl_openib_component.receive_queues_source) {
|
||||
/*
|
||||
* In that case, the string has not been duplicated during variable
|
||||
* registration. So it won't be freed by the mca_base_var system.
|
||||
* Free it here.
|
||||
*/
|
||||
free(mca_btl_openib_component.receive_queues);
|
||||
}
|
||||
|
||||
if (NULL != mca_btl_openib_component.default_recv_qps) {
|
||||
free(mca_btl_openib_component.default_recv_qps);
|
||||
}
|
||||
|
@ -661,14 +661,12 @@ int btl_openib_register_mca_params(void)
|
||||
mca_btl_openib_component.default_recv_qps = default_qps;
|
||||
CHECK(reg_string("receive_queues", NULL,
|
||||
"Colon-delimited, comma-delimited list of receive queues: P,4096,8,6,4:P,32768,8,6,4",
|
||||
NULL, &mca_btl_openib_component.receive_queues,
|
||||
default_qps, &mca_btl_openib_component.receive_queues,
|
||||
0));
|
||||
if (NULL == mca_btl_openib_component.receive_queues) {
|
||||
mca_btl_openib_component.receive_queues = strdup(default_qps);
|
||||
mca_btl_openib_component.receive_queues_source = BTL_OPENIB_RQ_SOURCE_DEFAULT;
|
||||
} else {
|
||||
mca_btl_openib_component.receive_queues_source = BTL_OPENIB_RQ_SOURCE_MCA;
|
||||
}
|
||||
mca_btl_openib_component.receive_queues_source =
|
||||
(0 == strcmp(default_qps,
|
||||
mca_btl_openib_component.receive_queues)) ?
|
||||
BTL_OPENIB_RQ_SOURCE_DEFAULT : BTL_OPENIB_RQ_SOURCE_MCA;
|
||||
|
||||
CHECK(reg_string("if_include", NULL,
|
||||
"Comma-delimited list of devices/ports to be used (e.g. \"mthca0,mthca1:2\"; empty value means to use all ports found). Mutually exclusive with btl_openib_if_exclude.",
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user