aboutsummaryrefslogtreecommitdiff
path: root/src/kernel/memory/alloc.c
diff options
context:
space:
mode:
authorMarvin Borner2020-05-15 20:28:44 +0200
committerMarvin Borner2020-05-15 20:28:44 +0200
commit916c21af52dc2230d689e1075457c4c29b4b262c (patch)
tree761fb7eb888d1d3fd33405e4a601014ab1776484 /src/kernel/memory/alloc.c
parent89b9cad0607d8fb81489143e312c1983e3e8a552 (diff)
Added test-case for malloc
Diffstat (limited to 'src/kernel/memory/alloc.c')
-rw-r--r--src/kernel/memory/alloc.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/src/kernel/memory/alloc.c b/src/kernel/memory/alloc.c
index 0751011..a4fb60a 100644
--- a/src/kernel/memory/alloc.c
+++ b/src/kernel/memory/alloc.c
@@ -162,7 +162,10 @@ static struct liballoc_major *allocate_new_page(u32 size)
void *malloc(u32 req_size)
{
- int startedBet = 0;
+ if (!paging_enabled)
+ warn("Mallocing while paging is disabled!");
+
+ int started_bet = 0;
u64 best_size = 0;
void *p = NULL;
u32 diff;
@@ -192,14 +195,14 @@ void *malloc(u32 req_size)
}
maj = l_mem_root;
- startedBet = 0;
+ started_bet = 0;
if (l_best_bet != NULL) {
best_size = l_best_bet->size - l_best_bet->usage;
if (best_size > (size + sizeof(struct liballoc_minor))) {
maj = l_best_bet;
- startedBet = 1;
+ started_bet = 1;
}
}
@@ -217,9 +220,9 @@ void *malloc(u32 req_size)
continue;
}
- if (startedBet == 1) {
+ if (started_bet == 1) {
maj = l_mem_root;
- startedBet = 0;
+ started_bet = 0;
continue;
}
@@ -339,9 +342,9 @@ void *malloc(u32 req_size)
#ifdef USE_CASE5
if (maj->next == NULL) {
- if (startedBet == 1) {
+ if (started_bet == 1) {
maj = l_mem_root;
- startedBet = 0;
+ started_bet = 0;
continue;
}
maj->next = allocate_new_page(size);