minhtrannhat/os161
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed kheap_getused so that it doesn't double-count the pages it's using for

Browse Source 
subpage allocation. We run into problems in determining memory leaks due to
kmalloc framgmentation, which can happen because of delayed thread cleanup.
This commit is contained in:
Scott Haseley 2016-03-25 11:09:15 -04:00
parent 922370ebd4
commit 25a1d7debc
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kern/vm/kmalloc.c
View File

@ -828,13 +828,23 @@ unsigned long
kheap_getused(void) { kheap_getused(void) {
struct pageref *pr; struct pageref *pr;
unsigned long total = 0; unsigned long total = 0;
unsigned int num_pages = 0, coremap_bytes = 0;
/* compute with interrupts off */ /* compute with interrupts off */
spinlock_acquire(&kmalloc_spinlock); spinlock_acquire(&kmalloc_spinlock);
for (pr = allbase; pr != NULL; pr = pr->next_all) { for (pr = allbase; pr != NULL; pr = pr->next_all) {
total += subpage_stats(pr, true); total += subpage_stats(pr, true);
num_pages++;
} }
total += coremap_used_bytes();
coremap_bytes = coremap_used_bytes();
// Don't double-count the pages we're using for subpage allocation;
// we've already accounted for the used portion.
if (coremap_bytes > 0) {
total += coremap_bytes - (num_pages * PAGE_SIZE);
}
spinlock_release(&kmalloc_spinlock); spinlock_release(&kmalloc_spinlock);
return total; return total;