X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/ff6e181ae92fc6f1e89841290f461d1f2f9badd9..13f56ec4e58bf8687e2a68032c093c0213dd519b:/osfmk/ipc/ipc_space.h diff --git a/osfmk/ipc/ipc_space.h b/osfmk/ipc/ipc_space.h index 60b0d5e60..39c2e45a4 100644 --- a/osfmk/ipc/ipc_space.h +++ b/osfmk/ipc/ipc_space.h @@ -1,14 +1,19 @@ /* * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved. * - * @APPLE_LICENSE_HEADER_START@ + * @APPLE_OSREFERENCE_LICENSE_HEADER_START@ * * 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. Please obtain a copy of the License at - * http://www.opensource.apple.com/apsl/ and read it before using this - * file. + * 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 @@ -18,7 +23,7 @@ * Please see the License for the specific language governing rights and * limitations under the License. * - * @APPLE_LICENSE_HEADER_END@ + * @APPLE_OSREFERENCE_LICENSE_HEADER_END@ */ /* * @OSF_COPYRIGHT@ @@ -48,6 +53,12 @@ * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ +/* + * NOTICE: This file was modified by McAfee Research in 2004 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 2.0. + */ /* */ /* @@ -70,7 +81,7 @@ #include #ifdef __APPLE_API_PRIVATE -#ifdef MACH_KERNEL_PRIVATE +#if MACH_KERNEL_PRIVATE #include #include #include @@ -100,10 +111,10 @@ typedef natural_t ipc_space_refs_t; struct ipc_space { - decl_mutex_data(,is_ref_lock_data) + decl_lck_mtx_data(,is_ref_lock_data) ipc_space_refs_t is_references; - decl_mutex_data(,is_lock_data) + decl_lck_mtx_data(,is_lock_data) boolean_t is_active; /* is the space alive? */ boolean_t is_growing; /* is the space growing? */ ipc_entry_t is_table; /* an array of entries */ @@ -114,6 +125,8 @@ struct ipc_space { ipc_entry_num_t is_tree_small; /* # of small entries in the tree */ ipc_entry_num_t is_tree_hash; /* # of hashed entries in the tree */ boolean_t is_fast; /* for is_fast_space() */ + + task_t is_task; /* associated task */ }; #define IS_NULL ((ipc_space_t) 0) @@ -134,43 +147,50 @@ extern ipc_space_t default_pager_space; #define is_fast_space(is) ((is)->is_fast) -#define is_ref_lock_init(is) mutex_init(&(is)->is_ref_lock_data, 0) +#define is_ref_lock_init(is) lck_mtx_init(&(is)->is_ref_lock_data, &ipc_lck_grp, &ipc_lck_attr) +#define is_ref_lock_destroy(is) lck_mtx_destroy(&(is)->is_ref_lock_data, &ipc_lck_grp) #define ipc_space_reference_macro(is) \ MACRO_BEGIN \ - mutex_lock(&(is)->is_ref_lock_data); \ + lck_mtx_lock(&(is)->is_ref_lock_data); \ assert((is)->is_references > 0); \ (is)->is_references++; \ - mutex_unlock(&(is)->is_ref_lock_data); \ + lck_mtx_unlock(&(is)->is_ref_lock_data); \ MACRO_END #define ipc_space_release_macro(is) \ MACRO_BEGIN \ ipc_space_refs_t _refs; \ \ - mutex_lock(&(is)->is_ref_lock_data); \ + lck_mtx_lock(&(is)->is_ref_lock_data); \ assert((is)->is_references > 0); \ _refs = --(is)->is_references; \ - mutex_unlock(&(is)->is_ref_lock_data); \ + lck_mtx_unlock(&(is)->is_ref_lock_data); \ \ - if (_refs == 0) \ + if (_refs == 0) { \ + is_lock_destroy(is); \ + is_ref_lock_destroy(is); \ is_free(is); \ + } \ MACRO_END -#define is_lock_init(is) mutex_init(&(is)->is_lock_data, 0) - -#define is_read_lock(is) mutex_lock(&(is)->is_lock_data) -#define is_read_unlock(is) mutex_unlock(&(is)->is_lock_data) -#define is_read_sleep(is) thread_sleep_mutex((event_t)(is), \ - &(is)->is_lock_data, \ - THREAD_UNINT) - -#define is_write_lock(is) mutex_lock(&(is)->is_lock_data) -#define is_write_lock_try(is) mutex_try(&(is)->is_lock_data) -#define is_write_unlock(is) mutex_unlock(&(is)->is_lock_data) -#define is_write_sleep(is) thread_sleep_mutex((event_t)(is), \ - &(is)->is_lock_data, \ - THREAD_UNINT) +#define is_lock_init(is) lck_mtx_init(&(is)->is_lock_data, &ipc_lck_grp, &ipc_lck_attr) +#define is_lock_destroy(is) lck_mtx_destroy(&(is)->is_lock_data, &ipc_lck_grp) + +#define is_read_lock(is) lck_mtx_lock(&(is)->is_lock_data) +#define is_read_unlock(is) lck_mtx_unlock(&(is)->is_lock_data) +#define is_read_sleep(is) lck_mtx_sleep(&(is)->is_lock_data, \ + LCK_SLEEP_DEFAULT, \ + (event_t)(is), \ + THREAD_UNINT) + +#define is_write_lock(is) lck_mtx_lock(&(is)->is_lock_data) +#define is_write_lock_try(is) lck_mtx_try_lock(&(is)->is_lock_data) +#define is_write_unlock(is) lck_mtx_unlock(&(is)->is_lock_data) +#define is_write_sleep(is) lck_mtx_sleep(&(is)->is_lock_data, \ + LCK_SLEEP_DEFAULT, \ + (event_t)(is), \ + THREAD_UNINT) #define is_reference(is) ipc_space_reference(is) #define is_release(is) ipc_space_release(is)