Replaced target macros

2 files changed, 9 insertions, 4 deletions

diff --git a/kernel/features/mm.c b/kernel/features/mm.c
index afee468..064f78c 100644
--- a/kernel/features/mm.c
+++ b/kernel/features/mm.c
@@ -377,7 +377,6 @@ void *memory_alloc_identity(struct page_dir *dir, u32 flags)
 	return NULL;
 }
 
-// TODO: Free by address instead of vrange (combine with shmem map?)
 void memory_free(struct page_dir *dir, struct memory_range vrange)
 {
 	assert(PAGE_ALIGNED(vrange.base) && PAGE_ALIGNED(vrange.size));
diff --git a/kernel/features/proc.c b/kernel/features/proc.c
index 2b2d2d2..8625e7d 100644
--- a/kernel/features/proc.c
+++ b/kernel/features/proc.c
@@ -31,7 +31,10 @@ HOT FLATTEN void scheduler(struct regs *regs)
 {
 	spinlock(&locked);
 
-	PROC(current)->ticks++;
+	if (RING(regs) == 3)
+		PROC(current)->ticks.user++;
+	else
+		PROC(current)->ticks.kernel++;
 
 	if (PROC(current)->quantum.cnt >= PROC(current)->quantum.val) {
 		PROC(current)->quantum.cnt = 0;
@@ -93,14 +96,14 @@ struct proc *proc_from_pid(u32 pid)
 
 	iterator = proc_list_blocked->head;
 	while (iterator) {
-		if (((struct proc *)iterator->data)->pid == pid)
+		if (PROC(iterator)->pid == pid)
 			return iterator->data;
 		iterator = iterator->next;
 	}
 
 	iterator = proc_list_running->head;
 	while (iterator) {
-		if (((struct proc *)iterator->data)->pid == pid)
+		if (PROC(iterator)->pid == pid)
 			return iterator->data;
 		iterator = iterator->next;
 	}
@@ -152,12 +155,15 @@ void proc_exit(struct proc *proc, struct regs *r, s32 status)
 
 	if (proc->memory->head) {
 		printf("Process leaked memory:\n");
+		u32 total = 0;
 		struct node *iterator = proc->memory->head;
 		while (iterator) {
 			struct memory_proc_link *link = iterator->data;
 			printf("\t-> 0x%x: %dB\n", link->vrange.base, link->vrange.size);
+			total += link->vrange.size;
 			iterator = iterator->next;
 		}
+		printf("\tTOTAL: %dB (%dKiB)\n", total, total >> 10);
 	} else {
 		printf("Process didn't leak memory!\n");
 	}