Changeset 3081 for pjproject/trunk/pjlib/src/pjlib-test/pool_perf.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/pjlib-test/pool_perf.c (modified) (1 diff)

pjproject/trunk/pjlib/src/pjlib-test/pool_perf.c

@@ -128 +128 @@
     /* Initialize size of chunks to allocate in for the test. */
     for (i=0; i<COUNT; ++i) {
+        unsigned aligned_size;
         sizes[i] = MIN_SIZE + (pj_rand() % MAX_SIZE);
-        total_size += sizes[i];
+        aligned_size = sizes[i];
+        if (aligned_size & (PJ_POOL_ALIGNMENT-1))
+            aligned_size = ((aligned_size + PJ_POOL_ALIGNMENT - 1)) & ~(PJ_POOL_ALIGNMENT - 1);
+        total_size += aligned_size;
     }