From 8f8ed186f1cccf99a7e9d88e26385226b45a0ba5 Mon Sep 17 00:00:00 2001 From: Galen Shipman Date: Mon, 6 Feb 2006 21:22:20 +0000 Subject: [PATCH] When leave pinned is set, only enable mem hooks if disable sbrk is not set. This commit was SVN r8908. --- ompi/mca/mpool/base/mpool_base_open.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ompi/mca/mpool/base/mpool_base_open.c b/ompi/mca/mpool/base/mpool_base_open.c index 5223a23e8d..202f422369 100644 --- a/ompi/mca/mpool/base/mpool_base_open.c +++ b/ompi/mca/mpool/base/mpool_base_open.c @@ -94,9 +94,13 @@ int mca_mpool_base_open(void) 0, &mca_mpool_base_disable_sbrk); #endif - + /* force mem hooks if leave_pinned is enabled */ - if(0 == mca_mpool_base_use_mem_hooks) { +#ifdef HAVE_MALLOC_H + if(0 == mca_mpool_base_use_mem_hooks && 0 == mca_mpool_base_disable_sbrk) { +#else + if(0 == mca_mpool_base_use_mem_hooks && 0) { +#endif int param; mca_base_param_register_int("mpi", NULL, "leave_pinned", "leave_pinned", 0); param = mca_base_param_find("mpi", NULL, "leave_pinned");