2006-09-27 Zoltan Varga <vargaz@gmail.com>

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

diff --git a/mono/metadata/mempool.c b/mono/metadata/mempool.c
index 53c76492732db78b57bd4be3d3e38192c3852cac..69f7c6a27cb0c319a1b195b301ad9025874573f7 100644 (file)
--- a/mono/metadata/mempool.c
+++ b/mono/metadata/mempool.c
@@ -25,10 +25,15 @@
 
 #define MONO_MEMPOOL_PAGESIZE 8192
 
+#ifndef G_LIKELY
+#define G_LIKELY(a) (a)
+#define G_UNLIKELY(a) (a)
+#endif
+
 struct _MonoMemPool {
        MonoMemPool *next;
        gint rest;
-       gpointer pos;
+       guint8 *pos, *end;
        guint32 size;
        union {
                double pad; /* to assure proper alignment */
@@ -47,8 +52,8 @@ mono_mempool_new ()
        MonoMemPool *pool = g_malloc (MONO_MEMPOOL_PAGESIZE);
 
        pool->next = NULL;
-       pool->pos = (char *)pool + sizeof (MonoMemPool);
-       pool->rest = MONO_MEMPOOL_PAGESIZE - sizeof (MonoMemPool);
+       pool->pos = (guint8*)pool + sizeof (MonoMemPool);
+       pool->end = pool->pos + MONO_MEMPOOL_PAGESIZE - sizeof (MonoMemPool);
        pool->d.allocated = pool->size = MONO_MEMPOOL_PAGESIZE;
        return pool;
 }
@@ -94,8 +99,8 @@ mono_mempool_invalidate (MonoMemPool *pool)
 void
 mono_mempool_empty (MonoMemPool *pool)
 {
-       pool->pos = (char *)pool + sizeof (MonoMemPool);
-       pool->rest = MONO_MEMPOOL_PAGESIZE - sizeof (MonoMemPool);
+       pool->pos = (guint8*)pool + sizeof (MonoMemPool);
+       pool->end = pool->pos + MONO_MEMPOOL_PAGESIZE - sizeof (MonoMemPool);
 }
 
 /**
@@ -107,15 +112,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->rest;
-               n = p->next;
-               p = n;
+               still_free += p->end - p->pos;
+               p = p->next;
                count++;
        }
        if (pool) {
@@ -131,8 +135,7 @@ mono_mempool_stats (MonoMemPool *pool)
  * @pool: the momory pool to destroy
  * @size: size of the momory block
  *
- * Allocates a new block of memory in @pool. @size must 
- * be smaller than 256.
+ * Allocates a new block of memory in @pool.
  *
  * Returns: the address of a newly allocated memory block.
  */
@@ -141,33 +144,38 @@ mono_mempool_alloc (MonoMemPool *pool, guint size)
 {
        gpointer rval;
        
-       g_assert (pool != NULL);
-
        size = (size + MEM_ALIGN - 1) & ~(MEM_ALIGN - 1);
 
-       if (pool->rest < size) {
+       rval = pool->pos;
+       pool->pos = (guint8*)rval + size;
+
+       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);
                        np->next = pool->next;
                        pool->next = np;
-                       pool->pos = (char *)np + sizeof (MonoMemPool);
+                       pool->pos = (guint8*)np + sizeof (MonoMemPool);
+                       np->pos = (guint8*)np + sizeof (MonoMemPool);
                        np->size = MONO_MEMPOOL_PAGESIZE;
-                       pool->rest = MONO_MEMPOOL_PAGESIZE - sizeof (MonoMemPool);
+                       np->end = np->pos;
+                       pool->end = pool->pos + MONO_MEMPOOL_PAGESIZE - sizeof (MonoMemPool);
                        pool->d.allocated += MONO_MEMPOOL_PAGESIZE;
+
+                       rval = pool->pos;
+                       pool->pos += size;
                }
        }
 
-       rval = pool->pos;
-       pool->rest -= size;
-       pool->pos = (char *)pool->pos + size;
-
        return rval;
 }
 
@@ -179,8 +187,72 @@ mono_mempool_alloc (MonoMemPool *pool, guint size)
 gpointer
 mono_mempool_alloc0 (MonoMemPool *pool, guint size)
 {
-       gpointer rval = mono_mempool_alloc (pool, size);
+       gpointer rval;
+       
+       size = (size + MEM_ALIGN - 1) & ~(MEM_ALIGN - 1);
+
+       rval = pool->pos;
+       pool->pos = (guint8*)rval + size;
+
+       if (G_UNLIKELY (pool->pos >= pool->end)) {
+               rval = mono_mempool_alloc (pool, size);
+       }
+
        memset (rval, 0, size);
        return rval;
 }
 
+/**
+ * mono_mempool_contains_addr:
+ *
+ *  Determines whenever ADDR is inside the memory used by the mempool.
+ */
+gboolean
+mono_mempool_contains_addr (MonoMemPool *pool,
+                                                       gpointer addr)
+{
+       MonoMemPool *p;
+
+       p = pool;
+       while (p) {
+               if (addr > (gpointer)p && addr <= (gpointer)((guint8*)p + p->size))
+                       return TRUE;
+               p = p->next;
+       }
+
+       return FALSE;
+}
+
+/**
+ * mono_mempool_strdup:
+ *
+ * Same as strdup, but allocates memory from the mempool.
+ * Returns: a pointer to the newly allocated string data inside the mempool.
+ */
+char*
+mono_mempool_strdup (MonoMemPool *pool,
+                                        const char *s)
+{
+       int l;
+       char *res;
+
+       if (s == NULL)
+               return NULL;
+
+       l = strlen (s);
+       res = mono_mempool_alloc (pool, l + 1);
+       memcpy (res, s, l + 1);
+
+       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;
+}