From 2da30ef0cef2592c2b91f6c174fddc3c2e49af7c Mon Sep 17 00:00:00 2001 From: sbruno Date: Fri, 13 Feb 2015 18:45:44 +0000 Subject: Revert r278650. Definite layer 8 bug. Submitted by: dhw and Thomas Mueller --- sys/kern/kern_mutex.c | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'sys/kern/kern_mutex.c') diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c index 2d9a48d5..e61a187 100644 --- a/sys/kern/kern_mutex.c +++ b/sys/kern/kern_mutex.c @@ -436,10 +436,6 @@ __mtx_lock_sleep(volatile uintptr_t *c, uintptr_t tid, int opts, CTR3(KTR_LOCK, "%s: spinning on %p held by %p", __func__, m, owner); - KTR_STATE1(KTR_SCHED, "thread", - sched_tdname((struct thread *)tid), - "spinning", "lockname:\"%s\"", - m->lock_object.lo_name); while (mtx_owner(m) == owner && TD_IS_RUNNING(owner)) { cpu_spinwait(); @@ -447,9 +443,6 @@ __mtx_lock_sleep(volatile uintptr_t *c, uintptr_t tid, int opts, spin_cnt++; #endif } - KTR_STATE0(KTR_SCHED, "thread", - sched_tdname((struct thread *)tid), - "running"); continue; } } @@ -586,8 +579,6 @@ _mtx_lock_spin_cookie(volatile uintptr_t *c, uintptr_t tid, int opts, if (LOCK_LOG_TEST(&m->lock_object, opts)) CTR1(KTR_LOCK, "_mtx_lock_spin: %p spinning", m); - KTR_STATE1(KTR_SCHED, "thread", sched_tdname((struct thread *)tid), - "spinning", "lockname:\"%s\"", m->lock_object.lo_name); #ifdef HWPMC_HOOKS PMC_SOFT_CALL( , , lock, failed); @@ -613,8 +604,6 @@ _mtx_lock_spin_cookie(volatile uintptr_t *c, uintptr_t tid, int opts, if (LOCK_LOG_TEST(&m->lock_object, opts)) CTR1(KTR_LOCK, "_mtx_lock_spin: %p spin done", m); - KTR_STATE0(KTR_SCHED, "thread", sched_tdname((struct thread *)tid), - "running"); LOCKSTAT_PROFILE_OBTAIN_LOCK_SUCCESS(LS_MTX_SPIN_LOCK_ACQUIRE, m, contested, waittime, (file), (line)); -- cgit v1.1