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

Merge branch 'master' of gitlab.ops-class.org:staff/os161

Browse Source
This commit is contained in:
Guru Prasad Srinivasa
2016-03-10 17:30:37 -05:00
parent c9c9e50155 d322a01342
commit 03f484ff21
11 changed files with 45 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
kern/vm/kmalloc.c
View File

@@ -819,17 +819,17 @@ kheap_printstats(void)
spinlock_release(&kmalloc_spinlock);
}
/*
* Print number of used heap bytes.
* Return the number of used bytes.
*/
void
kheap_printused(void)
{
unsigned long
kheap_getused(void) {
struct pageref *pr;
unsigned long total = 0;
char total_string[32];
/* print the whole thing with interrupts off */
/* compute with interrupts off */
spinlock_acquire(&kmalloc_spinlock);
for (pr = allbase; pr != NULL; pr = pr->next_all) {
total += subpage_stats(pr, true);
@@ -837,7 +837,18 @@ kheap_printused(void)
total += coremap_used_bytes();
spinlock_release(&kmalloc_spinlock);
snprintf(total_string, sizeof(total_string), "%lu", total);
return total;
}
/*
* Print number of used bytes.
*/
void
kheap_printused(void)
{
char total_string[32];
snprintf(total_string, sizeof(total_string), "%lu", kheap_getused());
secprintf(SECRET, total_string, "khu");
}