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

Provide more information on failing checks in mutex_assert_is_owned()

Browse Source 
and mutex_assert_not_owned().  snprintf() use in this context should
be safe.

Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Konstantin Belousov 2016-03-21 06:48:11 +00:00
parent b6751c3f87
commit 07f22a288d
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/libthr/thread/thr_mutex.c
View File

@ -124,8 +124,14 @@ mutex_assert_is_owned(struct pthread_mutex *m)
{
#if defined(_PTHREADS_INVARIANTS)
if (__predict_false(m->m_qe.tqe_prev == NULL))
PANIC("mutex is not on list");
if (__predict_false(m->m_qe.tqe_prev == NULL)) {
char msg[128];
snprintf(msg, sizeof(msg),
"mutex %p own %#x %#x is not on list %p %p",
m, m->m_lock.m_owner, m->m_owner, m->m_qe.tqe_prev,
m->m_qe.tqe_next);
PANIC(msg);
}
#endif
}
@ -135,8 +141,14 @@ mutex_assert_not_owned(struct pthread_mutex *m)
#if defined(_PTHREADS_INVARIANTS)
if (__predict_false(m->m_qe.tqe_prev != NULL ||
m->m_qe.tqe_next != NULL))
PANIC("mutex is on list");
m->m_qe.tqe_next != NULL)) {
char msg[128];
snprintf(msg, sizeof(msg),
"mutex %p own %#x %#x is on list %p %p",
m, m->m_lock.m_owner, m->m_owner, m->m_qe.tqe_prev,
m->m_qe.tqe_next);
PANIC(msg);
}
#endif
}