X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmetadata%2Fmempool.c;h=0c20eef7afbf7468635d09cb51d7d42152cfd9f3;hb=57cd4050c4c46d4e39717dadeae9516f147af7f6;hp=69f7c6a27cb0c319a1b195b301ad9025874573f7;hpb=9869ae24b88761ab261c4311e24f7383b4af3f02;p=mono.git

diff --git a/mono/metadata/mempool.c b/mono/metadata/mempool.c
index 69f7c6a27cb..0c20eef7afb 100644
--- 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 = (guint8*)pool + sizeof (MonoMemPool);
-	pool->end = pool->pos + MONO_MEMPOOL_PAGESIZE - sizeof (MonoMemPool);
-	pool->d.allocated = pool->size = MONO_MEMPOOL_PAGESIZE;
+	pool->end = pool->pos + initial_size - sizeof (MonoMemPool);
+	pool->d.allocated = pool->size = initial_size;
 	return pool;
 }
 
@@ -100,7 +110,7 @@ void
 mono_mempool_empty (MonoMemPool *pool)
 {
 	pool->pos = (guint8*)pool + sizeof (MonoMemPool);
-	pool->end = pool->pos + MONO_MEMPOOL_PAGESIZE - sizeof (MonoMemPool);
+	pool->end = pool->pos + pool->size - sizeof (MonoMemPool);
 }
 
 /**
@@ -130,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
@@ -149,6 +197,12 @@ mono_mempool_alloc (MonoMemPool *pool, guint size)
 	rval = pool->pos;
 	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) {
@@ -161,15 +215,16 @@ mono_mempool_alloc (MonoMemPool *pool, guint size)
 			pool->d.allocated += sizeof (MonoMemPool) + size;
 			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 = (guint8*)np + sizeof (MonoMemPool);
 			np->pos = (guint8*)np + sizeof (MonoMemPool);
-			np->size = MONO_MEMPOOL_PAGESIZE;
+			np->size = new_size;
 			np->end = np->pos;
-			pool->end = pool->pos + MONO_MEMPOOL_PAGESIZE - sizeof (MonoMemPool);
-			pool->d.allocated += MONO_MEMPOOL_PAGESIZE;
+			pool->end = pool->pos + new_size - sizeof (MonoMemPool);
+			pool->d.allocated += new_size;
 
 			rval = pool->pos;
 			pool->pos += size;