d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a new KTR type KTR_CONTENTION, and use it in the mutex code to

Browse Source 
log the start and end of periods during which mtx_lock() is waiting
to acquire a sleep mutex. The log message includes the file and
line of both the waiter and the holder.

Reviewed by:	jhb, jake
This commit is contained in:
Ian Dowse 2002-08-26 18:39:38 +00:00
parent e7f52ff8bb
commit 02bd1bcd2a
3 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/kern/kern_mutex.c
View File

@ -471,6 +471,9 @@ _mtx_lock_sleep(struct mtx *m, int opts, const char *file, int line)
#if defined(SMP) && defined(ADAPTIVE_MUTEXES) #if defined(SMP) && defined(ADAPTIVE_MUTEXES)
struct thread *owner; struct thread *owner;
#endif #endif
#ifdef KTR
int cont_logged = 0;
#endif
if ((m->mtx_lock & MTX_FLAGMASK) == (uintptr_t)td) { if ((m->mtx_lock & MTX_FLAGMASK) == (uintptr_t)td) {
m->mtx_recurse++; m->mtx_recurse++;
@ -588,6 +591,16 @@ _mtx_lock_sleep(struct mtx *m, int opts, const char *file, int line)
else else
TAILQ_INSERT_TAIL(&m->mtx_blocked, td, td_blkq); TAILQ_INSERT_TAIL(&m->mtx_blocked, td, td_blkq);
} }
#ifdef KTR
if (!cont_logged) {
CTR6(KTR_CONTENTION,
"contention: %p at %s:%d wants %s, taken by %s:%d",
td, file, line, m->mtx_object.lo_name,
WITNESS_FILE(&m->mtx_object),
WITNESS_LINE(&m->mtx_object));
cont_logged = 1;
}
#endif
/* /*
* Save who we're blocked on. * Save who we're blocked on.
@ -613,6 +626,13 @@ _mtx_lock_sleep(struct mtx *m, int opts, const char *file, int line)
mtx_unlock_spin(&sched_lock); mtx_unlock_spin(&sched_lock);
} }
#ifdef KTR
if (cont_logged) {
CTR4(KTR_CONTENTION,
"contention end: %s acquired by %p at %s:%d",
m->mtx_object.lo_name, td, file, line);
}
#endif
return; return;
} }

20
sys/kern/subr_turnstile.c
View File

@ -471,6 +471,9 @@ _mtx_lock_sleep(struct mtx *m, int opts, const char *file, int line)
#if defined(SMP) && defined(ADAPTIVE_MUTEXES) #if defined(SMP) && defined(ADAPTIVE_MUTEXES)
struct thread *owner; struct thread *owner;
#endif #endif
#ifdef KTR
int cont_logged = 0;
#endif
if ((m->mtx_lock & MTX_FLAGMASK) == (uintptr_t)td) { if ((m->mtx_lock & MTX_FLAGMASK) == (uintptr_t)td) {
m->mtx_recurse++; m->mtx_recurse++;
@ -588,6 +591,16 @@ _mtx_lock_sleep(struct mtx *m, int opts, const char *file, int line)
else else
TAILQ_INSERT_TAIL(&m->mtx_blocked, td, td_blkq); TAILQ_INSERT_TAIL(&m->mtx_blocked, td, td_blkq);
} }
#ifdef KTR
if (!cont_logged) {
CTR6(KTR_CONTENTION,
"contention: %p at %s:%d wants %s, taken by %s:%d",
td, file, line, m->mtx_object.lo_name,
WITNESS_FILE(&m->mtx_object),
WITNESS_LINE(&m->mtx_object));
cont_logged = 1;
}
#endif
/* /*
* Save who we're blocked on. * Save who we're blocked on.
@ -613,6 +626,13 @@ _mtx_lock_sleep(struct mtx *m, int opts, const char *file, int line)
mtx_unlock_spin(&sched_lock); mtx_unlock_spin(&sched_lock);
} }
#ifdef KTR
if (cont_logged) {
CTR4(KTR_CONTENTION,
"contention end: %s acquired by %p at %s:%d",
m->mtx_object.lo_name, td, file, line);
}
#endif
return; return;
} }

3
sys/sys/ktr.h
View File

@ -71,7 +71,8 @@
#define KTR_VM 0x00100000 /* The virtual memory system */ #define KTR_VM 0x00100000 /* The virtual memory system */
#define KTR_WITNESS 0x00200000 #define KTR_WITNESS 0x00200000
#define KTR_RUNQ 0x00400000 /* Run queue */ #define KTR_RUNQ 0x00400000 /* Run queue */
#define KTR_ALL 0x007fffff #define KTR_CONTENTION 0x00800000 /* Lock contention */
#define KTR_ALL 0x00ffffff
/* /*
* Trace classes which can be assigned to particular use at compile time * Trace classes which can be assigned to particular use at compile time