PERFORCE change 117026 for review

[Kip Macy]

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

Change 117026 by kmacy at 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 */