Some scheduling clean up

7f815e24 · Silas Boyd-Wickizer · a149ec86 · 7f815e24 · 7f815e24 · 7f815e24
--- a/include/cpu.hh
+++ b/include/cpu.hh
@@ -19,8 +19,7 @@ struct cpu {
  struct cilkframe *cilkframe;
  int timer_printpc;
  atomic<u64> tlbflush_done;   // last tlb flush req done on this cpu
+  struct proc *prev;           // The previously-running process
-  struct proc *prev;
  // Cpu-local storage variables; see below
  struct cpu *cpu;

--- a/include/kernel.hh
+++ b/include/kernel.hh
@@ -125,6 +125,9 @@ void            ideinit(void);
 void            ideintr(void);
 void            iderw(struct buf*);
+// idle.cc
+extern struct proc *idlep[NCPU];
 // ioapic.c
 void            ioapicenable(int irq, int cpu);
@@ -174,7 +177,6 @@ int             piperead(struct pipe*, char*, int);
 int             pipewrite(struct pipe*, char*, int);
 // proc.c
-void            addrun(struct proc *);
 struct proc*    allocproc(void);
 struct proc*    copyproc(struct proc*);
 void            exit(void);
@@ -190,11 +192,6 @@ void            yield(void);
 struct proc*    threadalloc(void (*fn)(void*), void *arg);
 void            threadpin(void (*fn)(void*), void *arg, const char *name, int cpu);
-// XXX
-void            sched(void);
-void            post_swtch(void);
-void            scheddump(void);
 // prof.c
 extern int profenable;
 void            profreset(void);
@@ -206,6 +203,12 @@ int             sampintr(struct trapframe*);
 void            sampdump(void);
 void            sampconf(void);
+// sched.cc
+void            addrun(struct proc *);
+void            sched(void);
+void            post_swtch(void);
+void            scheddump(void);
 // spinlock.c
 void            acquire(struct spinlock*);
 int             tryacquire(struct spinlock*);

--- a/include/sched.hh
+++ b/include/sched.hh
@@ -2,3 +2,4 @@ void delrun(struct proc*);
 struct proc* schednext(void);
 int steal(void);
 void addrun(struct proc*);
--- a/kernel/condvar.cc
+++ b/kernel/condvar.cc
@@ -92,10 +92,7 @@ void cv_sleepto(struct condvar *cv, struct spinlock *lk, u64 timeout)
 }
  release(&cv->lock);
  sched();
-  //sti();
  // Reacquire original lock.
  acquire(lk);
 }

--- a/kernel/console.cc
+++ b/kernel/console.cc
@@ -245,7 +245,6 @@ consoleintr(int (*getc)(void))
    switch(c){
    case C('P'):  // Process listing.
      procdumpall();
-      scheddump();
      break;
    case C('E'):  // Print user-space PCs.
      for (u32 i = 0; i < NCPU; i++)

--- a/kernel/idle.cc
+++ b/kernel/idle.cc
 #include "types.h"
 #include "kernel.hh"
-#include "mmu.h"
 #include "amd64.h"
 #include "spinlock.h"
 #include "condvar.h"
-#include "queue.h"
 #include "proc.hh"
 #include "cpu.hh"
-#include "bits.hh"
-#include "kmtrace.hh"
 #include "sched.hh"
-#include "kalloc.hh"
-#include "vm.hh"
-#include "ns.hh"
-static struct proc *the_idle[NCPU] __mpalign__;
+struct proc *idlep[NCPU] __mpalign__;
-extern void
-forkret(void);
-void
-post_swtch(void)
-{
-  if (get_proc_state(mycpu()->prev) == RUNNABLE && 
-      mycpu()->prev != the_idle[mycpu()->id])
-    addrun(mycpu()->prev);
-  release(&mycpu()->prev->lock);
-  popcli();
-}
-void
-sched(void)
-{
-  int intena;
-#if SPINLOCK_DEBUG
-  if(!holding(&myproc()->lock))
-    panic("sched proc->lock");
-#endif
-  if(mycpu()->ncli != 1)
-    panic("sched locks");
-  if(get_proc_state(myproc()) == RUNNING)
-    panic("sched running");
-  if(readrflags()&FL_IF)
-    panic("sched interruptible");
-  intena = mycpu()->intena;
-  myproc()->curcycles += rdtsc() - myproc()->tsc;
-  if (get_proc_state(myproc()) == ZOMBIE)
-    mtstop(myproc());
-  else
-    mtpause(myproc());
-  mtign();
-  struct proc *next = schednext();
-  if (next) {
-  switchit:
-      pushcli();
-      if (get_proc_state(next) != RUNNABLE)
-        panic("non-RUNNABLE next %s %u", next->name, get_proc_state(next));
-      // Switch to chosen process.  It is the process's job
-      // to release proc->lock and then reacquire it
-      // before jumping back to us.
-      struct proc *prev = myproc();
-      mycpu()->proc = next;
-      mycpu()->prev = prev;
-      switchuvm(next);
-      set_proc_state(next, RUNNING);
-      next->tsc = rdtsc();
-      mtpause(next);
-      if (next->context->rip != (uptr)forkret && 
-          next->context->rip != (uptr)threadstub)
-      {
-        mtresume(next);
-      }
-      mtrec();
-      swtch(&prev->context, next->context);
-      mycpu()->intena = intena;
-      post_swtch();
-  } else if (get_proc_state(myproc()) != RUNNABLE) {
-    next = the_idle[mycpu()->id];
-    goto switchit;
-  } else {
-    set_proc_state(myproc(), RUNNING);
-    mycpu()->intena = intena;
-    release(&myproc()->lock);
-  }
-  //swtch(&myproc()->context, mycpu()->scheduler);
-  //mycpu()->intena = intena;
-}
 void
 idleloop(void)
@@ -105,7 +20,6 @@ idleloop(void)
  // mtrace_call_set(1, cpu->id);
  //mtstart(scheduler, idlep);
  sti();
  for (;;) {
    acquire(&myproc()->lock);
@@ -134,5 +48,5 @@ initidle(void)
  snprintf(p->name, sizeof(p->name), "idle_%u", cpunum());
  mycpu()->proc = p;
  myproc()->cpu_pin = 1;
-  the_idle[cpunum()] = p;
+  idlep[cpunum()] = p;
 }
--- a/kernel/sched.cc
+++ b/kernel/sched.cc
@@ -24,6 +24,76 @@ struct runq {
 static struct runq runq[NCPU] __mpalign__;
 void
+post_swtch(void)
+{
+  if (get_proc_state(mycpu()->prev) == RUNNABLE && 
+      mycpu()->prev != idlep[mycpu()->id])
+    addrun(mycpu()->prev);
+  release(&mycpu()->prev->lock);
+}
+void
+sched(void)
+{
+  extern void threadstub(void);
+  extern void forkret(void);
+  int intena;
+#if SPINLOCK_DEBUG
+  if(!holding(&myproc()->lock))
+    panic("sched proc->lock");
+#endif
+  if(mycpu()->ncli != 1)
+    panic("sched locks");
+  if(get_proc_state(myproc()) == RUNNING)
+    panic("sched running");
+  if(readrflags()&FL_IF)
+    panic("sched interruptible");
+  intena = mycpu()->intena;
+  myproc()->curcycles += rdtsc() - myproc()->tsc;
+  if (get_proc_state(myproc()) == ZOMBIE)
+    mtstop(myproc());
+  else
+    mtpause(myproc());
+  mtign();
+  struct proc *next = schednext();
+  if (next == nullptr) {
+    if (get_proc_state(myproc()) != RUNNABLE) {
+      next = idlep[mycpu()->id];
+    } else {
+      set_proc_state(myproc(), RUNNING);
+      mycpu()->intena = intena;
+      release(&myproc()->lock);
+      return;
+    }
+  }
+  if (get_proc_state(next) != RUNNABLE)
+    panic("non-RUNNABLE next %s %u", next->name, get_proc_state(next));
+  struct proc *prev = myproc();
+  mycpu()->proc = next;
+  mycpu()->prev = prev;
+  switchuvm(next);
+  set_proc_state(next, RUNNING);
+  next->tsc = rdtsc();
+  mtpause(next);
+  if (next->context->rip != (uptr)forkret && 
+      next->context->rip != (uptr)threadstub)
+  {
+    mtresume(next);
+  }
+  mtrec();
+  swtch(&prev->context, next->context);
+  mycpu()->intena = intena;
+  post_swtch();
+}
+void
 addrun(struct proc *p)
 {
  // Always called with p->lock held
@@ -86,7 +156,6 @@ steal(void)
      if (get_proc_state(steal) == RUNNABLE && !steal->cpu_pin &&
          steal->curcycles != 0 && steal->curcycles > VICTIMAGE)
      {
-        //delrun(steal);
        steal->curcycles = 0;
        steal->cpuid = mycpu()->id;
        addrun(steal);
@@ -133,24 +202,6 @@ initsched(void)
  }
 }
-void
-scheddump(void)
-{
-  struct proc *p;
-  int i;
-  for (i = 0; i < NCPU; i++) {
-    struct runq *q = &runq[i];
-    cprintf("%u\n", i);
-    acquire(&q->lock);
-    STAILQ_FOREACH(p, &q->q, runqlink) {
-      cprintf("  %s\n", p->name);
-    }    
-    release(&q->lock);    
-  }
-}
 #if 0
 static int
 migrate(struct proc *p)