From owner-p4-projects Thu Feb 27 12:28:46 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4A04337B405; Thu, 27 Feb 2003 12:28:43 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D41FA37B401 for ; Thu, 27 Feb 2003 12:28:42 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6613843F3F for ; Thu, 27 Feb 2003 12:28:42 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h1RKSg0U047199 for ; Thu, 27 Feb 2003 12:28:42 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h1RKSfWw047196 for perforce@freebsd.org; Thu, 27 Feb 2003 12:28:41 -0800 (PST) Date: Thu, 27 Feb 2003 12:28:41 -0800 (PST) Message-Id: <200302272028.h1RKSfWw047196@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 26027 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=26027 Change 26027 by jhb@jhb_laptop on 2003/02/27 12:28:01 Fold KTR_LOCKMGR into KTR_LOCK for now and have KTR_EVH use that. KTR_WITNESS is probably should be a file-specific one wrapped in WITNESS_DEBUG. Affected files ... .. //depot/projects/smpng/sys/kern/kern_lock.c#20 edit .. //depot/projects/smpng/sys/sys/ktr.h#13 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_lock.c#20 (text+ko) ==== @@ -148,7 +148,7 @@ struct lock *lkp = *lkpp; int s, error; - CTR3(KTR_LOCKMGR, + CTR3(KTR_LOCK, "acquire(): lkp == %p, extflags == 0x%x, wanted == 0x%x\n", lkp, extflags, wanted); @@ -222,7 +222,7 @@ struct thread *thr; int extflags, lockflags; - CTR5(KTR_LOCKMGR, + CTR5(KTR_LOCK, "lockmgr(): lkp == %p (lk_wmesg == \"%s\"), flags == 0x%x, " "interlkp == %p, td == %p", lkp, lkp->lk_wmesg, flags, interlkp, td); @@ -534,7 +534,7 @@ int timo; int flags; { - CTR5(KTR_LOCKMGR, "lockinit(): lkp == %p, prio == %d, wmesg == \"%s\", " + CTR5(KTR_LOCK, "lockinit(): lkp == %p, prio == %d, wmesg == \"%s\", " "timo == %d, flags = 0x%x\n", lkp, prio, wmesg, timo, flags); if (lock_mtx_valid == 0) { @@ -579,7 +579,7 @@ lockdestroy(lkp) struct lock *lkp; { - CTR2(KTR_LOCKMGR, "lockdestroy(): lkp == %p (lk_wmesg == \"%s\")", + CTR2(KTR_LOCK, "lockdestroy(): lkp == %p (lk_wmesg == \"%s\")", lkp, lkp->lk_wmesg); } ==== //depot/projects/smpng/sys/sys/ktr.h#13 (text+ko) ==== @@ -65,15 +65,14 @@ #define KTR_INIT 0x00004000 /* System initialization */ #define KTR_KGDB 0x00008000 /* Trace kgdb internals */ #define KTR_IO 0x00010000 /* Upper I/O */ -#define KTR_LOCKMGR 0x00020000 +#define KTR_EVH 0x00020000 /* Eventhandler */ #define KTR_NFS 0x00040000 /* The obvious */ #define KTR_VOP 0x00080000 /* The obvious */ #define KTR_VM 0x00100000 /* The virtual memory system */ #define KTR_WITNESS 0x00200000 #define KTR_RUNQ 0x00400000 /* Run queue */ #define KTR_CONTENTION 0x00800000 /* Lock contention */ -#define KTR_EVH 0x01000000 /* Eventhandler */ -#define KTR_ALL 0x01ffffff +#define KTR_ALL 0x00ffffff /* * Trace classes which can be assigned to particular use at compile time To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message