From owner-p4-projects  Tue Mar 11 12:25: 9 2003
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D67A137B404; Tue, 11 Mar 2003 12:25:06 -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 8754E37B401
	for <perforce@freebsd.org>; Tue, 11 Mar 2003 12:25:06 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 32A0643FE1
	for <perforce@freebsd.org>; Tue, 11 Mar 2003 12:25:06 -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 h2BKP60U074490
	for <perforce@freebsd.org>; Tue, 11 Mar 2003 12:25:06 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2BKP5Cd074487
	for perforce@freebsd.org; Tue, 11 Mar 2003 12:25:05 -0800 (PST)
Date: Tue, 11 Mar 2003 12:25:05 -0800 (PST)
Message-Id: <200303112025.h2BKP5Cd074487@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 26714 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=26714

Change 26714 by jhb@jhb_laptop on 2003/03/11 12:25:05

	Axe the older and slower algo in witness_display_list() along with
	it's extra sanity check.

Affected files ...

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

Differences ...

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

@@ -492,30 +492,11 @@
 witness_display_list(void(*prnt)(const char *fmt, ...),
 		     struct witness_list *list)
 {
-#if 1
 	struct witness *w;
-#else
-	struct witness *w, *w1;
-	int found;
-#endif
 
 	STAILQ_FOREACH(w, list, w_typelist) {
-		if (w->w_file == NULL)
+		if (w->w_file == NULL || w->w_level > 0)
 			continue;
-#if 1
-		if (w->w_level > 0)
-			continue;
-#else
-		found = 0;
-		STAILQ_FOREACH(w1, list, w_typelist) {
-			if (isitmychild(w1, w)) {
-				found++;
-				break;
-			}
-		}
-		if (found)
-			continue;
-#endif
 		/*
 		 * This lock has no anscestors, display its descendants. 
 		 */
@@ -557,19 +538,7 @@
 		if (w->w_file != NULL || w->w_refcount == 0)
 			continue;
 		prnt("%s\n", w->w_name);
-#if 1
-		w->w_displayed = 1;
-#endif
-	}
-
-#if 1
-	/* Extra check from Sanity Clause. */
-	prnt("\nLocks which weren't displayed:\n");
-	STAILQ_FOREACH(w, &w_all, w_list) {
-		if (w->w_displayed == 0)
-			witness_displaydescendants(prnt, w, 0);
 	}
-#endif
 }
 #endif /* DDB */
 

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