From owner-svn-src-all@freebsd.org  Mon Mar 21 06:48:12 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 660F9AD7840;
 Mon, 21 Mar 2016 06:48:12 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2998065A;
 Mon, 21 Mar 2016 06:48:12 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2L6mBgV056010;
 Mon, 21 Mar 2016 06:48:11 GMT (envelope-from kib@FreeBSD.org)
Received: (from kib@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2L6mBf4056009;
 Mon, 21 Mar 2016 06:48:11 GMT (envelope-from kib@FreeBSD.org)
Message-Id: <201603210648.u2L6mBf4056009@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org
 using -f
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Mon, 21 Mar 2016 06:48:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r297140 - head/lib/libthr/thread
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Mar 2016 06:48:12 -0000

Author: kib
Date: Mon Mar 21 06:48:11 2016
New Revision: 297140
URL: https://svnweb.freebsd.org/changeset/base/297140

Log:
  Provide more information on failing checks in mutex_assert_is_owned()
  and mutex_assert_not_owned().  snprintf() use in this context should
  be safe.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/lib/libthr/thread/thr_mutex.c

Modified: head/lib/libthr/thread/thr_mutex.c
==============================================================================
--- head/lib/libthr/thread/thr_mutex.c	Mon Mar 21 06:46:16 2016	(r297139)
+++ head/lib/libthr/thread/thr_mutex.c	Mon Mar 21 06:48:11 2016	(r297140)
@@ -124,8 +124,14 @@ mutex_assert_is_owned(struct pthread_mut
 {
 
 #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_mu
 
 #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
 }