Changeset 266294a9 in mainline for generic/src/mm/slab.c

Timestamp:

2006-02-05T17:01:03Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

5c9a08b

Parents:

9b9e385

Message:

Added constructor/destructor calls to SLAB.
Changed allocation of thread_t structure to use SLAB.

File:

• generic/src/mm/slab.c (modified) (8 diffs)

generic/src/mm/slab.c

@@ -229 +229 @@
                                 slab_t *slab)
 {
+        int freed = 0;
+
         if (!slab)
                 slab = obj2slab(obj);
@@ -235 +237 @@
         ASSERT(slab->available < cache->objects);
 
+        if (cache->destructor)
+                freed = cache->destructor(obj);
+        
         spinlock_lock(&cache->slablock);
 
@@ -247 +252 @@
                 spinlock_unlock(&cache->slablock);
 
-                return slab_space_free(cache, slab);
+                return freed + slab_space_free(cache, slab);
 
         } else if (slab->available == 1) {
@@ -255 +260 @@
         }
         spinlock_unlock(&cache->slablock);
-        return 0;
+        return freed;
 }
 
@@ -291 +296 @@
         slab->nextavail = *((int *)obj);
         slab->available--;
+
         if (! slab->available)
                 list_prepend(&slab->link, &cache->full_slabs);
@@ -297 +303 @@
 
         spinlock_unlock(&cache->slablock);
+
+        if (cache->constructor && cache->constructor(obj, flags)) {
+                /* Bad, bad, construction failed */
+                slab_obj_destroy(cache, obj, slab);
+                return NULL;
+        }
         return obj;
 }
@@ -532 +544 @@
                    size_t align,
                    int (*constructor)(void *obj, int kmflag),
-                   void (*destructor)(void *obj),
+                   int (*destructor)(void *obj),
                    int flags)
 {
@@ -597 +609 @@
                                  size_t align,
                                  int (*constructor)(void *obj, int kmflag),
-                                 void (*destructor)(void *obj),
+                                 int (*destructor)(void *obj),
                                  int flags)
 {