Changes in kernel/generic/src/mm/slab.c [abf6c01:bab75df6] in mainline

File:

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

kernel/generic/src/mm/slab.c

@@ -667 +667 @@
     size_t (*destructor)(void *obj), unsigned int flags)
 {
-        slab_cache_t *cache = slab_alloc(&slab_cache_cache, FRAME_ATOMIC);
-        if (!cache)
-                panic("Not enough memory to allocate slab cache %s.", name);
-
+        slab_cache_t *cache = slab_alloc(&slab_cache_cache, 0);
         _slab_cache_create(cache, name, size, align, constructor, destructor,
             flags);
@@ -733 +730 @@
 NO_TRACE static void _slab_free(slab_cache_t *cache, void *obj, slab_t *slab)
 {
-        if (!obj)
-                return;
-
         ipl_t ipl = interrupts_disable();
 
@@ -960 +954 @@
 }
 
-void *malloc(size_t size)
+static void *_malloc(size_t size, unsigned int flags)
 {
         assert(_slab_initialized);
@@ -970 +964 @@
         uint8_t idx = fnzb(size - 1) - SLAB_MIN_MALLOC_W + 1;
 
-        return slab_alloc(malloc_caches[idx], FRAME_ATOMIC);
-}
-
-void *realloc(void *ptr, size_t size)
+        return slab_alloc(malloc_caches[idx], flags);
+}
+
+void *malloc(size_t size)
+{
+        return _malloc(size, FRAME_ATOMIC);
+}
+
+/** Non-failing malloc.
+ *  Never returns NULL, but may block forever if no memory is available.
+ */
+void *nfmalloc(size_t size)
+{
+        return _malloc(size, 0);
+}
+
+static void *_realloc(void *ptr, size_t size, unsigned int flags)
 {
         assert(_slab_initialized);
@@ -985 +992 @@
                 uint8_t idx = fnzb(size - 1) - SLAB_MIN_MALLOC_W + 1;
 
-                new_ptr = slab_alloc(malloc_caches[idx], FRAME_ATOMIC);
+                new_ptr = slab_alloc(malloc_caches[idx], flags);
         } else
                 new_ptr = NULL;
@@ -1000 +1007 @@
 }
 
+void *realloc(void *ptr, size_t size)
+{
+        return _realloc(ptr, size, FRAME_ATOMIC);
+}
+
 void free(void *ptr)
 {