From deaaf12d01076e84159409687a22315d9eb1d889 Mon Sep 17 00:00:00 2001
From: Taku Shimosawa <shimosawa@is.s.u-tokyo.ac.jp>
Date: Wed, 26 Oct 2011 12:58:40 +0900
Subject: [PATCH] kputs fixed and lock added for kmsg

---
 kernel/debug.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/kernel/debug.c b/kernel/debug.c
index e6d03efc..06a2d960 100644
--- a/kernel/debug.c
+++ b/kernel/debug.c
@@ -2,35 +2,47 @@
 #include <string.h>
 #include <kmsg.h>
 #include <aal/debug.h>
+#include <aal/lock.h>
 
 struct aal_kmsg_buf kmsg_buf AAL_KMSG_ALIGN;
 
 extern int vsnprintf(char *buf, size_t size, const char *fmt, va_list args);
+static aal_spinlock_t kmsg_lock;
 
 /* TODO: lock */
 void kputs(char *buf)
 {
 	int len = strlen(buf);
-	
+	unsigned long flags;
+
+	flags = aal_mc_spinlock_lock(&kmsg_lock);
+
 	if (len + kmsg_buf.tail > kmsg_buf.len) {
 		len = kmsg_buf.len - kmsg_buf.tail;
 	}
 	
-	strncpy(kmsg_buf.str, buf, len);
+	strncpy(kmsg_buf.str + kmsg_buf.tail, buf, len);
 	kmsg_buf.tail += len;
+
+	aal_mc_spinlock_unlock(&kmsg_lock, flags);
 }
 
 int kprintf(const char *format, ...)
 {
 	int len;
 	va_list va;
+	unsigned long flags;
 
 	va_start(va, format);
 
+	flags = aal_mc_spinlock_lock(&kmsg_lock);
+
 	len = vsnprintf(kmsg_buf.str + kmsg_buf.tail,
 	                kmsg_buf.len - kmsg_buf.tail, format, va);
 	kmsg_buf.tail += len;
 
+	aal_mc_spinlock_unlock(&kmsg_lock, flags);
+
 	va_end(va);
 
 	return len;
@@ -38,6 +50,7 @@ int kprintf(const char *format, ...)
 
 void kmsg_init(void)
 {
+	aal_mc_spinlock_init(&kmsg_lock);
 	kmsg_buf.tail = 0;
 	kmsg_buf.len = sizeof(kmsg_buf.str);
 }