diff options
author | rsc <rsc> | 2006-07-17 05:00:25 +0000 |
---|---|---|
committer | rsc <rsc> | 2006-07-17 05:00:25 +0000 |
commit | 0dd4253747eef56d0f1539fac7d62234f6af5f51 (patch) | |
tree | 1c28a6d0ce4cef90f85fd5f8b0106d431bfeffda /proc.c | |
parent | b5f17007f41770fee97fa850635976ceb7aa7492 (diff) | |
download | xv6-labs-0dd4253747eef56d0f1539fac7d62234f6af5f51.tar.gz xv6-labs-0dd4253747eef56d0f1539fac7d62234f6af5f51.tar.bz2 xv6-labs-0dd4253747eef56d0f1539fac7d62234f6af5f51.zip |
add ide_lock for sleep
Diffstat (limited to 'proc.c')
-rw-r--r-- | proc.c | 12 |
1 files changed, 12 insertions, 0 deletions
@@ -176,6 +176,15 @@ scheduler(void) if(p->state == RUNNING) panic("swtch to scheduler with state=RUNNING"); + if(!holding(&proc_table_lock)){ + cprintf("back to scheduler without proc_table_lock (pid=%d state=%d)", p->pid, p->state); + panic("scheduler lock"); + } + if(cpus[cpu()].nlock != 1){ + cprintf("holding %d locks in scheduler (pid=%d state=%d)\n", cpus[cpu()].nlock, p->pid, p->state); + panic("scheduler lock"); + } + // XXX if not holding proc_table_lock panic. } release(&proc_table_lock); @@ -236,6 +245,9 @@ sleep(void *chan, struct spinlock *lk) if(p == 0) panic("sleep"); + if(lk == 0) + panic("sleep without lk"); + // Must acquire proc_table_lock in order to // change p->state and then call sched. // Once we hold proc_table_lock, we can be |