Changeset 3081 for pjproject/trunk/pjlib/src/pj/pool.c

Timestamp:

Jan 29, 2010 10:10:49 AM (14 years ago)

Author:

bennylp

Message:

Fixed ticket #1037: Memory pool alignment error when alignment is set to be greater than the default (thanks John Ridges for the report):

• fixed the pool allocation routines in PJLIB,
• add alignment test in pjlib-test (only useful if PJ_POOL_ALIGNMENT is configured in config_site.h),
• fixed other pool tests in pjlib-test which are broken when PJ_POOL_ALIGNMENT is enlarged

File:

• pjproject/trunk/pjlib/src/pj/pool.c (modified) (2 diffs)

pjproject/trunk/pjlib/src/pj/pool.c

@@ -213 +213 @@
     /* Create the first block from the memory. */
     block = (pj_pool_block*) (buffer + sizeof(*pool));
-    block->cur = block->buf = ((unsigned char*)block) + sizeof(pj_pool_block);
+    block->buf = ((unsigned char*)block) + sizeof(pj_pool_block);
     block->end = buffer + initial_size;
+
+    /* Set the start pointer, aligning it as needed */
+    block->cur = (unsigned char*)
+                 (((unsigned long)block->buf + PJ_POOL_ALIGNMENT - 1) &
+                  ~(PJ_POOL_ALIGNMENT - 1));
+
     pj_list_insert_after(&pool->block_list, block);
 
@@ -255 +261 @@
 
     block = pool->block_list.next;
-    block->cur = block->buf;
+
+    /* Set the start pointer, aligning it as needed */
+    block->cur = (unsigned char*)
+                 (((unsigned long)block->buf + PJ_POOL_ALIGNMENT - 1) &
+                  ~(PJ_POOL_ALIGNMENT - 1));
+
     pool->capacity = block->end - (unsigned char*)pool;
 }