Compare commits
3 Commits
8cf50c9a6e
...
f2b0edc5a3
Author | SHA1 | Date |
---|---|---|
Mathieu Maret | f2b0edc5a3 | |
Mathieu Maret | f90b9bd3fd | |
Mathieu Maret | f3a03f3965 |
26
core/alloc.c
26
core/alloc.c
|
@ -7,7 +7,6 @@
|
|||
#include "mem.h"
|
||||
#include "vga.h"
|
||||
|
||||
|
||||
#define IS_SELF_CONTAINED(desc) ((vaddr_t)((desc)->page) == (vaddr_t)(desc))
|
||||
// Slab will contains object from sizeof(void *) to PAGE_SIZE/2 by pow2
|
||||
#define SLUB_SIZE (PAGE_SHIFT - 1)
|
||||
|
@ -25,7 +24,7 @@ int allocInit(void)
|
|||
pr_devel("Fail to allocBookSlab %d for slabDesc :( \n");
|
||||
return ret;
|
||||
}
|
||||
for (uint i = start; i < SLUB_SIZE; i++) {
|
||||
for (uint i = start; i <= SLUB_SIZE; i++) {
|
||||
if ((ret = allocBookSlab(1U << i, 0))) {
|
||||
pr_devel("Fail to allocBookSlab %d for %d \n", ret, (1U << i));
|
||||
return ret;
|
||||
|
@ -104,7 +103,7 @@ static void *allocFromSlab(struct slabDesc *slab)
|
|||
{
|
||||
vaddr_t *next = slab->freeEl;
|
||||
if (*next == (vaddr_t)NULL) {
|
||||
pr_devel("Slab @%d for %d full\n", slab, slab->size);
|
||||
pr_devel("Slab @%d for %d is now full\n", slab, slab->size);
|
||||
slab->full = 1;
|
||||
} else {
|
||||
slab->freeEl = (void *)(*next);
|
||||
|
@ -119,7 +118,7 @@ void *malloc(size_t size)
|
|||
return NULL;
|
||||
}
|
||||
struct slabDesc *slubEntry;
|
||||
uint slubIdx = 0;
|
||||
uint slubIdx;
|
||||
list_foreach(slub, slubEntry, slubIdx)
|
||||
{
|
||||
if (size <= slubEntry->size)
|
||||
|
@ -129,8 +128,13 @@ void *malloc(size_t size)
|
|||
int slabIdx;
|
||||
list_foreach(slubEntry, slab, slabIdx)
|
||||
{
|
||||
if (slab->size > slubEntry->size){
|
||||
pr_devel("No more room in slub %d\n", slubIdx);
|
||||
break;
|
||||
}
|
||||
if (!slab->full) {
|
||||
pr_devel("found place in slub %d at idx %d for size %d\n", slubIdx, slabIdx, size);
|
||||
pr_devel("found place in slub %d at idx %d for size %d\n", slubIdx,
|
||||
slabIdx, size);
|
||||
return allocFromSlab(slab);
|
||||
}
|
||||
}
|
||||
|
@ -138,15 +142,17 @@ void *malloc(size_t size)
|
|||
// No room found
|
||||
struct slabDesc *newSlab;
|
||||
int ret;
|
||||
if ((ret = addSlab(&newSlab, slab->size, IS_SELF_CONTAINED(slubEntry)))) {
|
||||
if ((ret = addSlab(&newSlab, slubEntry->size, IS_SELF_CONTAINED(slubEntry)))) {
|
||||
pr_devel("Fail to addSlab %d\n", ret);
|
||||
return NULL;
|
||||
}
|
||||
pr_devel("Allocate new slab for object of size %d\n", slubEntry->size);
|
||||
list_add_head(slubEntry, newSlab);
|
||||
return allocFromSlab(newSlab);
|
||||
}
|
||||
|
||||
int slabFree(void *ptr, struct slabDesc *slab){
|
||||
int slabFree(void *ptr, struct slabDesc *slab)
|
||||
{
|
||||
struct slabDesc *slabEntry;
|
||||
int slabIdx;
|
||||
list_foreach(slab, slabEntry, slabIdx)
|
||||
|
@ -162,13 +168,15 @@ int slabFree(void *ptr, struct slabDesc *slab){
|
|||
}
|
||||
return 0;
|
||||
}
|
||||
void free(void *ptr){
|
||||
void free(void *ptr)
|
||||
{
|
||||
if (!ptr)
|
||||
return;
|
||||
|
||||
struct slabDesc *slab;
|
||||
int slabIdx;
|
||||
list_foreach(slub, slab, slabIdx){
|
||||
list_foreach(slub, slab, slabIdx)
|
||||
{
|
||||
if (slabFree(ptr, slab))
|
||||
return;
|
||||
}
|
||||
|
|
11
tests/test.c
11
tests/test.c
|
@ -33,7 +33,8 @@ void testPhymem(void)
|
|||
}
|
||||
printf("%d pages freed\n", freeCount);
|
||||
|
||||
assertmsg((page = (struct mem_desc *)allocPhyPage()) != NULL, "Cannot allocate memory\n");
|
||||
assertmsg((page = (struct mem_desc *)allocPhyPage()) != NULL,
|
||||
"Cannot allocate memory\n");
|
||||
unrefPhyPage((ulong)page);
|
||||
}
|
||||
|
||||
|
@ -69,14 +70,15 @@ static void testPaging(void)
|
|||
while ((page = (struct mem_desc *)allocPhyPage()) != NULL) {
|
||||
assertmsg(pageMap((vaddr_t)page, (paddr_t)page, PAGING_MEM_WRITE) == 0,
|
||||
"Fail to map page %d\n", allocCount);
|
||||
page->phy_addr = allocCount;
|
||||
memset(page, allocCount, PAGE_SIZE);
|
||||
allocCount++;
|
||||
list_add_tail(allocated_page_list, page);
|
||||
}
|
||||
printf("%d pages allocated\n", allocCount);
|
||||
|
||||
while ((page = list_pop_head(allocated_page_list)) != NULL) {
|
||||
assertmsg(page->phy_addr == (ulong)freeCount, "page modified");
|
||||
assertmsg((char)page->phy_addr == (char)freeCount,
|
||||
"page modified %d but is %d\n", freeCount, page->phy_addr);
|
||||
assertmsg(unrefPhyPage((ulong)page) >= 0, "Failed to free page %d\n",
|
||||
(ulong)page);
|
||||
pageUnmap((vaddr_t)page);
|
||||
|
@ -84,7 +86,8 @@ static void testPaging(void)
|
|||
}
|
||||
printf("%d pages freed\n", freeCount);
|
||||
|
||||
assertmsg((page = (struct mem_desc *)allocPhyPage()) != NULL, "Cannot allocate memory\n");
|
||||
assertmsg((page = (struct mem_desc *)allocPhyPage()) != NULL,
|
||||
"Cannot allocate memory\n");
|
||||
unrefPhyPage((ulong)page);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue