svn commit: r196204 - head/sys/sys

[Konstantin Belousov]

Author: kib
Date: Fri Aug 14 10:57:57 2009
New Revision: 196204
URL: http://svn.freebsd.org/changeset/base/196204

Log:
  Add the address of the lock to the KTR_LOCK trace.
  
  Tested by:	pho
  Approved by:	re (rwatson)

Modified:
  head/sys/sys/lock.h

Modified: head/sys/sys/lock.h
==============================================================================
--- head/sys/sys/lock.h	Fri Aug 14 10:57:28 2009	(r196203)
+++ head/sys/sys/lock.h	Fri Aug 14 10:57:57 2009	(r196204)
@@ -155,16 +155,16 @@ struct lock_class {
 
 #define	LOCK_LOG_LOCK(opname, lo, flags, recurse, file, line) do {	\
 	if (LOCK_LOG_TEST((lo), (flags)))				\
-		CTR5(KTR_LOCK, opname " (%s) %s r = %d at %s:%d",	\
+		CTR6(KTR_LOCK, opname " (%s) %s %p r = %d at %s:%d",	\
 		    LOCK_CLASS(lo)->lc_name, (lo)->lo_name,		\
-		    (u_int)(recurse), (file), (line));			\
+		    (lo), (u_int)(recurse), (file), (line));		\
 } while (0)
 
 #define	LOCK_LOG_TRY(opname, lo, flags, result, file, line) do {	\
 	if (LOCK_LOG_TEST((lo), (flags)))				\
-		CTR5(KTR_LOCK, "TRY_" opname " (%s) %s result=%d at %s:%d",\
+		CTR6(KTR_LOCK, "TRY_" opname " (%s) %s %p result=%d at %s:%d",\
 		    LOCK_CLASS(lo)->lc_name, (lo)->lo_name,		\
-		    (u_int)(result), (file), (line));			\
+		    (lo), (u_int)(result), (file), (line));		\
 } while (0)
 
 #define	LOCK_LOG_INIT(lo, flags) do {					\