oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merging in memory freeer.

Browse Source
This commit is contained in:
Ben Gras 2009-06-08 15:31:45 +00:00
parent 01732ffb5e
commit 3765538c76
1 changed files with 47 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
servers/vm/alloc.c
View File

@ -410,6 +410,19 @@ struct memory *chunks; /* list of free memory chunks */
CHECKHOLES; CHECKHOLES;
} }
int countnodes(void)
{
addr_iter iter;
int n = 0;
addr_start_iter_least(&addravl, &iter);
while(addr_get_iter(&iter)) {
n++;
addr_incr_iter(&iter);
}
return n;
}
/*===========================================================================* /*===========================================================================*
* alloc_pages * * alloc_pages *
*===========================================================================*/ *===========================================================================*/
@ -480,8 +493,17 @@ PRIVATE PUBLIC phys_bytes alloc_pages(int pages, int memflags)
*===========================================================================*/ *===========================================================================*/
PRIVATE void free_pages(phys_bytes pageno, int npages) PRIVATE void free_pages(phys_bytes pageno, int npages)
{ {
pagerange_t *pr; pagerange_t *pr, *p;
addr_iter iter;
vm_assert(!addr_search(&addravl, pageno, AVL_EQUAL));
/* try to merge with higher neighbour */
if((pr=addr_search(&addravl, pageno+npages, AVL_EQUAL))) {
SLABSANE(pr);
pr->addr -= npages;
pr->size += npages;
} else {
if(!SLABALLOC(pr)) if(!SLABALLOC(pr))
vm_panic("alloc_pages: can't alloc", NO_NUM); vm_panic("alloc_pages: can't alloc", NO_NUM);
SLABSANE(pr); SLABSANE(pr);
@ -491,6 +513,23 @@ PRIVATE void free_pages(phys_bytes pageno, int npages)
addr_insert(&addravl, pr); addr_insert(&addravl, pr);
} }
addr_start_iter(&addravl, &iter, pr->addr, AVL_EQUAL);
p = addr_get_iter(&iter);
vm_assert(p);
vm_assert(p == pr);
addr_decr_iter(&iter);
if((p = addr_get_iter(&iter))) {
SLABSANE(p);
if(p->addr + p->size == pr->addr) {
p->size += pr->size;
addr_remove(&addravl, pr->addr);
SLABFREE(pr);
}
}
}
#define NR_DMA 16 #define NR_DMA 16
PRIVATE struct dmatab PRIVATE struct dmatab