remove bug in turning on mem hooks automatically when leave pinned is
specified. Turn mem hooks on automatically when sbrk is not disabled and pml_ob1_leave_pinnned_pipeline is specified. This commit was SVN r9018.
Этот коммит содержится в:
родитель
dfe73b5e16
Коммит
2b40758cf8
@ -95,16 +95,25 @@ int mca_mpool_base_open(void)
|
|||||||
&mca_mpool_base_disable_sbrk);
|
&mca_mpool_base_disable_sbrk);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* force mem hooks if leave_pinned is enabled */
|
/* force mem hooks if leave_pinned or leave_pinned_pipeline is enabled */
|
||||||
#ifdef HAVE_MALLOC_H
|
#ifdef HAVE_MALLOC_H
|
||||||
if(0 == mca_mpool_base_use_mem_hooks && 0 == mca_mpool_base_disable_sbrk) {
|
if(0 == mca_mpool_base_use_mem_hooks && 0 == mca_mpool_base_disable_sbrk) {
|
||||||
#else
|
#else
|
||||||
if(0 == mca_mpool_base_use_mem_hooks && 0) {
|
if(0 == mca_mpool_base_use_mem_hooks ) {
|
||||||
#endif
|
#endif
|
||||||
int param;
|
int param;
|
||||||
mca_base_param_register_int("mpi", NULL, "leave_pinned", "leave_pinned", 0);
|
mca_base_param_register_int("mpi", NULL, "leave_pinned", "leave_pinned", 0);
|
||||||
param = mca_base_param_find("mpi", NULL, "leave_pinned");
|
param = mca_base_param_find("mpi", NULL, "leave_pinned");
|
||||||
mca_base_param_lookup_int(param, &mca_mpool_base_use_mem_hooks);
|
mca_base_param_lookup_int(param, &mca_mpool_base_use_mem_hooks);
|
||||||
|
|
||||||
|
if(0 == mca_mpool_base_use_mem_hooks) {
|
||||||
|
/* and now check leave_pinned_pipeline if necessary */
|
||||||
|
mca_base_param_register_int("pml", "ob1",
|
||||||
|
"leave_pinned_pipeline",
|
||||||
|
"leave_pinned_pipeline", 0);
|
||||||
|
param = mca_base_param_find("pml", "ob1", "leave_pinned_pipeline");
|
||||||
|
mca_base_param_lookup_int(param, &mca_mpool_base_use_mem_hooks);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* get the page size for this architecture*/
|
/* get the page size for this architecture*/
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user