Convert next locking to sti and cli

72d51a12 · Silas Boyd-Wickizer · b1e77c3e · 72d51a12 · 72d51a12 · 72d51a12
--- a/kernel/condvar.cc
+++ b/kernel/condvar.cc
@@ -94,7 +94,7 @@ void cv_sleepto(struct condvar *cv, struct spinlock *lk, u64 timeout)
  release(&cv->lock);
  sched();
-  release(&myproc()->lock);
+  sti();
  // Reacquire original lock.
  acquire(lk);

--- a/kernel/idle.cc
+++ b/kernel/idle.cc
@@ -37,7 +37,8 @@ idleloop(void)
    struct proc *p = schednext();
    if (p) {
-      acquire(&p->lock);
+      cli();
+      //acquire(&p->lock);
      if (get_proc_state(p) != RUNNABLE) {
        panic("Huh?");
      } else {

--- a/kernel/proc.cc
+++ b/kernel/proc.cc
@@ -64,7 +64,8 @@ yield(void)
  acquire(&myproc()->lock);  //DOC: yieldlock
  set_proc_state(myproc(), RUNNABLE);
  sched();
-  release(&myproc()->lock);
+  sti();
+  //release(&myproc()->lock);
 }
@@ -73,7 +74,8 @@ yield(void)
 void
 forkret(void)
 {
-  release(&myproc()->lock);
+  sti();
+  //release(&myproc()->lock);
  // Just for the first process. can't do it earlier
  // b/c file system code needs a process context
  // in which to call cv_sleep().
@@ -500,7 +502,8 @@ wait(void)
 void
 threadhelper(void (*fn)(void *), void *arg)
 {
-  release(&myproc()->lock);
+  sti();
+  //release(&myproc()->lock);
  mtstart(fn, myproc());
  fn(arg);
  exit();