Changeset 588

Timestamp:

Jul 6, 2006 2:27:31 PM (18 years ago)

Author:

bennylp

Message:

Improve the search for correct size in caching pool

Location:

pjproject/trunk/pjlib

Files:

• include/pj/pool.h (modified) (1 diff)
• src/pj/pool_caching.c (modified) (5 diffs)

pjproject/trunk/pjlib/include/pj/pool.h

@@ -157 +157 @@
     /** Pool factory. */
     pj_pool_factory *factory;
+
+    /** Data put by factory */
+    void            *factory_data;
 
     /** Current capacity allocated by the pool. */

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

@@ -39 +39 @@
 };
 
+/* Index where the search for size should begin.
+ * Start with pool_sizes[5], which is 8192.
+ */
+#define START_SIZE  5
+
 
 PJ_DEF(void) pj_caching_pool_init( pj_caching_pool *cp, 
@@ -119 +124 @@
      * for this purpose.
      */
-    for (idx=0; 
-         idx < PJ_CACHING_POOL_ARRAY_SIZE && pool_sizes[idx] < initial_size; 
-         ++idx)
-        ;
+    if (initial_size <= pool_sizes[START_SIZE]) {
+        for (idx=START_SIZE-1; 
+             idx >= 0 && pool_sizes[idx] >= initial_size;
+             --idx)
+            ;
+        ++idx;
+    } else {
+        for (idx=START_SIZE+1; 
+             idx < PJ_CACHING_POOL_ARRAY_SIZE && 
+                  pool_sizes[idx] < initial_size;
+             ++idx)
+            ;
+    }
 
     /* Check whether there's a pool in the list. */
@@ -156 +170 @@
     pj_list_insert_before( &cp->used_list, pool );
 
+    /* Mark factory data */
+    pool->factory_data = (void*) idx;
+
     /* Increment used count. */
     ++cp->used_count;
@@ -167 +184 @@
     pj_caching_pool *cp = (pj_caching_pool*)pf;
     unsigned pool_capacity;
-    int i;
+    unsigned i;
 
     PJ_CHECK_STACK();
@@ -204 +221 @@
      * Otherwise put the pool in our recycle list.
      */
-    for (i=0; i < PJ_CACHING_POOL_ARRAY_SIZE && pool_sizes[i] != pool_capacity; ++i)
-        ;
-
-    pj_assert( i != PJ_CACHING_POOL_ARRAY_SIZE );
-    if (i == PJ_CACHING_POOL_ARRAY_SIZE) {
+    i = (unsigned)pool->factory_data;
+
+    pj_assert(i<PJ_CACHING_POOL_ARRAY_SIZE);
+    if (i >= PJ_CACHING_POOL_ARRAY_SIZE ) {
         /* Something has gone wrong with the pool. */
         pj_pool_destroy_int(pool);