From 090fcc5aae072cf9c45af1a64caa6f48a4c64f95 Mon Sep 17 00:00:00 2001 From: laurent Date: Mon, 8 Oct 2018 11:25:16 +0200 Subject: [PATCH 1/2] move mem_block to heap --- openair2/UTIL/MEM/mem_block.c | 2 ++ openair2/UTIL/MEM/mem_block.h | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/openair2/UTIL/MEM/mem_block.c b/openair2/UTIL/MEM/mem_block.c index 6d1a289f08..0150ef00cd 100644 --- a/openair2/UTIL/MEM/mem_block.c +++ b/openair2/UTIL/MEM/mem_block.c @@ -61,6 +61,7 @@ uint32_t counters[14] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; /* * initialize all ures */ +extern mem_pool *memBlockVar; void * pool_buffer_init (void) { @@ -68,6 +69,7 @@ pool_buffer_init (void) uint32_t index, mb_index, pool_index; mem_pool *memory = (mem_pool *) &mem_block_var; + memBlockVar=malloc(sizeof(mem_pool)); int pool_sizes[14] = { MEM_MNGT_MB0_NB_BLOCKS, MEM_MNGT_MB1_NB_BLOCKS, MEM_MNGT_MB2_NB_BLOCKS, MEM_MNGT_MB3_NB_BLOCKS, MEM_MNGT_MB4_NB_BLOCKS, MEM_MNGT_MB5_NB_BLOCKS, diff --git a/openair2/UTIL/MEM/mem_block.h b/openair2/UTIL/MEM/mem_block.h index 861e4a8ea4..18ded1a599 100644 --- a/openair2/UTIL/MEM/mem_block.h +++ b/openair2/UTIL/MEM/mem_block.h @@ -178,7 +178,8 @@ typedef struct { } mem_pool; -mem_pool mem_block_var; +mem_pool *memBlockVar; +#define mem_block_var (*memBlockVar) #ifdef __cplusplus } From 24e9667ced8e7264b308cccb34ab3583d621beb4 Mon Sep 17 00:00:00 2001 From: Raphael Defosseux Date: Mon, 8 Oct 2018 11:57:39 +0200 Subject: [PATCH 2/2] CI: adding --mu option to one of the VM-built variant Signed-off-by: Raphael Defosseux --- ci-scripts/buildOnVM.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci-scripts/buildOnVM.sh b/ci-scripts/buildOnVM.sh index 3eb24932bf..2a358c9bac 100755 --- a/ci-scripts/buildOnVM.sh +++ b/ci-scripts/buildOnVM.sh @@ -127,7 +127,7 @@ case $key in ARCHIVES_LOC=enb_usrp LOG_PATTERN=.Rel14.txt NB_PATTERN_FILES=4 - BUILD_OPTIONS="--eNB -w USRP" + BUILD_OPTIONS="--eNB -w USRP --mu" shift ;; -v2) @@ -181,7 +181,7 @@ case $key in ARCHIVES_LOC=enb_usrp LOG_PATTERN=.Rel14.txt NB_PATTERN_FILES=4 - BUILD_OPTIONS="--eNB -w USRP" + BUILD_OPTIONS="--eNB -w USRP --mu" ;; basic-sim) VM_NAME=ci-basic-sim