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

Timestamp:

Nov 21, 2005 4:58:03 PM (18 years ago)

Author:

bennylp

Message:

Small optimization in pool (removed used_size)

File:

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

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

@@ -46 +46 @@
 
     LOG((pool->obj_name, "create_block(sz=%u), cur.cap=%u, cur.used=%u", 
-         size, pool->capacity, pool->used_size));
+         size, pool->capacity, pj_pool_get_used_size(pool)));
 
     /* Request memory from allocator. */
@@ -58 +58 @@
     /* Add capacity. */
     pool->capacity += size;
-    pool->used_size += sizeof(pj_pool_block);
 
     /* Set block attribytes. */
@@ -87 +86 @@
 
     while (block != &pool->block_list) {
-        p = pj_pool_alloc_from_block(pool, block, size);
+        p = pj_pool_alloc_from_block(block, size);
         if (p != NULL)
             return p;
@@ -98 +97 @@
         LOG((pool->obj_name, "Can't expand pool to allocate %u bytes "
              "(used=%u, cap=%u)",
-             size, pool->used_size, pool->capacity));
+             size, pj_pool_get_used_size(pool), pool->capacity));
         (*pool->callback)(pool, size);
         return NULL;
@@ -119 +118 @@
     LOG((pool->obj_name, 
          "%u bytes requested, resizing pool by %u bytes (used=%u, cap=%u)",
-         size, block_size, pool->used_size, pool->capacity));
+         size, block_size, pj_pool_get_used_size(pool), pool->capacity));
 
     block = pj_pool_create_block(pool, block_size);
@@ -125 +124 @@
         return NULL;
 
-    p = pj_pool_alloc_from_block(pool, block, size);
+    p = pj_pool_alloc_from_block(block, size);
     pj_assert(p != NULL);
 #if PJ_DEBUG
@@ -143 +142 @@
                                 pj_pool_callback *callback)
 {
-    pj_pool_block *block;
-
     PJ_CHECK_STACK();
 
     pool->increment_size = increment_size;
     pool->callback = callback;
-    pool->used_size = sizeof(*pool);
-    block = pool->block_list.next;
-    while (block != &pool->block_list) {
-        pool->used_size += sizeof(pj_pool_block);
-        block = block->next;
-    }
 
     if (name) {
@@ -238 +229 @@
     block->cur = block->buf;
     pool->capacity = block->end - (unsigned char*)pool;
-    pool->used_size = 0;
 }
 
@@ -247 +237 @@
 {
     LOG((pool->obj_name, "reset(): cap=%d, used=%d(%d%%)", 
-        pool->capacity, pool->used_size, pool->used_size*100/pool->capacity));
+        pool->capacity, pj_pool_get_used_size(pool), 
+        pj_pool_get_used_size(pool)*100/pool->capacity));
 
     reset_pool(pool);
@@ -260 +251 @@
 
     LOG((pool->obj_name, "destroy(): cap=%d, used=%d(%d%%), block0=%p-%p", 
-        pool->capacity, pool->used_size, pool->used_size*100/pool->capacity,
+        pool->capacity, pj_pool_get_used_size(pool), 
+        pj_pool_get_used_size(pool)*100/pool->capacity,
         ((pj_pool_block*)pool->block_list.next)->buf, 
         ((pj_pool_block*)pool->block_list.next)->end));