Changeset 364 for pjproject/trunk/pjlib/src/pj/pool_caching.c

Timestamp:

Mar 30, 2006 3:56:01 PM (18 years ago)

Author:

bennylp

Message:

Added ability to have custom pool backend (needed for pool debugging facility)

File:

• pjproject/trunk/pjlib/src/pj/pool_caching.c (modified) (9 diffs)

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

@@ -23 +23 @@
 #include <pj/os.h>
 
+#if !PJ_HAS_POOL_ALT_API
+
 static pj_pool_t* cpool_create_pool(pj_pool_factory *pf, 
                                     const char *name,
@@ -164 +166 @@
 {
     pj_caching_pool *cp = (pj_caching_pool*)pf;
+    unsigned pool_capacity;
     int i;
 
@@ -175 +178 @@
     /* Decrement used count. */
     --cp->used_count;
+
+    pool_capacity = pj_pool_get_capacity(pool);
 
     /* Destroy the pool if the size is greater than our size or if the total
@@ -180 +185 @@
      * maximum capacity.
    . */
-    if (pool->capacity > pool_sizes[PJ_CACHING_POOL_ARRAY_SIZE-1] ||
-        cp->capacity + pool->capacity > cp->max_capacity)
+    if (pool_capacity > pool_sizes[PJ_CACHING_POOL_ARRAY_SIZE-1] ||
+        cp->capacity + pool_capacity > cp->max_capacity)
     {
         pj_pool_destroy_int(pool);
@@ -190 +195 @@
     /* Reset pool. */
     PJ_LOG(6, (pool->obj_name, "recycle(): cap=%d, used=%d(%d%%)", 
-               pool->capacity, pj_pool_get_used_size(pool), 
-               pj_pool_get_used_size(pool)*100/pool->capacity));
+               pool_capacity, pj_pool_get_used_size(pool), 
+               pj_pool_get_used_size(pool)*100/pool_capacity));
     pj_pool_reset(pool);
 
@@ -197 +202 @@
      * Otherwise put the pool in our recycle list.
      */
-    for (i=0; i < PJ_CACHING_POOL_ARRAY_SIZE && pool_sizes[i] != pool->capacity; ++i)
+    for (i=0; i < PJ_CACHING_POOL_ARRAY_SIZE && pool_sizes[i] != pool_capacity; ++i)
         ;
 
@@ -209 +214 @@
 
     pj_list_insert_after(&cp->free_list[i], pool);
-    cp->capacity += pool->capacity;
+    cp->capacity += pool_capacity;
 
     pj_mutex_unlock(cp->mutex);
@@ -229 +234 @@
         PJ_LOG(3,("cachpool", "  Dumping all active pools:"));
         while (pool != (void*)&cp->used_list) {
-            PJ_LOG(3,("cachpool", "   %12s: %8d of %8d (%d%%) used", pool->obj_name, 
-                                  pj_pool_get_used_size(pool), pool->capacity,
-                                  pj_pool_get_used_size(pool)*100/pool->capacity));
+            unsigned pool_capacity = pj_pool_get_capacity(pool);
+            PJ_LOG(3,("cachpool", "   %12s: %8d of %8d (%d%%) used", 
+                                  pj_pool_getobjname(pool), 
+                                  pj_pool_get_used_size(pool), 
+                                  pool_capacity,
+                                  pj_pool_get_used_size(pool)*100/pool_capacity));
             total_used += pj_pool_get_used_size(pool);
-            total_capacity += pool->capacity;
+            total_capacity += pool_capacity;
             pool = pool->next;
         }
@@ -247 +255 @@
 #endif
 }
+
+#endif  /* PJ_HAS_POOL_ALT_API */
+