Changeset 589

Timestamp:

Jul 6, 2006 2:28:45 PM (18 years ago)

Author:

bennylp

Message:

Set the caching pool workspace size in pjsip-test to 2MB (configurable)

Location:

pjproject/trunk/pjsip/src/test-pjsip

Files:

• test.c (modified) (2 diffs)
• test.h (modified) (1 diff)
• uri_test.c (modified) (5 diffs)

pjproject/trunk/pjsip/src/test-pjsip/test.c

@@ -244 +244 @@
     pj_dump_config();
 
-    pj_caching_pool_init( &caching_pool, &pj_pool_factory_default_policy, 0 );
+    pj_caching_pool_init( &caching_pool, &pj_pool_factory_default_policy, 
+                          PJSIP_TEST_MEM_SIZE );
 
     rc = pjsip_endpt_create(&caching_pool.factory, "endpt", &endpt);
@@ -341 +342 @@
 on_return:
     flush_events(500);
+
+    /* Dumping memory pool usage */
+    {
+        pj_pool_t *p;
+        unsigned sz = 0;
+        p = caching_pool.used_list.next;
+        while (p != (pj_pool_t*)&caching_pool.used_list) {
+            sz += pj_pool_get_capacity(p);
+            p = p->next;
+        }
+        PJ_LOG(3,(THIS_FILE, "Caching pool total capacity=%u",
+                              caching_pool.capacity + sz));
+    }
+
     pjsip_endpt_destroy(endpt);
     pj_caching_pool_destroy(&caching_pool);

pjproject/trunk/pjsip/src/test-pjsip/test.h

@@ -26 +26 @@
 #define TEST_UDP_PORT       15060
 #define TEST_UDP_PORT_STR   "15060"
+
+/**
+ * Memory size to use in caching pool.
+ * Default: 2MB
+ */
+#ifndef PJSIP_TEST_MEM_SIZE
+#  define PJSIP_TEST_MEM_SIZE       (2*1024*1024)
+#endif
+
 
 

pjproject/trunk/pjsip/src/test-pjsip/uri_test.c

@@ -811 +811 @@
 
     PJ_LOG(3,(THIS_FILE, "  simple test"));
-    pool = pjsip_endpt_create_pool(endpt, "", POOL_SIZE, POOL_SIZE);
     for (i=0; i<PJ_ARRAY_SIZE(uri_test_array); ++i) {
+        pool = pjsip_endpt_create_pool(endpt, "", POOL_SIZE, POOL_SIZE);
         status = do_uri_test(pool, &uri_test_array[i]);
+        pjsip_endpt_release_pool(endpt, pool);
         if (status != PJ_SUCCESS) {
             PJ_LOG(3,(THIS_FILE, "  error %d when testing entry %d",
@@ -820 +821 @@
         }
     }
-    pjsip_endpt_release_pool(endpt, pool);
 
     return 0;
@@ -828 +828 @@
 {
     unsigned i, loop;
-    pj_pool_t *pool;
     pj_status_t status;
     pj_timestamp zero;
@@ -843 +842 @@
     var.cmp_time.u32.hi = var.cmp_time.u32.lo = 0;
     for (loop=0; loop<LOOP_COUNT; ++loop) {
-        pool = pjsip_endpt_create_pool(endpt, "", POOL_SIZE, POOL_SIZE);
         for (i=0; i<PJ_ARRAY_SIZE(uri_test_array); ++i) {
+            pj_pool_t *pool;
+            pool = pjsip_endpt_create_pool(endpt, "", POOL_SIZE, POOL_SIZE);
             status = do_uri_test(pool, &uri_test_array[i]);
+            pjsip_endpt_release_pool(endpt, pool);
             if (status != PJ_SUCCESS) {
                 PJ_LOG(3,(THIS_FILE, "  error %d when testing entry %d",
@@ -853 +854 @@
             }
         }
-        pjsip_endpt_release_pool(endpt, pool);
     }