Changeset 953 for pjproject

Timestamp:

Feb 16, 2007 9:44:36 PM (18 years ago)

Author:

bennylp

Message:

Fixed ticket #105: unnecessary assert in fixed buffer based pool (pool_buf) on no memory condition

Location:

pjproject/trunk/pjlib/src

Files:

• pj/pool.c (modified) (1 diff)
• pj/pool_buf.c (modified) (2 diffs)
• pjlib-test/pool.c (modified) (3 diffs)

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

@@ -175 +175 @@
     PJ_CHECK_STACK();
 
+    /* Size must be at least sizeof(pj_pool)+sizeof(pj_pool_block) */
+    PJ_ASSERT_RETURN(initial_size >= sizeof(pj_pool_t)+sizeof(pj_pool_block),
+                     NULL);
+
     /* If callback is NULL, set calback from the policy */
     if (callback == NULL)

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

@@ -54 +54 @@
 {
     struct creation_param *param;
+    void *buf;
 
     PJ_UNUSED_ARG(factory);
 
     param = pj_thread_local_get(tls);
-    PJ_ASSERT_RETURN(param != NULL, NULL);
+    if (param == NULL) {
+        /* Don't assert(), this is normal no-memory situation */
+        return NULL;
+    }
 
     pj_thread_local_set(tls, NULL);
@@ -64 +68 @@
     PJ_ASSERT_RETURN(size <= param->size, NULL);
 
-    return param->stack_buf;
+    buf = param->stack_buf;
+
+    /* Prevent the buffer from being reused */
+    param->stack_buf = NULL;
+
+    return buf;
 }
 

pjproject/trunk/pjlib/src/pjlib-test/pool.c

@@ -18 +18 @@
  */
 #include <pj/pool.h>
+#include <pj/pool_buf.h>
 #include <pj/rand.h>
 #include <pj/log.h>
+#include <pj/except.h>
 #include "test.h"
 
@@ -140 +142 @@
 }
 
+/* Test the buffer based pool */
+static int pool_buf_test(void)
+{
+    enum { STATIC_BUF_SIZE = 40 };
+    /* 16 is the internal struct in pool_buf */
+    static char buf[ STATIC_BUF_SIZE + sizeof(pj_pool_t) + 
+                     sizeof(pj_pool_block) + 16];
+    pj_pool_t *pool;
+    void *p;
+    PJ_USE_EXCEPTION;
+
+    PJ_LOG(3,("test", "...pool_buf test"));
+
+    pool = pj_pool_create_on_buf("no name", buf, sizeof(buf));
+    if (!pool)
+        return -70;
+
+    /* Drain the pool */
+    PJ_TRY {
+        if ((p=pj_pool_alloc(pool, STATIC_BUF_SIZE/2)) == NULL)
+            return -75;
+
+        if ((p=pj_pool_alloc(pool, STATIC_BUF_SIZE/2)) == NULL)
+            return -76;
+    }
+    PJ_CATCH_ANY {
+        return -77;
+    }
+    PJ_END;
+
+    /* On the next alloc, exception should be thrown */
+    PJ_TRY {
+        p = pj_pool_alloc(pool, STATIC_BUF_SIZE);
+        if (p != NULL) {
+            /* This is unexpected, the alloc should fail */
+            return -78;
+        }
+    }
+    PJ_CATCH_ANY {
+        /* This is the expected result */
+    }
+    PJ_END;
+
+    /* Done */
+    return 0;
+}
+
+
 int pool_test(void)
 {
@@ -161 +211 @@
     }
 
+    rc = pool_buf_test();
+    if (rc != 0)
+        return rc;
+
+
     return 0;
 }