Changeset e22f561 in mainline

Timestamp:

2006-02-05T12:29:57Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

248fc1a

Parents:

5158549

Message:

Small locking performance tweak.

File:

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

generic/src/mm/slab.c

@@ -229 +229 @@
                                 slab_t *slab)
 {
-        count_t frames = 0;
-
         if (!slab)
                 slab = obj2slab(obj);
@@ -247 +245 @@
                 /* Free associated memory */
                 list_remove(&slab->link);
-                /* This should not produce deadlock, as
-                 * magazine is always allocated with NO reclaim,
-                 * keep all locks */
-                frames = slab_space_free(cache, slab);
+                spinlock_unlock(&cache->slablock);
+
+                return 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);
-        }
-
-        spinlock_unlock(&cache->slablock);
-
-        return frames;
+                spinlock_unlock(&cache->slablock);
+        }
+        return 0;
 }
 
@@ -745 +741 @@
         /* TODO: Add assert, that interrupts are disabled, otherwise
          * memory allocation from interrupts can deadlock.
-         * - cache_destroy can call this with interrupts enabled :-/
          */