Changeset 594 for pjproject/trunk/pjlib/src/pj/pool_policy_malloc.c

Timestamp:

Jul 9, 2006 10:05:46 AM (17 years ago)

Author:

bennylp

Message:

Added feature to report peak memory used in caching pool

File:

• pjproject/trunk/pjlib/src/pj/pool_policy_malloc.c (modified) (1 diff)

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

@@ -31 +31 @@
 static void *default_block_alloc(pj_pool_factory *factory, pj_size_t size)
 {
+    void *p;
+
     PJ_CHECK_STACK();
-    PJ_UNUSED_ARG(factory);
-    PJ_UNUSED_ARG(size);
 
-    return malloc(size);
+    if (factory->on_block_alloc) {
+        int rc;
+        rc = factory->on_block_alloc(factory, size);
+        if (!rc)
+            return NULL;
+    }
+
+    p = malloc(size);
+
+    if (p == NULL) {
+        if (factory->on_block_free) 
+            factory->on_block_free(factory, size);
+    }
+
+    return p;
 }
 
-static void default_block_free(pj_pool_factory *factory, void *mem, pj_size_t size)
+static void default_block_free(pj_pool_factory *factory, void *mem, 
+                               pj_size_t size)
 {
     PJ_CHECK_STACK();
-    PJ_UNUSED_ARG(factory);
-    PJ_UNUSED_ARG(size);
+
+    if (factory->on_block_free) 
+        factory->on_block_free(factory, size);
 
     free(mem);