Changeset 232

Timestamp:

Feb 26, 2006 9:18:42 PM (19 years ago)

Author:

bennylp

Message:

Added mutex protection for caching pool

Location:

pjproject/trunk/pjlib

Files:

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

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

@@ -543 +543 @@
      */
     pj_list         used_list;
+
+    /**
+     * Internal pool.
+     */
+    pj_pool_t      *pool;
+
+    /**
+     * Mutex.
+     */
+    pj_mutex_t     *mutex;
 };
 

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

@@ -57 +57 @@
     cp->factory.release_pool = &cpool_release_pool;
     cp->factory.dump_status = &cpool_dump_status;
+
+    cp->pool = pj_pool_create_int(&cp->factory, "cachingpool", 128, 
+                                  0, NULL);
+    i = pj_mutex_create_simple(cp->pool, "cachingpool", &cp->mutex);
 }
 
@@ -85 +89 @@
         pool = next;
     }
+
+    pj_mutex_destroy(cp->mutex);
 }
 
@@ -98 +104 @@
 
     PJ_CHECK_STACK();
+
+    pj_mutex_lock(cp->mutex);
 
     /* Use pool factory's policy when callback is NULL */
@@ -124 +132 @@
         pool = pj_pool_create_int(&cp->factory, name, initial_size, 
                                   increment_sz, callback);
-        if (!pool)
+        if (!pool) {
+            pj_mutex_unlock(cp->mutex);
             return NULL;
+        }
 
     } else {
@@ -146 +156 @@
     /* Increment used count. */
     ++cp->used_count;
+
+    pj_mutex_unlock(cp->mutex);
     return pool;
 }
@@ -155 +167 @@
 
     PJ_CHECK_STACK();
+
+    pj_mutex_lock(cp->mutex);
 
     /* Erase from the used list. */
@@ -170 +184 @@
     {
         pj_pool_destroy_int(pool);
+        pj_mutex_unlock(cp->mutex);
         return;
     }
@@ -189 +204 @@
         /* Something has gone wrong with the pool. */
         pj_pool_destroy_int(pool);
+        pj_mutex_unlock(cp->mutex);
         return;
     }
@@ -194 +210 @@
     pj_list_insert_after(&cp->free_list[i], pool);
     cp->capacity += pool->capacity;
+
+    pj_mutex_unlock(cp->mutex);
 }
 
@@ -200 +218 @@
 #if PJ_LOG_MAX_LEVEL >= 3
     pj_caching_pool *cp = (pj_caching_pool*)factory;
+
+    pj_mutex_lock(cp->mutex);
+
     PJ_LOG(3,("cachpool", " Dumping caching pool:"));
     PJ_LOG(3,("cachpool", "   Capacity=%u, max_capacity=%u, used_cnt=%u", \
@@ -219 +240 @@
                               total_used * 100 / total_capacity));
     }
+
+    pj_mutex_unlock(cp->mutex);
 #else
     PJ_UNUSED_ARG(factory);