some condvar cleanup

5c9fbe15 · Frans Kaashoek · 2d239530 · 5c9fbe15 · 5c9fbe15 · 5c9fbe15
--- a/bio.c
+++ b/bio.c
@@ -54,7 +54,7 @@ binit(void)
    b->dev = -1;
    bcache.head.next->prev = b;
    bcache.head.next = b;
-    initlock(&b->cv.lock, "bache");
+    initcondvar(&b->cv, "bache");
  }
 }

--- a/condvar.c
+++ b/condvar.c
@@ -9,6 +9,12 @@
 #include "proc.h"
 void
+initcondvar(struct condvar *cv, char *n)
+{
+  initlock(&cv->lock, n);
+}
+void
 cv_sleep(struct condvar *cv, struct spinlock *lk)
 {
  if(proc == 0)

--- a/condvar.h
+++ b/condvar.h
 struct condvar {
-  char name[MAXNAME];
  struct spinlock lock;
  struct proc *waiters;
-  void *chan;                  // If non-zero, sleeping on chan
 };
--- a/console.c
+++ b/console.c
@@ -282,7 +282,7 @@ consoleinit(void)
 {
  initlock(&cons.lock, "console");
  initlock(&input.lock, "input");
-  initlock(&input.cv.lock, "input");
+  initcondvar(&input.cv, "input");
  devsw[CONSOLE].write = consolewrite;
  devsw[CONSOLE].read = consoleread;

--- a/defs.h
+++ b/defs.h
@@ -15,6 +15,7 @@ void            brelse(struct buf*);
 void            bwrite(struct buf*);
 // condvar.c
+void            initcondvar(struct condvar *, char *);
 void            cv_sleep(struct condvar *cv, struct spinlock*);
 void            cv_wakeup(struct condvar *cv);

--- a/fs.c
+++ b/fs.c
@@ -142,7 +142,7 @@ iinit(void)
  int i;
  initlock(&icache.lock, "icache");
  for (i = 0; i < NINODE; i++) {
-    initlock(&icache.inode[i].cv.lock, "icache");
+    initcondvar(&icache.inode[i].cv, "icache");
  }
 }

--- a/proc.c
+++ b/proc.c
@@ -29,7 +29,7 @@ pinit(void)
    for (i = 0; i < NPROC; i++) {
      initlock(&ptables[c].proc[i].lock, ptables[c].proc[i].name);
-      initlock(&ptables[c].proc[i].cv.lock, ptables[c].proc[i].name); // XXX cv_init
+      initcondvar(&ptables[c].proc[i].cv, ptables[c].proc[i].name); // XXX cv_init
    }
    runqs[c].name[0] = (char) (c + '0');