Changeset e72b0a3 in mainline

Timestamp:

2006-02-04T21:34:04Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

5158549

Parents:

3260ada

Message:

Small fix in slab allocator for large-sized slabs.

Files:

• generic/src/mm/slab.c (modified) (5 diffs)
• test/mm/slab2/test.c (modified) (1 diff)

generic/src/mm/slab.c

@@ -235 +235 @@
 
         ASSERT(slab->cache == cache);
+        ASSERT(slab->available < cache->objects);
 
         spinlock_lock(&cache->slablock);
@@ -243 +244 @@
 
         /* Move it to correct list */
-        if (slab->available == 1) {
-                /* It was in full, move to partial */
-                list_remove(&slab->link);
-                list_prepend(&slab->link, &cache->partial_slabs);
-        }
         if (slab->available == cache->objects) {
                 /* Free associated memory */
@@ -255 +251 @@
                  * keep all locks */
                 frames = slab_space_free(cache, slab);
+        } else if (slab->available == 1) {
+                /* It was in full, move to partial */
+                list_remove(&slab->link);
+                list_prepend(&slab->link, &cache->partial_slabs);
         }
 
@@ -283 +283 @@
                 spinlock_unlock(&cache->slablock);
                 slab = slab_space_alloc(cache, flags);
+                if (!slab)
+                        return NULL;
                 spinlock_lock(&cache->slablock);
-                if (!slab)
-                        goto err;
         } else {
                 slab = list_get_instance(cache->partial_slabs.next,
@@ -302 +302 @@
         spinlock_unlock(&cache->slablock);
         return obj;
-err:
-        spinlock_unlock(&cache->slablock);
-        return NULL;
 }
 

test/mm/slab2/test.c

@@ -200 +200 @@
         multitest(128);
         multitest(2048);
+        multitest(8192);
         printf("All done.\n");
 }