aboutsummaryrefslogtreecommitdiff
path: root/kernel/l0/kmalloc.c
diff options
context:
space:
mode:
authorAlex Auvolat <alex.auvolat@ens.fr>2015-02-09 17:39:41 +0100
committerAlex Auvolat <alex.auvolat@ens.fr>2015-02-09 17:40:03 +0100
commitf2c51bc81d2aa618b29ddbeaae5ac1c5308821f0 (patch)
treefae67a79d5e60128d074550326a05216694a5848 /kernel/l0/kmalloc.c
parenta5dfdd2b3fa91a2cda4f807c88bd35928e3c7a61 (diff)
downloadkogata-f2c51bc81d2aa618b29ddbeaae5ac1c5308821f0.tar.gz
kogata-f2c51bc81d2aa618b29ddbeaae5ac1c5308821f0.zip
Reorganize all.
Diffstat (limited to 'kernel/l0/kmalloc.c')
-rw-r--r--kernel/l0/kmalloc.c52
1 files changed, 0 insertions, 52 deletions
diff --git a/kernel/l0/kmalloc.c b/kernel/l0/kmalloc.c
deleted file mode 100644
index e356ada..0000000
--- a/kernel/l0/kmalloc.c
+++ /dev/null
@@ -1,52 +0,0 @@
-#include <kmalloc.h>
-
-#include <slab_alloc.h>
-#include <mutex.h>
-
-#include <frame.h>
-#include <paging.h>
-#include <region.h>
-
-static void* page_alloc_fun_for_kmalloc(size_t bytes) {
- void* addr = region_alloc(bytes, "Core kernel heap", default_allocator_pf_handler);
- return addr;
-}
-
-static slab_type_t slab_sizes[] = {
- { "8B kmalloc objects", 8, 2 },
- { "16B kmalloc objects", 16, 2 },
- { "32B kmalloc objects", 32, 2 },
- { "64B kmalloc objects", 64, 4 },
- { "128B kmalloc objects", 128, 4 },
- { "256B kmalloc objects", 256, 4 },
- { "512B kmalloc objects", 512, 8 },
- { "1KB kmalloc objects", 1024, 8 },
- { "2KB kmalloc objects", 2048, 16 },
- { "4KB kmalloc objects", 4096, 16 },
- { 0, 0, 0 }
-};
-
-static mem_allocator_t *kernel_allocator = 0;
-STATIC_MUTEX(kmalloc_mutex);
-
-void kmalloc_setup() {
- kernel_allocator =
- create_slab_allocator(slab_sizes, page_alloc_fun_for_kmalloc,
- region_free_unmap_free);
-}
-
-void* kmalloc(size_t sz) {
- void* res = 0;
-
- mutex_lock(&kmalloc_mutex);
- res = slab_alloc(kernel_allocator, sz);
- mutex_unlock(&kmalloc_mutex);
-
- return res;
-}
-
-void kfree(void* ptr) {
- mutex_lock(&kmalloc_mutex);
- slab_free(kernel_allocator, ptr);
- mutex_unlock(&kmalloc_mutex);
-}