Changeset 809 for pjproject/trunk

Timestamp:

Nov 21, 2006 8:36:12 AM (18 years ago)

Author:

bennylp

Message:

Fixed minor memory leak in caching pool (one malloc is not freed)

Location:

pjproject/trunk/pjlib

Files:

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

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

@@ -796 +796 @@
      * Internal pool.
      */
-    pj_pool_t      *pool;
+    char            pool_buf[256];
 
     /**
      * Mutex.
      */
-    pj_mutex_t     *mutex;
+    pj_lock_t      *lock;
 };
 

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

@@ -21 +21 @@
 #include <pj/string.h>
 #include <pj/assert.h>
+#include <pj/lock.h>
 #include <pj/os.h>
+#include <pj/pool_buf.h>
 
 #if !PJ_HAS_POOL_ALT_API
@@ -53 +55 @@
 {
     int i;
+    pj_pool_t *pool;
 
     PJ_CHECK_STACK();
@@ -70 +73 @@
     cp->factory.on_block_free = &cpool_on_block_free;
 
-    cp->pool = pj_pool_create_int(&cp->factory, "cachingpool", 512, 
-                                  0, NULL);
-    i = pj_mutex_create_simple(cp->pool, "cachingpool", &cp->mutex);
+    pool = pj_pool_create_on_buf("cachingpool", cp->pool_buf, sizeof(cp->pool_buf));
+    pj_lock_create_simple_mutex(pool, "cachingpool", &cp->lock);
 }
 
@@ -102 +104 @@
     }
 
-    pj_mutex_destroy(cp->mutex);
+    if (cp->lock) {
+        pj_lock_destroy(cp->lock);
+        pj_lock_create_null_mutex(NULL, "cachingpool", &cp->lock);
+    }
 }
 
@@ -117 +122 @@
     PJ_CHECK_STACK();
 
-    pj_mutex_lock(cp->mutex);
+    pj_lock_acquire(cp->lock);
 
     /* Use pool factory's policy when callback is NULL */
@@ -154 +159 @@
                                   increment_sz, callback);
         if (!pool) {
-            pj_mutex_unlock(cp->mutex);
+            pj_lock_release(cp->lock);
             return NULL;
         }
@@ -181 +186 @@
     ++cp->used_count;
 
-    pj_mutex_unlock(cp->mutex);
+    pj_lock_release(cp->lock);
     return pool;
 }
@@ -193 +198 @@
     PJ_CHECK_STACK();
 
-    pj_mutex_lock(cp->mutex);
+    pj_lock_acquire(cp->lock);
 
     /* Erase from the used list. */
@@ -211 +216 @@
     {
         pj_pool_destroy_int(pool);
-        pj_mutex_unlock(cp->mutex);
+        pj_lock_release(cp->lock);
         return;
     }
@@ -232 +237 @@
         /* Something has gone wrong with the pool. */
         pj_pool_destroy_int(pool);
-        pj_mutex_unlock(cp->mutex);
+        pj_lock_release(cp->lock);
         return;
     }
@@ -239 +244 @@
     cp->capacity += pool_capacity;
 
-    pj_mutex_unlock(cp->mutex);
+    pj_lock_release(cp->lock);
 }
 
@@ -247 +252 @@
     pj_caching_pool *cp = (pj_caching_pool*)factory;
 
-    pj_mutex_lock(cp->mutex);
+    pj_lock_acquire(cp->lock);
 
     PJ_LOG(3,("cachpool", " Dumping caching pool:"));
@@ -272 +277 @@
     }
 
-    pj_mutex_unlock(cp->mutex);
+    pj_lock_release(cp->lock);
 #else
     PJ_UNUSED_ARG(factory);