Changeset 594 for pjproject/trunk

Timestamp:

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

Author:

bennylp

Message:

Added feature to report peak memory used in caching pool

Location:

pjproject/trunk/pjlib

Files:

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

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

@@ -450 +450 @@
      */
     void (*dump_status)( pj_pool_factory *factory, pj_bool_t detail );
+
+    /**
+     * This is optional callback to be called by allocation policy when
+     * it allocates a new memory block. The factory may use this callback
+     * for example to keep track of the total number of memory blocks
+     * currently allocated by applications.
+     *
+     * @param factory       The pool factory.
+     * @param size          Size requested by application.
+     *
+     * @return              MUST return PJ_TRUE, otherwise the block
+     *                      allocation is cancelled.
+     */
+    pj_bool_t (*on_block_alloc)(pj_pool_factory *factory, pj_size_t size);
+
+    /**
+     * This is optional callback to be called by allocation policy when
+     * it frees memory block. The factory may use this callback
+     * for example to keep track of the total number of memory blocks
+     * currently allocated by applications.
+     *
+     * @param factory       The pool factory.
+     * @param size          Size freed.
+     */
+    void (*on_block_free)(pj_pool_factory *factory, pj_size_t size);
+
 };
 
@@ -558 +584 @@
 
     /**
+     * Total size of memory currently used by application.
+     */
+    pj_size_t       used_size;
+
+    /**
+     * The maximum size of memory used by application throughout the life
+     * of the caching pool.
+     */
+    pj_size_t       peak_used_size;
+
+    /**
      * Lists of pools in the cache, indexed by pool size.
      */

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

@@ -32 +32 @@
 static void cpool_release_pool(pj_pool_factory *pf, pj_pool_t *pool);
 static void cpool_dump_status(pj_pool_factory *factory, pj_bool_t detail );
+static pj_bool_t cpool_on_block_alloc(pj_pool_factory *f, pj_size_t sz);
+static void cpool_on_block_free(pj_pool_factory *f, pj_size_t sz);
+
 
 static pj_size_t pool_sizes[PJ_CACHING_POOL_ARRAY_SIZE] = 
@@ -64 +67 @@
     cp->factory.release_pool = &cpool_release_pool;
     cp->factory.dump_status = &cpool_dump_status;
+    cp->factory.on_block_alloc = &cpool_on_block_alloc;
+    cp->factory.on_block_free = &cpool_on_block_free;
 
     cp->pool = pj_pool_create_int(&cp->factory, "cachingpool", 256, 
@@ -274 +279 @@
 }
 
+
+static pj_bool_t cpool_on_block_alloc(pj_pool_factory *f, pj_size_t sz)
+{
+    pj_caching_pool *cp = (pj_caching_pool*)f;
+
+    //Can't lock because mutex is not recursive
+    //if (cp->mutex) pj_mutex_lock(cp->mutex);
+
+    cp->used_size += sz;
+    if (cp->used_size > cp->peak_used_size)
+        cp->peak_used_size = cp->used_size;
+
+    //if (cp->mutex) pj_mutex_unlock(cp->mutex);
+
+    return PJ_TRUE;
+}
+
+
+static void cpool_on_block_free(pj_pool_factory *f, pj_size_t sz)
+{
+    pj_caching_pool *cp = (pj_caching_pool*)f;
+
+    //pj_mutex_lock(cp->mutex);
+    cp->used_size -= sz;
+    //pj_mutex_unlock(cp->mutex);
+}
+
+
 #endif  /* PJ_HAS_POOL_ALT_API */
 

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);