Changes in kernel/generic/src/mm/slab.c [7ec3c56:63e27ef] in mainline

File:

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

kernel/generic/src/mm/slab.c

@@ -101 +101 @@
  */
 
+#include <assert.h>
 #include <synch/spinlock.h>
 #include <mm/slab.h>
 #include <adt/list.h>
-#include <memstr.h>
+#include <mem.h>
 #include <align.h>
 #include <mm/frame.h>
@@ -111 +112 @@
 #include <arch.h>
 #include <panic.h>
-#include <debug.h>
 #include <bitops.h>
 #include <macros.h>
@@ -260 +260 @@
                 slab = obj2slab(obj);
         
-        ASSERT(slab->cache == cache);
+        assert(slab->cache == cache);
         
         size_t freed = 0;
@@ -268 +268 @@
         
         irq_spinlock_lock(&cache->slablock, true);
-        ASSERT(slab->available < cache->objects);
+        assert(slab->available < cache->objects);
         
         *((size_t *) obj) = slab->nextavail;
@@ -417 +417 @@
         slab_magazine_t *lastmag = cache->mag_cache[CPU->id].last;
         
-        ASSERT(irq_spinlock_locked(&cache->mag_cache[CPU->id].lock));
+        assert(irq_spinlock_locked(&cache->mag_cache[CPU->id].lock));
         
         if (cmag) { /* First try local CPU magazines */
@@ -484 +484 @@
         slab_magazine_t *lastmag = cache->mag_cache[CPU->id].last;
         
-        ASSERT(irq_spinlock_locked(&cache->mag_cache[CPU->id].lock));
+        assert(irq_spinlock_locked(&cache->mag_cache[CPU->id].lock));
         
         if (cmag) {
@@ -586 +586 @@
 NO_TRACE static bool make_magcache(slab_cache_t *cache)
 {
-        ASSERT(_slab_initialized >= 2);
+        assert(_slab_initialized >= 2);
         
         cache->mag_cache = malloc(sizeof(slab_mag_cache_t) * config.cpu_count,
@@ -610 +610 @@
     unsigned int kmflag), size_t (*destructor)(void *obj), unsigned int flags)
 {
-        ASSERT(size > 0);
+        assert(size > 0);
         
         memsetb(cache, sizeof(*cache), 0);
@@ -948 +948 @@
 void *malloc(size_t size, unsigned int flags)
 {
-        ASSERT(_slab_initialized);
-        ASSERT(size <= (1 << SLAB_MAX_MALLOC_W));
+        assert(_slab_initialized);
+        assert(size <= (1 << SLAB_MAX_MALLOC_W));
         
         if (size < (1 << SLAB_MIN_MALLOC_W))
@@ -961 +961 @@
 void *realloc(void *ptr, size_t size, unsigned int flags)
 {
-        ASSERT(_slab_initialized);
-        ASSERT(size <= (1 << SLAB_MAX_MALLOC_W));
+        assert(_slab_initialized);
+        assert(size <= (1 << SLAB_MAX_MALLOC_W));
         
         void *new_ptr;