Changeset 4395 for pjproject/branches/1.x

Timestamp:

Feb 27, 2013 12:07:30 PM (12 years ago)

Author:

ming

Message:

Re #1593: Backported to 1.x

Location:

pjproject/branches/1.x

Files:

• . (modified) (1 prop)
• pjlib/include/pj/pool.h (modified) (1 diff)
• pjlib/include/pj/pool_i.h (modified) (1 diff)
• pjlib/src/pj/pool.c (modified) (2 diffs)
• pjlib/src/pj/pool_caching.c (modified) (2 diffs)

pjproject/branches/1.x/pjlib/include/pj/pool.h

@@ -510 +510 @@
  */
 PJ_IDECL(void*) pj_pool_alloc_from_block(pj_pool_block *block, pj_size_t size);
-PJ_DECL(void*) pj_pool_allocate_find(pj_pool_t *pool, unsigned size);
+PJ_DECL(void*) pj_pool_allocate_find(pj_pool_t *pool, pj_size_t size);
 
 

pjproject/branches/1.x/pjlib/include/pj/pool_i.h

@@ -48 +48 @@
         size = (size + PJ_POOL_ALIGNMENT) & ~(PJ_POOL_ALIGNMENT-1);
     }
-    if ((unsigned)(block->end - block->cur) >= size) {
+    if ((pj_size_t)(block->end - block->cur) >= size) {
         void *ptr = block->cur;
         block->cur += size;

pjproject/branches/1.x/pjlib/src/pj/pool.c

@@ -89 +89 @@
  * (depending on whether the pool is allowed to resize).
  */
-PJ_DEF(void*) pj_pool_allocate_find(pj_pool_t *pool, unsigned size)
+PJ_DEF(void*) pj_pool_allocate_find(pj_pool_t *pool, pj_size_t size)
 {
     pj_pool_block *block = pool->block_list.next;
@@ -122 +122 @@
             size + sizeof(pj_pool_block) + PJ_POOL_ALIGNMENT) 
     {
-        unsigned count;
+        pj_size_t count;
         count = (size + pool->increment_size + sizeof(pj_pool_block) +
                  PJ_POOL_ALIGNMENT) / 

pjproject/branches/1.x/pjlib/src/pj/pool_caching.c

@@ -179 +179 @@
 
         /* Update pool manager's free capacity. */
-        cp->capacity -= pj_pool_get_capacity(pool);
+        if (cp->capacity > pj_pool_get_capacity(pool)) {
+            cp->capacity -= pj_pool_get_capacity(pool);
+        } else {
+            cp->capacity = 0;
+        }
 
         PJ_LOG(6, (pool->obj_name, "pool reused, size=%u", pool->capacity));
@@ -200 +204 @@
 {
     pj_caching_pool *cp = (pj_caching_pool*)pf;
-    unsigned pool_capacity;
+    pj_size_t pool_capacity;
     unsigned i;