remove contabs and contab

38f41095 · Frans Kaashoek · 46a37cb9 · 38f41095 · 38f41095 · 38f41095
--- a/proc.c
+++ b/proc.c
@@ -9,7 +9,6 @@
 struct ptable ptables[NCPU];
 struct runq runqs[NCPU];
-struct condtab condtabs[NCPU];
 static struct proc *initproc;
 int nextpid = 1;
@@ -37,14 +36,6 @@ pinit(void)
    runqs[c].name[0] = (char) (c + '0');
    safestrcpy(runqs[c].name+1, "runq", MAXNAME-1);
    initlock(&runqs[c].lock, runqs[c].name);
-    condtabs[c].name[0] = (char) (c + '0');
-    safestrcpy(condtabs[c].name+1, "condtab", MAXNAME-1);
-    initlock(&condtabs[c].lock, condtabs[c].name);
-    for (i = 0; i < NPROC; i++) {
-      initlock(&condtabs[c].condtab[i].lock, condtabs[c].condtab[i].name);
-    }
  }
 }

--- a/proc.h
+++ b/proc.h
@@ -73,7 +73,6 @@ struct cpu {
  struct ptable *ptable;       // The per-core proc table
  struct kmem *kmem;           // The per-core proc table
  struct runq *runq;           // The per-core proc table
-  struct condtab *contab;           // The per-core proc table
 };
@@ -115,4 +114,3 @@ extern struct proc *proc asm("%gs:4");     // cpus[cpunum()].proc
 extern struct ptable *ptable asm("%gs:8"); // &ptables[cpunum()]
 extern struct kmem *kmem asm("%gs:12"); // &kmems[cpunum()]
 extern struct runq *runq asm("%gs:16"); // &runqs[cpunum()]
-extern struct condtab *condtab asm("%gs:20"); // &condtabs[cpunum()]
--- a/vm.c
+++ b/vm.c
@@ -50,7 +50,6 @@ seginit(void)
  ptable = &ptables[cpunum()];
  kmem = &kmems[cpunum()];
  runq = &runqs[cpunum()];
-  condtab = &condtabs[cpunum()];
 }
 // Return the address of the PTE in page table pgdir