diff options
| author | jhb <jhb@FreeBSD.org> | 2000-09-13 00:41:34 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2000-09-13 00:41:34 +0000 |
| commit | e396c60f6864bbc71b96f3a4f07ea13214a2370a (patch) | |
| tree | 1bd4c244c6fcb91353a07d0005d758edbaf20fe9 | |
| parent | 5adf2c39802a7c30537009e761a1db03b94bb737 (diff) | |
| download | FreeBSD-src-e396c60f6864bbc71b96f3a4f07ea13214a2370a.zip FreeBSD-src-e396c60f6864bbc71b96f3a4f07ea13214a2370a.tar.gz | |
Take out some unneeded debugging code and re-enable panic()'ing if we spin
on a spin lock for more then 5 seconds.
| -rw-r--r-- | sys/i386/i386/synch_machdep.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/sys/i386/i386/synch_machdep.c b/sys/i386/i386/synch_machdep.c index 496f712..12c7e14 100644 --- a/sys/i386/i386/synch_machdep.c +++ b/sys/i386/i386/synch_machdep.c @@ -121,12 +121,8 @@ propagate_priority(struct proc *p) * If on run queue move to new run queue, and * quit. */ -#if 1 if (p->p_stat == SRUN) { -#else - if ((m = p->p_blocked) == NULL) { -#endif - MPASS(p->p_stat == SRUN); + MPASS(p->p_blocked == NULL); remrunqueue(p); SET_PRIO(p, pri); setrunqueue(p); @@ -316,17 +312,13 @@ mtx_enter_hard(mtx_t *m, int type, int flags) if (i++ < 6000000) DELAY (1); #ifdef DDB - else if (!db_active) { + else if (!db_active) #else - else { -#endif -#if 0 - Debugger ("spinning"); - panic("spin lock %s held by 0x%x for > 5 seconds", - m->mtx_description, - m->mtx_lock); + else #endif - } + panic( + "spin lock %s held by 0x%x for > 5 seconds", + m->mtx_description, m->mtx_lock); } } |
