Changeset 214f5bb in mainline

Timestamp:

2006-02-06T01:43:24Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

c7ec94a4

Parents:

c585827

Message:

better utilization of memory in slab alloc
removed malloc-8 slab

Location:

generic

Files:

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

generic/include/mm/slab.h

@@ -35 +35 @@
 
 /** Minimum size to be allocated by malloc */
-#define SLAB_MIN_MALLOC_W 3
+#define SLAB_MIN_MALLOC_W 4
 
 /** Maximum size to be allocated by malloc */

generic/src/mm/slab.c

@@ -113 +113 @@
 /** Cache for cache descriptors */
 static slab_cache_t slab_cache_cache;
-/** Cache for magcache structure from cache_t */
-static slab_cache_t *cpu_cache = NULL;
 /** Cache for external slab descriptors
  * This time we want per-cpu cache, so do not make it static
@@ -125 +123 @@
 static slab_cache_t *malloc_caches[SLAB_MAX_MALLOC_W-SLAB_MIN_MALLOC_W+1];
 char *malloc_names[] =  {
-        "malloc-8","malloc-16","malloc-32","malloc-64","malloc-128",
+        "malloc-16","malloc-32","malloc-64","malloc-128",
         "malloc-256","malloc-512","malloc-1K","malloc-2K",
         "malloc-4K","malloc-8K","malloc-16K","malloc-32K",
@@ -139 +137 @@
         index_t nextavail; /**< The index of next available item */
 }slab_t;
+
+#ifdef CONFIG_DEBUG
+static int _slab_initialized = 0;
+#endif
 
 /**************************************/
@@ -544 +546 @@
 {
         int i;
-
-        ASSERT(cpu_cache);
-        cache->mag_cache = slab_alloc(cpu_cache, 0);
+        
+        ASSERT(_slab_initialized >= 2);
+
+        cache->mag_cache = kalloc(sizeof(slab_mag_cache_t)*config.cpu_count,0);
         for (i=0; i < config.cpu_count; i++) {
                 memsetb((__address)&cache->mag_cache[i],
@@ -709 +712 @@
 
         if (!(cache->flags & SLAB_CACHE_NOMAGAZINE))
-                slab_free(cpu_cache, cache->mag_cache);
+                kfree(cache->mag_cache);
         slab_free(&slab_cache_cache, cache);
 }
@@ -805 +808 @@
         interrupts_restore(ipl);
 }
-
-#ifdef CONFIG_DEBUG
-static int _slab_initialized = 0;
-#endif
 
 void slab_cache_init(void)
@@ -859 +858 @@
         slab_cache_t *s;
 
-        cpu_cache = slab_cache_create("magcpucache",
-                                      sizeof(slab_mag_cache_t) * config.cpu_count,
-                                      0, NULL, NULL,
-                                      SLAB_CACHE_NOMAGAZINE);
+#ifdef CONFIG_DEBUG
+        _slab_initialized = 2;
+#endif
+
         spinlock_lock(&slab_cache_lock);