use TLS mycpu() instead of the more expensive LAPIC-based cpunum()

be61fd64 · Nickolai Zeldovich · b979d25a · be61fd64 · be61fd64 · be61fd64
--- a/kernel/sampler.cc
+++ b/kernel/sampler.cc
@@ -83,7 +83,7 @@ sampstart(void)
 {
  pushcli();
  for(struct cpu *c = cpus; c < cpus+ncpu; c++) {
-    if(c == cpus+cpunum())
+    if(c == cpus+mycpu()->id)
      continue;
    lapic_sampconf(c->id);
  }
@@ -95,7 +95,7 @@ static int
 samplog(struct trapframe *tf)
 {
  struct pmulog *l;
-  l = &pmulog[cpunum()];
+  l = &pmulog[mycpu()->id];
  if (l->count == l->capacity)
    return 0;

--- a/kernel/sched.cc
+++ b/kernel/sched.cc
@@ -60,7 +60,7 @@ steal(void)
  pushcli();
  for (i = 1; i < ncpu; i++) {
-    struct runq *q = &runq[(i+cpunum()) % ncpu];
+    struct runq *q = &runq[(i+mycpu()->id) % ncpu];
    struct proc *p;
    // XXX(sbw) Look for a process to steal.  Acquiring q->lock
@@ -109,7 +109,7 @@ schednext(void)
  struct proc *p = NULL;
  pushcli();
-  q = &runq[cpunum()];
+  q = &runq[mycpu()->id];
  acquire(&q->lock);
  p = STAILQ_LAST(&q->q, proc, runqlink);
  if (p) {

--- a/kernel/spinlock.cc
+++ b/kernel/spinlock.cc
@@ -17,7 +17,7 @@ static int lockstat_enable;
 static inline struct cpulockstat *
 mylockstat(struct spinlock *lk)
 {
-  return &lk->stat->s.cpu[cpunum()];
+  return &lk->stat->s.cpu[mycpu()->id];
 }
 void*

--- a/kernel/wq.cc
+++ b/kernel/wq.cc
@@ -31,7 +31,7 @@ static inline struct wqueue *
 getwq(void)
 {
  pushcli();
-  return &queue[cpunum()];
+  return &queue[mycpu()->id];
 }
 static inline void
@@ -43,7 +43,7 @@ putwq(struct wqueue *wq)
 static inline struct wqstat *
 wq_stat(void)
 {
-  return &stat[cpunum()];
+  return &stat[mycpu()->id];
 }
 struct work *