Added wait syscall.

This makes a process sleep until it receives a new message (no polling!).
I thought that this will result in performance improvements but I haven't
noticed any, yet. Maybe I'll remove this again in the future..

2 files changed, 40 insertions, 2 deletions

diff --git a/kernel/features/proc.c b/kernel/features/proc.c
index a5df875..19845d4 100644
--- a/kernel/features/proc.c
+++ b/kernel/features/proc.c
@@ -40,6 +40,15 @@ void scheduler(struct regs *regs)
 	else
 		current = proc_list->head;
 
+	while (((struct proc *)current->data)->state == PROC_WAITING) {
+		/* assert(proc_awake() > 0); */
+		if (current && current->next && current->next->data) {
+			current = current->next;
+		} else {
+			current = proc_list->head;
+		}
+	}
+
 	memcpy(regs, &((struct proc *)current->data)->regs, sizeof(struct regs));
 
 	if (regs->cs != GDT_USER_CODE_OFFSET) {
@@ -55,6 +64,16 @@ void scheduler(struct regs *regs)
 	/* printf("{%d}", ((struct proc *)current->data)->pid); */
 }
 
+void scheduler_enable()
+{
+	irq_install_handler(0, scheduler);
+}
+
+void scheduler_disable()
+{
+	irq_install_handler(0, timer_handler);
+}
+
 void proc_print()
 {
 	struct node *node = proc_list->head;
@@ -73,6 +92,17 @@ struct proc *proc_current()
 	return current && current->data ? current->data : NULL;
 }
 
+int proc_awake()
+{
+	int ret = 0;
+	struct node *iterator = proc_list->head;
+	do {
+		if (((struct proc *)iterator->data)->state != PROC_WAITING)
+			ret++;
+	} while ((iterator = iterator->next) != NULL);
+	return ret;
+}
+
 void proc_send(struct proc *src, struct proc *dest, enum message_type type, void *data)
 {
 	// TODO: Use unique key instead of pid for IPC messaging
@@ -85,6 +115,8 @@ void proc_send(struct proc *src, struct proc *dest, enum message_type type, void
 	msg->msg->type = type;
 	msg->msg->data = data;
 	list_add(dest->messages, msg);
+	if (dest->state == PROC_WAITING)
+		dest->state = PROC_DEFAULT;
 }
 
 struct proc_message *proc_receive(struct proc *proc)
@@ -159,7 +191,7 @@ void proc_init()
 		return;
 
 	cli();
-	irq_install_handler(0, scheduler);
+	scheduler_enable();
 	proc_list = list_new();
 
 	kernel_proc = proc_make();
diff --git a/kernel/features/syscall.c b/kernel/features/syscall.c
index 25770a4..b3af455 100644
--- a/kernel/features/syscall.c
+++ b/kernel/features/syscall.c
@@ -17,7 +17,7 @@ void syscall_handler(struct regs *r)
 	enum sys num = r->eax;
 	r->eax = 0;
 
-	if (num != SYS_RECEIVE && num != SYS_YIELD && num != SYS_TIME)
+	if (num != SYS_RECEIVE && num != SYS_YIELD && num != SYS_WAIT && num != SYS_TIME)
 		printf("[SYSCALL] %d from %s: ", num, proc_current()->name);
 
 	switch (num) {
@@ -74,6 +74,12 @@ void syscall_handler(struct regs *r)
 		proc_yield(r);
 		break;
 	}
+	case SYS_WAIT: {
+		/* printf("wait\n"); */
+		proc_current()->state = PROC_WAITING;
+		proc_yield(r);
+		break;
+	}
 	case SYS_TIME: {
 		/* printf("time\n"); */
 		r->eax = timer_get();