3 files changed, 65 insertions, 1 deletions
diff --git a/sys/kern/kern_sched.c b/sys/kern/kern_sched.c
index ec5592e..774ba71 100644
--- a/sys/kern/kern_sched.c
+++ b/sys/kern/kern_sched.c
@@ -34,6 +34,7 @@
 #include <sys/param.h>
 #include <sys/syslog.h>
 #include <sys/atomic.h>
+#include <dev/cons/cons.h>
 #include <machine/frame.h>
 #include <machine/cpu.h>
 #include <machine/cdefs.h>
@@ -221,6 +222,7 @@ sched_switch(struct trapframe *tf)
 
     ci = this_cpu();
     td = ci->curtd;
+    cons_detach();
 
     if (td != NULL) {
         if (td->pid == 0)
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index 57b27d0..497aff7 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -28,12 +28,16 @@
  */
 
 #include <sys/types.h>
+#include <sys/mutex.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
+#include <sys/sched.h>
 #include <sys/atomic.h>
 #include <sys/syslog.h>
 #include <sys/spinlock.h>
+#include <machine/cdefs.h>
 #include <dev/timer.h>
+#include <string.h>
 
 #define pr_trace(fmt, ...) kprintf("synch: " fmt, ##__VA_ARGS__)
 #define pr_error(...) pr_trace(__VA_ARGS__)
@@ -80,7 +84,9 @@ spinlock_usleep(struct spinlock *lock, size_t usec_max)
 void
 spinlock_acquire(struct spinlock *lock)
 {
-    while (__atomic_test_and_set(&lock->lock, __ATOMIC_ACQUIRE));
+    while (__atomic_test_and_set(&lock->lock, __ATOMIC_ACQUIRE)) {
+        md_pause();
+    }
 }
 
 /*
@@ -136,3 +142,57 @@ sysrel(void)
 {
     spinlock_release(&__syslock);
 }
+
+/*
+ * Create a new mutex lock object
+ */
+struct mutex *
+mutex_new(const char *name)
+{
+    struct mutex *mtx;
+    size_t namelen;
+
+    mtx = dynalloc(sizeof(*mtx));
+    if (mtx == NULL) {
+        return NULL;
+    }
+
+    mtx->lock = 0;
+    namelen = strlen(name);
+
+    /* Don't overflow the name buffer */
+    if (namelen >= MUTEX_NAME_LEN) {
+        namelen = MUTEX_NAME_LEN - 1;
+    }
+
+    memcpy(mtx->name, name, namelen);
+    return mtx;
+}
+
+/*
+ * Acquire a mutex
+ *
+ * @mtx: Mutex to acquire
+ * @flags: Optional flags
+ */
+int
+mutex_acquire(struct mutex *mtx, int flags)
+{
+    while (__atomic_test_and_set(&mtx->lock, __ATOMIC_ACQUIRE)) {
+        sched_yield();
+    }
+
+    return 0;
+}
+
+void
+mutex_release(struct mutex *mtx)
+{
+    __atomic_clear(&mtx->lock, __ATOMIC_RELEASE);
+}
+
+void
+mutex_free(struct mutex *mtx)
+{
+    dynfree(mtx);
+}
diff --git a/sys/kern/kern_syscall.c b/sys/kern/kern_syscall.c
index 292fa56..739dd7f 100644
--- a/sys/kern/kern_syscall.c
+++ b/sys/kern/kern_syscall.c
@@ -54,6 +54,8 @@ scret_t(*g_sctab[])(struct syscall_args *) = {
     sys_lseek,  /* SYS_lseek */
     sys_sleep,  /* SYS_sleep */
     sys_inject, /* SYS_inject */
+    sys_getpid, /* SYS_getpid */
+    sys_getppid /* SYS_getppid */
 };
 
 const size_t MAX_SYSCALLS = NELEM(g_sctab);