From owner-p4-projects  Fri Mar  7  8: 4:44 2003
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CA2DE37B405; Fri,  7 Mar 2003 08:04:41 -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 62A8B37B401
	for <perforce@freebsd.org>; Fri,  7 Mar 2003 08:04:41 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0EDA843F75
	for <perforce@freebsd.org>; Fri,  7 Mar 2003 08:04:41 -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 h27G4e0U054184
	for <perforce@freebsd.org>; Fri, 7 Mar 2003 08:04:40 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h27G4e7F054181
	for perforce@freebsd.org; Fri, 7 Mar 2003 08:04:40 -0800 (PST)
Date: Fri, 7 Mar 2003 08:04:40 -0800 (PST)
Message-Id: <200303071604.h27G4e7F054181@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 26495 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://perforce.freebsd.org/chv.cgi?CH=26495

Change 26495 by jhb@jhb_laptop on 2003/03/07 08:03:51

	Attempt to trim the output of 'show witness' by not displaying
	the children of a given witness more than once.

Affected files ...

.. //depot/projects/smpng/sys/kern/subr_witness.c#85 edit

Differences ...

==== //depot/projects/smpng/sys/kern/subr_witness.c#85 (text+ko) ====

@@ -129,6 +129,7 @@
 	u_char	w_Giant_squawked:1;
 	u_char	w_other_squawked:1;
 	u_char	w_same_squawked:1;
+	u_char	w_displayed:1;
 };
 
 struct witness_child_list_entry {
@@ -521,6 +522,11 @@
 	KASSERT(!witness_cold, ("%s: witness_cold", __func__));
 	witness_levelall();
 
+	/* Clear all the displayed flags. */
+	STAILQ_FOREACH(w, &w_all, w_list) {
+		w->w_displayed = 0;
+	}
+
 	/*
 	 * First, handle sleep locks which have been acquired at least
 	 * once.
@@ -1396,13 +1402,21 @@
 	prnt("%-2d", level);
 	for (i = 0; i < level; i++)
 		prnt(" ");
+	if (parent->w_refcount > 0)
+		prnt("%s", parent->w_name);
+	else
+		prnt("(dead)");
+	if (parent->w_displayed) {
+		prnt(" -- (already displayed)\n");
+		return;
+	}
+	parent->w_displayed = 1;
 	if (parent->w_refcount > 0) {
-		prnt("%s", parent->w_name);
 		if (parent->w_file != NULL)
-			prnt(" -- last acquired @ %s:%d\n", parent->w_file,
+			prnt(" -- last acquired @ %s:%d", parent->w_file,
 			    parent->w_line);
-	} else
-		prnt("(dead)\n");
+	}
+	prnt("\n");
 	for (wcl = parent->w_children; wcl != NULL; wcl = wcl->wcl_next)
 		for (i = 0; i < wcl->wcl_count; i++)
 			    witness_displaydescendants(prnt,

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message