xnu-1228.7.58.tar.gz

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

diff --git a/osfmk/i386/locks.h b/osfmk/i386/locks.h
index 3129d79bd0942f67334e7110fe0563baa81f6b6f..0ad756ed2a14cf9669eacd9f39b1f565373452eb 100644 (file)
--- a/osfmk/i386/locks.h
+++ b/osfmk/i386/locks.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2004-2007 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -71,7 +71,7 @@ typedef struct _lck_mtx_ {
                } lck_mtxd;
                struct {
                        unsigned int                    lck_mtxi_tag;
-                       struct _lck_mtx_ext_    *lck_mtxi_ptr;
+                       struct _lck_mtx_ext_            *lck_mtxi_ptr;
                        unsigned int                    lck_mtxi_pad8;
                } lck_mtxi;
        } lck_mtx_sw;
@@ -88,11 +88,17 @@ typedef struct _lck_mtx_ {
 #define        LCK_MTX_TAG_INDIRECT                    0x00001007      /* lock marked as Indirect  */
 #define        LCK_MTX_TAG_DESTROYED                   0x00002007      /* lock marked as Destroyed */
 
+#define MUTEX_LOCKED_AS_SPIN                   0x00004001      /* used to indicate that the mutex */
+                                                                /* was acquired as a spin lock - stored in lck_mtxd_locked */
 /* Adaptive spin before blocking */
 extern unsigned int    MutexSpin;
-extern void            lck_mtx_lock_spin(lck_mtx_t *lck);
+extern void            lck_mtx_lock_spinwait(lck_mtx_t *lck);
 
-extern void            lck_mtx_interlock_spin(lck_mtx_t *lck);
+extern void            lck_mtx_interlock_panic(lck_mtx_t *lck);
+
+extern void            hw_lock_byte_init(uint8_t *lock_byte);
+extern void            hw_lock_byte_lock(uint8_t *lock_byte);
+extern void            hw_lock_byte_unlock(uint8_t *lock_byte);
 
 typedef struct {
        unsigned int            type;
@@ -111,7 +117,7 @@ typedef struct _lck_mtx_ext_ {
        struct _lck_grp_        *lck_mtx_grp;
        unsigned int            lck_mtx_attr;
        lck_mtx_deb_t           lck_mtx_deb;
-       lck_mtx_stat_t          lck_mtx_stat;
+       uint64_t                lck_mtx_stat;
 } lck_mtx_ext_t;
 
 #define        LCK_MTX_ATTR_DEBUG      0x1
@@ -130,17 +136,25 @@ typedef struct __lck_mtx_t__      lck_mtx_t;
 #endif
 
 #ifdef MACH_KERNEL_PRIVATE
+#pragma pack(1)                /* Make sure the structure stays as we defined it */
 typedef struct {
-       hw_lock_data_t          interlock;
-       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 */
-                                               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 */
-       unsigned int            lck_rw_tag;
+       volatile uint16_t       lck_rw_shared_count;    /* No. of accepted readers */
+       uint8_t lck_rw_interlock;                       /* Interlock byte */
+       volatile uint8_t
+                               lck_rw_priv_excl:1,     /* Writers prioritized if set */
+                               lck_rw_want_upgrade:1,  /* Read-to-write upgrade waiting */
+                               lck_rw_want_write:1,    /* Writer waiting or locked for write */
+                               lck_r_waiting:1,        /* Reader is sleeping on lock */
+                               lck_w_waiting:1,        /* Writer is sleeping on lock */
+                               lck_rw_can_sleep:1,     /* Can attempts to lock go to sleep? */
+                               lck_rw_pad6:2;          /* padding */
+
+       unsigned int            lck_rw_tag; /* This can be obsoleted when stats
+                                            * are in
+                                            */
+       unsigned int            lck_rw_pad8;
 } lck_rw_t;
+#pragma pack()
 
 #define        LCK_RW_ATTR_DEBUG       0x1
 #define        LCK_RW_ATTR_DEBUGb      0