@@ -102,6 +102,9 @@ gen_lock_t *mem_lock;
102
102
103
103
#if defined F_PARALLEL_MALLOC
104
104
gen_lock_t * hash_locks [TOTAL_F_PARALLEL_POOLS ];
105
+ /* we allocated TOTAL_F_PARALLEL_POOLS mem blocks */
106
+ static void * * shm_mempools = NULL ;
107
+ void * * shm_blocks ;
105
108
#endif
106
109
107
110
#ifdef HP_MALLOC
@@ -111,10 +114,6 @@ gen_lock_t *mem_locks;
111
114
static void * shm_mempool = INVALID_MAP ;
112
115
void * shm_block ;
113
116
114
- /* we allocated TOTAL_F_PARALLEL_POOLS mem blocks */
115
- static void * * shm_mempools = NULL ;
116
- void * * shm_blocks ;
117
-
118
117
int init_done = 0 ;
119
118
120
119
#ifdef DBG_MALLOC
@@ -557,7 +556,9 @@ int shm_mem_init_mallocs(void* mempool, unsigned long pool_size,int idx)
557
556
558
557
if (mem_allocator_shm != MM_F_PARALLEL_MALLOC && mem_allocator_shm != MM_F_PARALLEL_MALLOC_DBG ) {
559
558
if (!shm_block ){
559
+ #ifdef F_PARALLEL_MALLOC
560
560
err_destroy :
561
+ #endif
561
562
LM_CRIT ("could not initialize shared malloc\n" );
562
563
shm_mem_destroy ();
563
564
return -1 ;
@@ -764,8 +765,7 @@ int shm_dbg_mem_init_mallocs(void* mempool, unsigned long pool_size)
764
765
765
766
int shm_mem_init (void )
766
767
{
767
- int fd = -1 ,i = 0 ;
768
- unsigned long block_size ;
768
+ int fd = -1 ;
769
769
LM_INFO ("allocating SHM block\n" );
770
770
771
771
#ifdef SHM_MMAP
@@ -808,8 +808,10 @@ int shm_mem_init(void)
808
808
#ifdef F_PARALLEL_MALLOC
809
809
if (mem_allocator_shm == MM_F_PARALLEL_MALLOC ||
810
810
mem_allocator_shm == MM_F_PARALLEL_MALLOC_DBG ) {
811
+ int i ;
811
812
LM_DBG ("Paralel malloc, total pools size is %d\n" ,TOTAL_F_PARALLEL_POOLS );
812
813
for (i = 0 ;i < TOTAL_F_PARALLEL_POOLS ;i ++ ) {
814
+ unsigned long block_size ;
813
815
814
816
block_size = shm_mem_size /TOTAL_F_PARALLEL_POOLS ;
815
817
shm_mempools [i ] = shm_getmem (fd ,NULL ,block_size );
0 commit comments