diff options
| author | sbruno <sbruno@FreeBSD.org> | 2015-02-13 18:45:44 +0000 |
|---|---|---|
| committer | sbruno <sbruno@FreeBSD.org> | 2015-02-13 18:45:44 +0000 |
| commit | 2da30ef0cef2592c2b91f6c174fddc3c2e49af7c (patch) | |
| tree | 8a9010f6f04370ad1275fcf6b83c881f0af3478f /sys/kern/kern_sx.c | |
| parent | be0b7de958ae7ab9d5d2f2bc5c1143cb54c200c7 (diff) | |
| download | FreeBSD-src-2da30ef0cef2592c2b91f6c174fddc3c2e49af7c.zip FreeBSD-src-2da30ef0cef2592c2b91f6c174fddc3c2e49af7c.tar.gz | |
Revert r278650. Definite layer 8 bug.
Submitted by: dhw and Thomas Mueller <tmueller@sysgo.com>
Diffstat (limited to 'sys/kern/kern_sx.c')
| -rw-r--r-- | sys/kern/kern_sx.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/sys/kern/kern_sx.c b/sys/kern/kern_sx.c index e588450..a1fc36a 100644 --- a/sys/kern/kern_sx.c +++ b/sys/kern/kern_sx.c @@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$"); #include <sys/lock.h> #include <sys/mutex.h> #include <sys/proc.h> -#include <sys/sched.h> #include <sys/sleepqueue.h> #include <sys/sx.h> #include <sys/sysctl.h> @@ -561,10 +560,6 @@ _sx_xlock_hard(struct sx *sx, uintptr_t tid, int opts, const char *file, CTR3(KTR_LOCK, "%s: spinning on %p held by %p", __func__, sx, owner); - KTR_STATE1(KTR_SCHED, "thread", - sched_tdname(curthread), "spinning", - "lockname:\"%s\"", - sx->lock_object.lo_name); GIANT_SAVE(); while (SX_OWNER(sx->sx_lock) == x && TD_IS_RUNNING(owner)) { @@ -573,14 +568,9 @@ _sx_xlock_hard(struct sx *sx, uintptr_t tid, int opts, const char *file, spin_cnt++; #endif } - KTR_STATE0(KTR_SCHED, "thread", - sched_tdname(curthread), "running"); continue; } } else if (SX_SHARERS(x) && spintries < asx_retries) { - KTR_STATE1(KTR_SCHED, "thread", - sched_tdname(curthread), "spinning", - "lockname:\"%s\"", sx->lock_object.lo_name); GIANT_SAVE(); spintries++; for (i = 0; i < asx_loops; i++) { @@ -597,8 +587,6 @@ _sx_xlock_hard(struct sx *sx, uintptr_t tid, int opts, const char *file, spin_cnt++; #endif } - KTR_STATE0(KTR_SCHED, "thread", - sched_tdname(curthread), "running"); if (i != asx_loops) continue; } @@ -861,9 +849,6 @@ _sx_slock_hard(struct sx *sx, int opts, const char *file, int line) CTR3(KTR_LOCK, "%s: spinning on %p held by %p", __func__, sx, owner); - KTR_STATE1(KTR_SCHED, "thread", - sched_tdname(curthread), "spinning", - "lockname:\"%s\"", sx->lock_object.lo_name); GIANT_SAVE(); while (SX_OWNER(sx->sx_lock) == x && TD_IS_RUNNING(owner)) { @@ -872,8 +857,6 @@ _sx_slock_hard(struct sx *sx, int opts, const char *file, int line) #endif cpu_spinwait(); } - KTR_STATE0(KTR_SCHED, "thread", - sched_tdname(curthread), "running"); continue; } } |
