Author: markj
Date: Thu Apr 5 15:52:20 2018
New Revision: 332078
URL: https://svnweb.freebsd.org/changeset/base/332078
Log:
MFC r331245:
Drop KTR_CONTENTION.
Modified:
stable/11/sys/kern/kern_mutex.c
stable/11/sys/sys/ktr_class.h
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/kern/kern_mutex.c
==============================================================================
--- stable/11/sys/kern/kern_mutex.c Thu Apr 5 15:45:54 2018
(r332077)
+++ stable/11/sys/kern/kern_mutex.c Thu Apr 5 15:52:20 2018
(r332078)
@@ -471,9 +471,6 @@ __mtx_lock_sleep(volatile uintptr_t *c, uintptr_t v)
struct turnstile *ts;
uintptr_t tid;
struct thread *owner;
-#ifdef KTR
- int cont_logged = 0;
-#endif
#ifdef LOCK_PROFILING
int contested = 0;
uint64_t waittime = 0;
@@ -617,17 +614,6 @@ retry_turnstile:
*/
mtx_assert(m, MA_NOTOWNED);
-#ifdef KTR
- if (!cont_logged) {
- CTR6(KTR_CONTENTION,
- "contention: %p at %s:%d wants %s, taken by %s:%d",
- (void *)tid, file, line, m->lock_object.lo_name,
- WITNESS_FILE(&m->lock_object),
- WITNESS_LINE(&m->lock_object));
- cont_logged = 1;
- }
-#endif
-
/*
* Block on the turnstile.
*/
@@ -645,13 +631,6 @@ retry_turnstile:
#endif
v = MTX_READ_VALUE(m);
}
-#ifdef KTR
- if (cont_logged) {
- CTR4(KTR_CONTENTION,
- "contention end: %s acquired by %p at %s:%d",
- m->lock_object.lo_name, (void *)tid, file, line);
- }
-#endif
#if defined(KDTRACE_HOOKS) || defined(LOCK_PROFILING)
if (__predict_true(!doing_lockprof))
return;
Modified: stable/11/sys/sys/ktr_class.h
==============================================================================
--- stable/11/sys/sys/ktr_class.h Thu Apr 5 15:45:54 2018
(r332077)
+++ stable/11/sys/sys/ktr_class.h Thu Apr 5 15:52:20 2018
(r332078)
@@ -63,7 +63,7 @@
#define KTR_VM 0x00100000 /* The virtual memory
system */
#define KTR_INET 0x00200000 /* IPv4 stack */
#define KTR_RUNQ 0x00400000 /* Run queue */
-#define KTR_CONTENTION 0x00800000 /* Lock contention */
+#define KTR_SPARE5 0x00800000
#define KTR_UMA 0x01000000 /* UMA slab allocator */
#define KTR_CALLOUT 0x02000000 /* Callouts and
timeouts */
#define KTR_GEOM 0x04000000 /* GEOM I/O events */
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
