xnu-1699.24.23.tar.gz

[apple/xnu.git] / osfmk / ipc / ipc_hash.c

diff --git a/osfmk/ipc/ipc_hash.c b/osfmk/ipc/ipc_hash.c
index d237245b6bcc1ff1e3a161fbb48d219399f04770..2f43a63cf7b8aa5637c2d93f61590c9e6c1c9944 100644 (file)
--- a/osfmk/ipc/ipc_hash.c
+++ b/osfmk/ipc/ipc_hash.c
@@ -211,15 +211,15 @@ ipc_hash_index_t ipc_hash_global_mask;
         ipc_hash_global_mask)
 
 typedef struct ipc_hash_global_bucket {
-       decl_mutex_data(,       ihgb_lock_data)
+       decl_lck_mtx_data(,     ihgb_lock_data)
        ipc_tree_entry_t        ihgb_head;
 } *ipc_hash_global_bucket_t;
 
 #define        IHGB_NULL       ((ipc_hash_global_bucket_t) 0)
 
-#define        ihgb_lock_init(ihgb)    mutex_init(&(ihgb)->ihgb_lock_data, 0)
-#define        ihgb_lock(ihgb)         mutex_lock(&(ihgb)->ihgb_lock_data)
-#define        ihgb_unlock(ihgb)       mutex_unlock(&(ihgb)->ihgb_lock_data)
+#define        ihgb_lock_init(ihgb)    lck_mtx_init(&(ihgb)->ihgb_lock_data, &ipc_lck_grp, &ipc_lck_attr)
+#define        ihgb_lock(ihgb)                 lck_mtx_lock(&(ihgb)->ihgb_lock_data)
+#define        ihgb_unlock(ihgb)               lck_mtx_unlock(&(ihgb)->ihgb_lock_data)
 
 ipc_hash_global_bucket_t ipc_hash_global_table;
 
@@ -394,7 +394,7 @@ ipc_hash_global_delete(
  */
 
 #define        IH_LOCAL_HASH(obj, size)                                \
-               ((((mach_port_index_t) (obj)) >> 6) % (size))
+               ((mach_port_index_t)((((uintptr_t) (obj)) >> 6) % (size)))
 
 /*
  *     Routine:        ipc_hash_local_lookup
@@ -639,6 +639,17 @@ ipc_hash_init(void)
 
 #if    MACH_IPC_DEBUG
 
+/*
+ *     Routine:        ipc_hash_size
+ *     Purpose:
+ *             Return the size of the global reverse hash table.
+ */
+natural_t
+ipc_hash_size(void)
+{
+       return ipc_hash_global_size;
+}
+
 /*
  *     Routine:        ipc_hash_info
  *     Purpose:
@@ -654,7 +665,7 @@ ipc_hash_init(void)
 ipc_hash_index_t
 ipc_hash_info(
        hash_info_bucket_t      *info,
-       mach_msg_type_number_t count)
+       natural_t               count)
 {
        ipc_hash_index_t i;