From owner-p4-projects@FreeBSD.ORG  Sat Mar 31 21:04:22 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CFB8516A407; Sat, 31 Mar 2007 21:04:21 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id AC83316A406
	for <perforce@freebsd.org>; Sat, 31 Mar 2007 21:04:21 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 9E2D413C4C2
	for <perforce@freebsd.org>; Sat, 31 Mar 2007 21:04:21 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2VL4Lce080647
	for <perforce@freebsd.org>; Sat, 31 Mar 2007 21:04:21 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2VL4LkL080644
	for perforce@freebsd.org; Sat, 31 Mar 2007 21:04:21 GMT
	(envelope-from kmacy@freebsd.org)
Date: Sat, 31 Mar 2007 21:04:21 GMT
Message-Id: <200703312104.l2VL4LkL080644@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 117026 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 31 Mar 2007 21:04:22 -0000

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

Change 117026 by kmacy@kmacy_vt-x:opentoe_init on 2007/03/31 21:03:29

	remove LO_CONTESTED flag

Affected files ...

.. //depot/projects/opentoe/sys/kern/subr_lock.c#3 edit
.. //depot/projects/opentoe/sys/sys/lock.h#3 edit
.. //depot/projects/opentoe/sys/sys/lock_profile.h#3 edit

Differences ...

==== //depot/projects/opentoe/sys/kern/subr_lock.c#3 (text+ko) ====

@@ -258,10 +258,8 @@
         if (l->lpo_acqtime == 0) {
 		lo->lo_profile_obj.lpo_contest_holding = 0;
 
-		if (contested) {
-			lo->lo_flags |= LO_CONTESTED;
+		if (contested) 
 			lo->lo_profile_obj.lpo_contest_locking++;
-		}
 		
                 l->lpo_filename = file;
                 l->lpo_lineno = line;

==== //depot/projects/opentoe/sys/sys/lock.h#3 (text+ko) ====

@@ -79,7 +79,6 @@
 #define	LO_ENROLLPEND	0x00800000	/* On the pending enroll list. */
 #define	LO_CLASSMASK	0x0f000000	/* Class index bitmask. */
 #define LO_NOPROFILE    0x10000000      /* Don't profile this lock */
-#define LO_CONTESTED    0x20000000      /* Lock was contested */
 
 /*
  * Lock classes are statically assigned an index into the gobal lock_classes

==== //depot/projects/opentoe/sys/sys/lock_profile.h#3 (text+ko) ====

@@ -142,10 +142,8 @@
 {
 	struct lock_profile_object *l = &lo->lo_profile_obj;
 
-	if (l->lpo_acqtime) {
-		lo->lo_flags &= ~LO_CONTESTED;
+	if (l->lpo_acqtime) 
 		_lock_profile_release_lock(lo);
-	}
 }
 
 #else /* !LOCK_PROFILING */