Merge remote-tracking branch 'origin/356-compilation-fail-for-256-ue' into...

Merge remote-tracking branch 'origin/356-compilation-fail-for-256-ue' into develop_integration_2018_w_41

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

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,

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
 }