alloc: fix indent
This commit is contained in:
parent
f3a03f3965
commit
f90b9bd3fd
23
core/alloc.c
23
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)
|
||||
@ -36,7 +35,7 @@ int allocInit(void)
|
||||
|
||||
int allocBookSlab(size_t size, int selfContained)
|
||||
{
|
||||
//pr_devel("%s for size %d is self %d\n", __func__, size, selfContained );
|
||||
// pr_devel("%s for size %d is self %d\n", __func__, size, selfContained );
|
||||
struct slabDesc *slabEntry;
|
||||
struct slabDesc *slab;
|
||||
int slabIdx;
|
||||
@ -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)
|
||||
@ -130,7 +129,8 @@ void *malloc(size_t size)
|
||||
list_foreach(slubEntry, slab, slabIdx)
|
||||
{
|
||||
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);
|
||||
}
|
||||
}
|
||||
@ -146,13 +146,14 @@ void *malloc(size_t size)
|
||||
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)
|
||||
{
|
||||
if ((slabEntry->page <= (vaddr_t)ptr) &&
|
||||
((vaddr_t)ptr < (slabEntry->page + PAGE_SIZE))){
|
||||
((vaddr_t)ptr < (slabEntry->page + PAGE_SIZE))) {
|
||||
pr_devel("free place! was %d is now %d\n", slabEntry->freeEl, ptr);
|
||||
*((vaddr_t *)ptr) = (vaddr_t)slabEntry->freeEl;
|
||||
slabEntry->freeEl = ptr;
|
||||
@ -162,14 +163,16 @@ int slabFree(void *ptr, struct slabDesc *slab){
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
void free(void *ptr){
|
||||
if(!ptr)
|
||||
void free(void *ptr)
|
||||
{
|
||||
if (!ptr)
|
||||
return;
|
||||
|
||||
struct slabDesc *slab;
|
||||
int slabIdx;
|
||||
list_foreach(slub, slab, slabIdx){
|
||||
if(slabFree(ptr, slab))
|
||||
list_foreach(slub, slab, slabIdx)
|
||||
{
|
||||
if (slabFree(ptr, slab))
|
||||
return;
|
||||
}
|
||||
pr_devel("free: slab not found\n");
|
||||
|
Loading…
Reference in New Issue
Block a user