Changeset ce8aed1 in mainline

Timestamp:

2007-02-11T18:15:09Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

bd1deed

Parents:

3c771149

Message:

implement simple realloc()

Location:

kernel/generic

Files:

• include/mm/slab.h (modified) (1 diff)
• src/mm/slab.c (modified) (7 diffs)

kernel/generic/include/mm/slab.h

@@ -140 +140 @@
 /* malloc support */
 extern void * malloc(unsigned int size, int flags);
-extern void free(void *obj);
+extern void * realloc(void *ptr, unsigned int size, int flags);
+extern void free(void *ptr);
 #endif
 

kernel/generic/src/mm/slab.c

@@ -112 +112 @@
 #include <debug.h>
 #include <bitops.h>
+#include <macros.h>
 
 SPINLOCK_INITIALIZE(slab_cache_lock);
@@ -128 +129 @@
 static slab_cache_t *slab_extern_cache;
 /** Caches for malloc */
-static slab_cache_t *malloc_caches[SLAB_MAX_MALLOC_W-SLAB_MIN_MALLOC_W+1];
+static slab_cache_t *malloc_caches[SLAB_MAX_MALLOC_W - SLAB_MIN_MALLOC_W + 1];
 char *malloc_names[] =  {
-        "malloc-16","malloc-32","malloc-64","malloc-128",
-        "malloc-256","malloc-512","malloc-1K","malloc-2K",
-        "malloc-4K","malloc-8K","malloc-16K","malloc-32K",
-        "malloc-64K","malloc-128K","malloc-256K"
+        "malloc-16",
+        "malloc-32",
+        "malloc-64",
+        "malloc-128",
+        "malloc-256",
+        "malloc-512",
+        "malloc-1K",
+        "malloc-2K",
+        "malloc-4K",
+        "malloc-8K",
+        "malloc-16K",
+        "malloc-32K",
+        "malloc-64K",
+        "malloc-128K",
+        "malloc-256K"
 };
 
@@ -143 +155 @@
         count_t available;      /**< Count of available items in this slab. */
         index_t nextavail;      /**< The index of next available item. */
-}slab_t;
+} slab_t;
 
 #ifdef CONFIG_DEBUG
@@ -214 +226 @@
 static slab_t * obj2slab(void *obj)
 {
-        return (slab_t *)frame_get_parent(ADDR2PFN(KA2PA(obj)), 0);
+        return (slab_t *) frame_get_parent(ADDR2PFN(KA2PA(obj)), 0);
 }
 
@@ -761 +773 @@
 void slab_free(slab_cache_t *cache, void *obj)
 {
-        _slab_free(cache,obj,NULL);
+        _slab_free(cache, obj, NULL);
 }
 
@@ -879 +891 @@
 void * malloc(unsigned int size, int flags)
 {
-        int idx;
-
         ASSERT(_slab_initialized);
         ASSERT(size && size <= (1 << SLAB_MAX_MALLOC_W));
@@ -887 +897 @@
                 size = (1 << SLAB_MIN_MALLOC_W);
 
-        idx = fnzb(size-1) - SLAB_MIN_MALLOC_W + 1;
+        int idx = fnzb(size - 1) - SLAB_MIN_MALLOC_W + 1;
 
         return slab_alloc(malloc_caches[idx], flags);
 }
 
-void free(void *obj)
-{
-        slab_t *slab;
-
-        if (!obj)
+void * realloc(void *ptr, unsigned int size, int flags)
+{
+        ASSERT(_slab_initialized);
+        ASSERT(size <= (1 << SLAB_MAX_MALLOC_W));
+        
+        void *new_ptr;
+        
+        if (size > 0) {
+                if (size < (1 << SLAB_MIN_MALLOC_W))
+                        size = (1 << SLAB_MIN_MALLOC_W);
+                int idx = fnzb(size - 1) - SLAB_MIN_MALLOC_W + 1;
+                
+                new_ptr = slab_alloc(malloc_caches[idx], flags);
+        } else
+                new_ptr = NULL;
+        
+        if ((new_ptr != NULL) && (ptr != NULL)) {
+                slab_t *slab = obj2slab(ptr);
+                memcpy(new_ptr, ptr, min(size, slab->cache->size));
+        }
+        
+        if (ptr != NULL)
+                free(ptr);
+        
+        return new_ptr;
+}
+
+void free(void *ptr)
+{
+        if (!ptr)
                 return;
 
-        slab = obj2slab(obj);
-        _slab_free(slab->cache, obj, slab);
+        slab_t *slab = obj2slab(ptr);
+        _slab_free(slab->cache, ptr, slab);
 }