Page MenuHomeFreeBSD
Files F147503189

D14771.id40499.diff
No OneTemporary
Actions

D14771.id40499.diff
View Options

Index: sys/kern/kern_mutex.c
===================================================================
--- sys/kern/kern_mutex.c
+++ sys/kern/kern_mutex.c
@@ -473,9 +473,6 @@
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;
@@ -619,17 +616,6 @@
*/
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.
*/
@@ -647,13 +633,6 @@
#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;
Index: sys/sys/ktr_class.h
===================================================================
--- sys/sys/ktr_class.h
+++ sys/sys/ktr_class.h
@@ -65,7 +65,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 */

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 12, 11:58 AM (2 h, 1 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29561088
Default Alt Text
D14771.id40499.diff (1 KB)

Event Timeline