X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/a3d08fcd5120d2aa8303b6349ca8b14e3f284af3..91447636331957f3d9b5ca5b508f07c526b0074d:/osfmk/ipc/ipc_hash.c?ds=sidebyside diff --git a/osfmk/ipc/ipc_hash.c b/osfmk/ipc/ipc_hash.c index 844501695..46462a593 100644 --- a/osfmk/ipc/ipc_hash.c +++ b/osfmk/ipc/ipc_hash.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000 Apple Computer, Inc. All rights reserved. + * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * @@ -211,8 +211,7 @@ typedef struct ipc_hash_global_bucket { #define IHGB_NULL ((ipc_hash_global_bucket_t) 0) -#define ihgb_lock_init(ihgb) mutex_init(&(ihgb)->ihgb_lock_data, \ - ETAP_IPC_IHGB) +#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) @@ -284,17 +283,14 @@ ipc_hash_global_lookup( void ipc_hash_global_insert( - ipc_space_t space, - ipc_object_t obj, - mach_port_name_t name, - ipc_tree_entry_t entry) + ipc_space_t space, + ipc_object_t obj, + __assert_only mach_port_name_t name, + ipc_tree_entry_t entry) { ipc_hash_global_bucket_t bucket; - assert(!is_fast_space(space)); - - assert(entry->ite_name == name); assert(space != IS_NULL); assert(entry->ite_space == space); @@ -325,16 +321,15 @@ ipc_hash_global_insert( void ipc_hash_global_delete( - ipc_space_t space, - ipc_object_t obj, - mach_port_name_t name, - ipc_tree_entry_t entry) + ipc_space_t space, + ipc_object_t obj, + __assert_only mach_port_name_t name, + ipc_tree_entry_t entry) { ipc_hash_global_bucket_t bucket; ipc_tree_entry_t this, *last; assert(!is_fast_space(space)); - assert(entry->ite_name == name); assert(space != IS_NULL); assert(entry->ite_space == space); @@ -457,10 +452,10 @@ ipc_hash_local_lookup( void ipc_hash_local_insert( - ipc_space_t space, - ipc_object_t obj, - mach_port_index_t index, - ipc_entry_t entry) + ipc_space_t space, + ipc_object_t obj, + mach_port_index_t index, + __assert_only ipc_entry_t entry) { ipc_entry_t table; ipc_entry_num_t size; @@ -501,10 +496,10 @@ ipc_hash_local_insert( void ipc_hash_local_delete( - ipc_space_t space, - ipc_object_t obj, - mach_port_index_t index, - ipc_entry_t entry) + ipc_space_t space, + ipc_object_t obj, + mach_port_index_t index, + __assert_only ipc_entry_t entry) { ipc_entry_t table; ipc_entry_num_t size;