xnu-792.12.6.tar.gz

[apple/xnu.git] / osfmk / i386 / locks.h

diff --git a/osfmk/i386/locks.h b/osfmk/i386/locks.h
index c262da07c80a8f59d5952eadcb69d5f74d4f8b34..6df093a6afc8ca607ffb5a1fbee73c47ac9e9da8 100644 (file)
--- a/osfmk/i386/locks.h
+++ b/osfmk/i386/locks.h
@@ -1,23 +1,31 @@
 /*
  * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
+ * This file contains Original Code and/or Modifications of Original Code 
+ * as defined in and that are subject to the Apple Public Source License 
+ * Version 2.0 (the 'License'). You may not use this file except in 
+ * compliance with the License.  The rights granted to you under the 
+ * License may not be used to create, or enable the creation or 
+ * redistribution of, unlawful or unlicensed copies of an Apple operating 
+ * system, or to circumvent, violate, or enable the circumvention or 
+ * violation of, any terms of an Apple operating system software license 
+ * agreement.
+ *
+ * Please obtain a copy of the License at 
+ * http://www.opensource.apple.com/apsl/ and read it before using this 
+ * file.
+ *
+ * The Original Code and all software distributed under the License are 
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER 
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, 
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
+ * Please see the License for the specific language governing rights and 
+ * limitations under the License.
+ *
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
  */
 
 #ifndef        _I386_LOCKS_H_
@@ -82,12 +90,6 @@ typedef struct _lck_mtx_ {
 #define        LCK_MTX_TAG_INDIRECT                    0x00001007      /* lock marked as Indirect  */
 #define        LCK_MTX_TAG_DESTROYED                   0x00002007      /* lock marked as Destroyed */
 
-/* Adaptive spin before blocking */
-extern unsigned int    MutexSpin;
-extern void            lck_mtx_lock_spin(lck_mtx_t *lck);
-
-extern void            lck_mtx_interlock_spin(lck_mtx_t *lck);
-
 typedef struct {
        unsigned int            type;
        vm_offset_t             pc;
@@ -109,9 +111,9 @@ typedef struct _lck_mtx_ext_ {
 } lck_mtx_ext_t;
 
 #define        LCK_MTX_ATTR_DEBUG      0x1
-#define        LCK_MTX_ATTR_DEBUGb     0
+#define        LCK_MTX_ATTR_DEBUGb     31
 #define        LCK_MTX_ATTR_STAT       0x2
-#define        LCK_MTX_ATTR_STATb      1
+#define        LCK_MTX_ATTR_STATb      30
 
 #else
 #ifdef KERNEL_PRIVATE
@@ -129,24 +131,12 @@ typedef struct {
        volatile unsigned int
                                                read_count:16,  /* No. of accepted readers */
                                                want_upgrade:1, /* Read-to-write upgrade waiting */
-                       want_write:1,   /* Writer waiting or locked for write */
+                                               want_write:1,   /* Writer is waiting, or locked for write */
                                                waiting:1,              /* Someone is sleeping on lock */
-                       can_sleep:1,    /* Can attempts to lock go to sleep? */
-                       read_priority:1;/* New read takes piority over write */
+                                               can_sleep:1;    /* Can attempts to lock go to sleep? */
        unsigned int            lck_rw_tag;
 } lck_rw_t;
 
-#define        LCK_RW_ATTR_DEBUG       0x1
-#define        LCK_RW_ATTR_DEBUGb      0
-#define        LCK_RW_ATTR_STAT        0x2
-#define        LCK_RW_ATTR_STATb       1
-#define LCK_RW_ATTR_READ_PRI   0x3
-#define LCK_RW_ATTR_READ_PRIb  2
-#define        LCK_RW_ATTR_DIS_THREAD  0x40000000
-#define        LCK_RW_ATTR_DIS_THREADb 30
-#define        LCK_RW_ATTR_DIS_MYLOCK  0x10000000
-#define        LCK_RW_ATTR_DIS_MYLOCKb 28
-
 #define        LCK_RW_TAG_DESTROYED            0x00002007      /* lock marked as Destroyed */
 
 #else