Added quantum counter

2 files changed, 12 insertions, 9 deletions

diff --git a/kernel/features/proc.c b/kernel/features/proc.c
index a56a0c4..86e444b 100644
--- a/kernel/features/proc.c
+++ b/kernel/features/proc.c
@@ -13,11 +13,19 @@
 #include <timer.h>
 
 u32 pid = 0;
+u32 quantum = 0;
 struct list *proc_list;
 struct node *current;
 
 void scheduler(struct regs *regs)
 {
+	if (quantum == 0) {
+		quantum = PROC_QUANTUM;
+	} else {
+		quantum--;
+		return;
+	}
+
 	if (current)
 		memcpy(&((struct proc *)current->data)->regs, regs, sizeof(struct regs));
 
@@ -28,10 +36,9 @@ void scheduler(struct regs *regs)
 	else
 		current = proc_list->head;
 
-	while (!current || ((struct proc *)current->data)->state == PROC_ASLEEP) {
+	while (!current) {
 		if (!current || !current->next || !current->next->data) {
 			assert(proc_list->head);
-			assert(((struct proc *)proc_list->head->data)->state != PROC_ASLEEP);
 			current = proc_list->head;
 		} else {
 			current = current->next;
@@ -67,8 +74,7 @@ void proc_print()
 	printf("\nPROCESSES\n");
 	struct proc *proc;
 	while (node && (proc = ((struct proc *)node->data))) {
-		printf("Process %d [%s]: %s\n", proc->pid,
-		       proc->state == PROC_RUNNING ? "running" : "sleeping", proc->name);
+		printf("Process %d: %s\n", proc->pid, proc->name);
 		node = node->next;
 	}
 	printf("\n");
@@ -86,7 +92,6 @@ void proc_exit(struct proc *proc, int status)
 {
 	assert(proc);
 	printf("Process %d exited with status %d\n", proc->pid, status);
-	proc->state = status == 0 ? PROC_ASLEEP : PROC_ERROR;
 
 	struct node *iterator = proc_list->head;
 	do {
@@ -104,7 +109,6 @@ struct proc *proc_make()
 {
 	struct proc *proc = malloc(sizeof(*proc));
 	proc->pid = pid++;
-	proc->state = PROC_RUNNING;
 
 	if (current)
 		list_add(proc_list, proc);
diff --git a/kernel/inc/proc.h b/kernel/inc/proc.h
index 76eeb4b..8f93e43 100644
--- a/kernel/inc/proc.h
+++ b/kernel/inc/proc.h
@@ -6,17 +6,16 @@
 #include <def.h>
 #include <interrupts.h>
 
+#define PROC_QUANTUM 42 // Milliseconds
+
 #define EFLAGS_ALWAYS 0x2 // Always one
 #define EFLAGS_INTERRUPTS 0x200 // Enable interrupts
 
 #define GDT_USER_CODE_OFFSET 0x1b // User code segment offset in GDT (with ring3 mask)
 #define GDT_USER_DATA_OFFSET 0x23 // User data segment offset in GDT (with ring3 mask)
 
-enum state { PROC_RUNNING, PROC_ASLEEP, PROC_ERROR };
-
 struct proc {
 	u32 pid;
-	enum state state;
 	char name[32];
 	struct regs regs;
 	u32 event;