Rename the debugging mutex "callout_no_sleep" to "dont_sleep_in_callout".

This commit is contained in:
Poul-Henning Kamp 2003-11-15 18:33:54 +00:00
parent f7d7038aa4
commit d87526cf43

View File

@ -71,7 +71,7 @@ struct callout_tailq *callwheel;
int softticks; /* Like ticks, but for softclock(). */ int softticks; /* Like ticks, but for softclock(). */
struct mtx callout_lock; struct mtx callout_lock;
#ifdef DIAGNOSTIC #ifdef DIAGNOSTIC
struct mtx callout_dont_sleep; struct mtx dont_sleep_in_callout;
#endif #endif
static struct callout *nextsoftcheck; /* Next callout to be checked. */ static struct callout *nextsoftcheck; /* Next callout to be checked. */
@ -124,7 +124,7 @@ kern_timeout_callwheel_init(void)
} }
mtx_init(&callout_lock, "callout", NULL, MTX_SPIN | MTX_RECURSE); mtx_init(&callout_lock, "callout", NULL, MTX_SPIN | MTX_RECURSE);
#ifdef DIAGNOSTIC #ifdef DIAGNOSTIC
mtx_init(&callout_dont_sleep, "callout_dont_sleep", NULL, MTX_DEF); mtx_init(&dont_sleep_in_callout, "dont_sleep_in_callout", NULL, MTX_DEF);
#endif #endif
} }
@ -220,11 +220,11 @@ softclock(void *dummy)
} }
#ifdef DIAGNOSTIC #ifdef DIAGNOSTIC
binuptime(&bt1); binuptime(&bt1);
mtx_lock(&callout_dont_sleep); mtx_lock(&dont_sleep_in_callout);
#endif #endif
c_func(c_arg); c_func(c_arg);
#ifdef DIAGNOSTIC #ifdef DIAGNOSTIC
mtx_unlock(&callout_dont_sleep); mtx_unlock(&dont_sleep_in_callout);
binuptime(&bt2); binuptime(&bt2);
bintime_sub(&bt2, &bt1); bintime_sub(&bt2, &bt1);
if (bt2.frac > maxdt) { if (bt2.frac > maxdt) {