2008-07-11 Rodrigo Kumpera <rkumpera@novell.com>

[mono.git] / mono / metadata / mempool.c

diff --git a/mono/metadata/mempool.c b/mono/metadata/mempool.c
index dd351ccfe399a2e88c155d285e6e37c47bf5e1de..0c20eef7afbf7468635d09cb51d7d42152cfd9f3 100644 (file)
--- a/mono/metadata/mempool.c
+++ b/mono/metadata/mempool.c
@@ -24,6 +24,7 @@
 #define MEM_ALIGN 8
 
 #define MONO_MEMPOOL_PAGESIZE 8192
+#define MONO_MEMPOOL_MINSIZE 512
 
 #ifndef G_LIKELY
 #define G_LIKELY(a) (a)
@@ -47,14 +48,23 @@ struct _MonoMemPool {
  * Returns: a new memory pool.
  */
 MonoMemPool *
-mono_mempool_new ()
+mono_mempool_new (void)
 {
-       MonoMemPool *pool = g_malloc (MONO_MEMPOOL_PAGESIZE);
+       return mono_mempool_new_size (MONO_MEMPOOL_PAGESIZE);
+}
+
+MonoMemPool *
+mono_mempool_new_size (int initial_size)
+{
+       MonoMemPool *pool;
+       if (initial_size < MONO_MEMPOOL_MINSIZE)
+               initial_size = MONO_MEMPOOL_MINSIZE;
+       pool = g_malloc (initial_size);
 
        pool->next = NULL;
-       pool->pos = (char *)pool + sizeof (MonoMemPool);
-       pool->end = pool->pos + MONO_MEMPOOL_PAGESIZE - sizeof (MonoMemPool);
-       pool->d.allocated = pool->size = MONO_MEMPOOL_PAGESIZE;
+       pool->pos = (guint8*)pool + sizeof (MonoMemPool);
+       pool->end = pool->pos + initial_size - sizeof (MonoMemPool);
+       pool->d.allocated = pool->size = initial_size;
        return pool;
 }
 
@@ -99,8 +109,8 @@ mono_mempool_invalidate (MonoMemPool *pool)
 void
 mono_mempool_empty (MonoMemPool *pool)
 {
-       pool->pos = (char *)pool + sizeof (MonoMemPool);
-       pool->end = pool->pos + MONO_MEMPOOL_PAGESIZE - sizeof (MonoMemPool);
+       pool->pos = (guint8*)pool + sizeof (MonoMemPool);
+       pool->end = pool->pos + pool->size - sizeof (MonoMemPool);
 }
 
 /**
@@ -112,15 +122,14 @@ mono_mempool_empty (MonoMemPool *pool)
 void
 mono_mempool_stats (MonoMemPool *pool)
 {
-       MonoMemPool *p, *n;
+       MonoMemPool *p;
        int count = 0;
        guint32 still_free = 0;
 
        p = pool;
        while (p) {
                still_free += p->end - p->pos;
-               n = p->next;
-               p = n;
+               p = p->next;
                count++;
        }
        if (pool) {
@@ -131,6 +140,44 @@ mono_mempool_stats (MonoMemPool *pool)
        }
 }
 
+#ifdef TRACE_ALLOCATIONS
+#include <execinfo.h>
+#include "metadata/appdomain.h"
+#include "metadata/metadata-internals.h"
+
+static void
+mono_backtrace (int limit)
+{
+        void *array[limit];
+        char **names;
+        int i;
+        backtrace (array, limit);
+        names = backtrace_symbols (array, limit);
+        for (i = 1; i < limit; ++i) {
+                g_print ("\t%s\n", names [i]);
+        }
+        g_free (names);
+}
+
+#endif
+
+static int
+get_next_size (MonoMemPool *pool, int size)
+{
+       int target = pool->next? pool->next->size: pool->size;
+       size += sizeof (MonoMemPool);
+       /* increase the size */
+       target += target / 2;
+       while (target < size) {
+               target += target / 2;
+       }
+       if (target > MONO_MEMPOOL_PAGESIZE)
+               target = MONO_MEMPOOL_PAGESIZE;
+       /* we are called with size smaller than 4096 */
+       g_assert (size <= MONO_MEMPOOL_PAGESIZE);
+       return target;
+}
+
 /**
  * mono_mempool_alloc:
  * @pool: the momory pool to destroy
@@ -148,25 +195,36 @@ mono_mempool_alloc (MonoMemPool *pool, guint size)
        size = (size + MEM_ALIGN - 1) & ~(MEM_ALIGN - 1);
 
        rval = pool->pos;
-       pool->pos = (char*)rval + size;
+       pool->pos = (guint8*)rval + size;
 
+#ifdef TRACE_ALLOCATIONS
+       if (pool == mono_get_corlib ()->mempool) {
+               g_print ("Allocating %d bytes\n", size);
+               mono_backtrace (7);
+       }
+#endif
        if (G_UNLIKELY (pool->pos >= pool->end)) {
                pool->pos -= size;
                if (size >= 4096) {
                        MonoMemPool *np = g_malloc (sizeof (MonoMemPool) + size);
                        np->next = pool->next;
                        pool->next = np;
+                       np->pos = (guint8*)np + sizeof (MonoMemPool);
                        np->size = sizeof (MonoMemPool) + size;
+                       np->end = np->pos + np->size - sizeof (MonoMemPool);
                        pool->d.allocated += sizeof (MonoMemPool) + size;
-                       return (char *)np + sizeof (MonoMemPool);
+                       return (guint8*)np + sizeof (MonoMemPool);
                } else {
-                       MonoMemPool *np = g_malloc (MONO_MEMPOOL_PAGESIZE);
+                       int new_size = get_next_size (pool, size);
+                       MonoMemPool *np = g_malloc (new_size);
                        np->next = pool->next;
                        pool->next = np;
-                       pool->pos = (char *)np + sizeof (MonoMemPool);
-                       np->size = MONO_MEMPOOL_PAGESIZE;
-                       pool->end = pool->pos + MONO_MEMPOOL_PAGESIZE - sizeof (MonoMemPool);
-                       pool->d.allocated += MONO_MEMPOOL_PAGESIZE;
+                       pool->pos = (guint8*)np + sizeof (MonoMemPool);
+                       np->pos = (guint8*)np + sizeof (MonoMemPool);
+                       np->size = new_size;
+                       np->end = np->pos;
+                       pool->end = pool->pos + new_size - sizeof (MonoMemPool);
+                       pool->d.allocated += new_size;
 
                        rval = pool->pos;
                        pool->pos += size;
@@ -189,7 +247,7 @@ mono_mempool_alloc0 (MonoMemPool *pool, guint size)
        size = (size + MEM_ALIGN - 1) & ~(MEM_ALIGN - 1);
 
        rval = pool->pos;
-       pool->pos = (char*)rval + size;
+       pool->pos = (guint8*)rval + size;
 
        if (G_UNLIKELY (pool->pos >= pool->end)) {
                rval = mono_mempool_alloc (pool, size);
@@ -243,3 +301,13 @@ mono_mempool_strdup (MonoMemPool *pool,
        return res;
 }
 
+/**
+ * mono_mempool_get_allocated:
+ *
+ * Return the amount of memory allocated for this mempool.
+ */
+guint32
+mono_mempool_get_allocated (MonoMemPool *pool)
+{
+       return pool->d.allocated;
+}