Added MonoString<->UTF-32 conversion helper functions.

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

diff --git a/mono/metadata/mempool.c b/mono/metadata/mempool.c
index aee48f58f89ebd56fead7f047bcc1a0ea2251141..221a2a904b14c4afb66a8918ac4acc6d62691ce0 100644 (file)
--- a/mono/metadata/mempool.c
+++ b/mono/metadata/mempool.c
@@ -7,7 +7,9 @@
  * Author:
  *   Dietmar Maurer (dietmar@ximian.com)
  *
- * (C) 2001 Ximian, Inc.
+ * Copyright 2001-2003 Ximian, Inc (http://www.ximian.com)
+ * Copyright 2004-2009 Novell, Inc (http://www.novell.com)
+ * Copyright 2011 Xamarin Inc. (http://www.xamarin.com)
  */
 
 #include <config.h>
@@ -28,8 +30,13 @@
 
 #define MEM_ALIGN 8
 
+#if MONO_SMALL_CONFIG
+#define MONO_MEMPOOL_PAGESIZE 4096
+#define MONO_MEMPOOL_MINSIZE 256
+#else
 #define MONO_MEMPOOL_PAGESIZE 8192
 #define MONO_MEMPOOL_MINSIZE 512
+#endif
 
 #ifndef G_LIKELY
 #define G_LIKELY(a) (a)
@@ -59,6 +66,8 @@ struct _MonoMemPool {
 };
 #endif
 
+static long total_bytes_allocated = 0;
+
 /**
  * mono_mempool_new:
  *
@@ -85,6 +94,7 @@ mono_mempool_new_size (int initial_size)
        pool->pos = (guint8*)pool + sizeof (MonoMemPool);
        pool->end = pool->pos + initial_size - sizeof (MonoMemPool);
        pool->d.allocated = pool->size = initial_size;
+       total_bytes_allocated += initial_size;
        return pool;
 #endif
 }
@@ -105,6 +115,8 @@ mono_mempool_destroy (MonoMemPool *pool)
 #else
        MonoMemPool *p, *n;
 
+       total_bytes_allocated -= pool->d.allocated;
+
        p = pool;
        while (p) {
                n = p->next;
@@ -195,7 +207,7 @@ mono_mempool_stats (MonoMemPool *pool)
 #include "metadata/appdomain.h"
 #include "metadata/metadata-internals.h"
 
-static CRITICAL_SECTION mempool_tracing_lock;
+static mono_mutex_t mempool_tracing_lock;
 #define BACKTRACE_DEPTH 7
 static void
 mono_backtrace (int size)
@@ -206,11 +218,11 @@ mono_backtrace (int size)
         static gboolean inited;
 
         if (!inited) {
-            InitializeCriticalSection (&mempool_tracing_lock);
+            mono_mutex_init_recursive (&mempool_tracing_lock);
             inited = TRUE;
         }
 
-        EnterCriticalSection (&mempool_tracing_lock);
+        mono_mutex_lock (&mempool_tracing_lock);
         g_print ("Allocating %d bytes\n", size);
         symbols = backtrace (array, BACKTRACE_DEPTH);
         names = backtrace_symbols (array, symbols);
@@ -218,7 +230,7 @@ mono_backtrace (int size)
                 g_print ("\t%s\n", names [i]);
         }
         free (names);
-        LeaveCriticalSection (&mempool_tracing_lock);
+        mono_mutex_unlock (&mempool_tracing_lock);
 }
 
 #endif
@@ -233,10 +245,8 @@ get_next_size (MonoMemPool *pool, int size)
        while (target < size) {
                target += target / 2;
        }
-       if (target > MONO_MEMPOOL_PAGESIZE)
+       if (target > MONO_MEMPOOL_PAGESIZE && size <= MONO_MEMPOOL_PAGESIZE)
                target = MONO_MEMPOOL_PAGESIZE;
-       /* we are called with size smaller than 4096 */
-       g_assert (size <= MONO_MEMPOOL_PAGESIZE);
        return target;
 }
 #endif
@@ -259,11 +269,11 @@ mono_mempool_alloc (MonoMemPool *pool, guint size)
 
 #ifdef MALLOC_ALLOCATION
        {
-               Chunk *c = g_malloc (sizeof (Chunk) + size);
+               Chunk *c = g_malloc (size);
 
                c->next = pool->chunks;
                pool->chunks = c;
-               c->size = size;
+               c->size = size - sizeof(Chunk);
 
                pool->allocated += size;
 
@@ -288,6 +298,7 @@ mono_mempool_alloc (MonoMemPool *pool, guint size)
                        np->size = sizeof (MonoMemPool) + size;
                        np->end = np->pos + np->size - sizeof (MonoMemPool);
                        pool->d.allocated += sizeof (MonoMemPool) + size;
+                       total_bytes_allocated += sizeof (MonoMemPool) + size;
                        return (guint8*)np + sizeof (MonoMemPool);
                } else {
                        int new_size = get_next_size (pool, size);
@@ -300,14 +311,15 @@ mono_mempool_alloc (MonoMemPool *pool, guint size)
                        np->end = np->pos;
                        pool->end = pool->pos + new_size - sizeof (MonoMemPool);
                        pool->d.allocated += new_size;
+                       total_bytes_allocated += new_size;
 
                        rval = pool->pos;
                        pool->pos += size;
                }
        }
+#endif
 
        return rval;
-#endif
 }
 
 /**
@@ -415,53 +427,13 @@ mono_mempool_get_allocated (MonoMemPool *pool)
 #endif
 }
 
-GList*
-g_list_prepend_mempool (MonoMemPool *mp, GList *list, gpointer data)
-{
-       GList *new_list;
-       
-       new_list = mono_mempool_alloc (mp, sizeof (GList));
-       new_list->data = data;
-       new_list->prev = list ? list->prev : NULL;
-    new_list->next = list;
-
-    if (new_list->prev)
-            new_list->prev->next = new_list;
-    if (list)
-            list->prev = new_list;
-
-       return new_list;
-}
-
-GSList*
-g_slist_prepend_mempool (MonoMemPool *mp, GSList *list, gpointer  data)
-{
-       GSList *new_list;
-       
-       new_list = mono_mempool_alloc (mp, sizeof (GSList));
-       new_list->data = data;
-       new_list->next = list;
-
-       return new_list;
-}
-
-GSList*
-g_slist_append_mempool (MonoMemPool *mp, GSList *list, gpointer data)
+/**
+ * mono_mempool_get_bytes_allocated:
+ *
+ * Return the number of bytes currently allocated for mempools.
+ */
+long
+mono_mempool_get_bytes_allocated (void)
 {
-       GSList *new_list;
-       GSList *last;
-
-       new_list = mono_mempool_alloc (mp, sizeof (GSList));
-       new_list->data = data;
-       new_list->next = NULL;
-
-       if (list) {
-               last = list;
-               while (last->next)
-                       last = last->next;
-               last->next = new_list;
-
-               return list;
-       } else
-               return new_list;
+       return total_bytes_allocated;
 }