X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/d7e50217d7adf6e52786a38bcaa4cd698cb9a79e..db6096698656d32db7df630594bd9617ee54f828:/osfmk/kern/sync_lock.h?ds=sidebyside diff --git a/osfmk/kern/sync_lock.h b/osfmk/kern/sync_lock.h index 70a142bd0..589fdfcb8 100644 --- a/osfmk/kern/sync_lock.h +++ b/osfmk/kern/sync_lock.h @@ -1,16 +1,19 @@ /* - * Copyright (c) 2000 Apple Computer, Inc. All rights reserved. + * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved. * - * @APPLE_LICENSE_HEADER_START@ - * - * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved. + * @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 @@ -20,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@ @@ -38,44 +41,40 @@ #include -#include - -#ifdef __APPLE_API_PRIVATE - #ifdef MACH_KERNEL_PRIVATE #include #include #include -#include +#include typedef struct ulock { - queue_chain_t thread_link; /* ulocks owned by a thread */ + queue_chain_t thread_link; /* ulocks owned by thread MUST BE FIRST */ queue_chain_t held_link; /* ulocks held in the lock set */ queue_chain_t handoff_link; /* ulocks w/ active handoffs */ + struct lock_set *lock_set; /* the retaining lock set */ + thread_t holder; /* thread that holds the lock */ - decl_mutex_data(,lock) /* ulock lock */ + struct wait_queue wait_queue; /* queue of blocked threads */ + + decl_lck_mtx_data(,lock) /* ulock lock */ - struct lock_set *lock_set; /* the retaining lock set */ - thread_act_t holder; /* thread_act that holds the lock */ unsigned int /* flags */ /* boolean_t */ blocked:1, /* did threads block waiting? */ /* boolean_t */ unstable:1, /* unstable? (holder died) */ /* boolean_t */ ho_wait:1, /* handoff thread waiting? */ /* boolean_t */ accept_wait:1, /* accepting thread waiting? */ :0; /* force to long boundary */ - - struct wait_queue wait_queue; /* queue of blocked threads */ } Ulock; typedef struct ulock *ulock_t; typedef struct lock_set { - queue_chain_t task_link; /* chain of lock sets owned by a task */ - decl_mutex_data(,lock) /* lock set lock */ + queue_chain_t task_link; /* lock sets owned by a task MUST BE FIRST */ task_t owner; /* task that owns the lock set */ ipc_port_t port; /* lock set port */ - int ref_count; /* reference count */ + decl_lck_mtx_data(,lock) /* lock set lock */ + uint32_t ref_count; /* reference count */ boolean_t active; /* active status */ int n_ulocks; /* number of ulocks in the lock set */ @@ -88,64 +87,37 @@ typedef struct lock_set { #define ULOCK_FREE 0 #define ULOCK_HELD 1 -/* - * Data structure internal lock macros - */ - -#define lock_set_lock_init(ls) mutex_init(&(ls)->lock, \ - ETAP_THREAD_LOCK_SET) -#define lock_set_lock(ls) mutex_lock(&(ls)->lock) -#define lock_set_unlock(ls) mutex_unlock(&(ls)->lock) - -#define ulock_lock_init(ul) mutex_init(&(ul)->lock, \ - ETAP_THREAD_ULOCK) -#define ulock_lock(ul) mutex_lock(&(ul)->lock) -#define ulock_unlock(ul) mutex_unlock(&(ul)->lock) - -extern void lock_set_init(void); - -extern kern_return_t lock_release_internal (ulock_t ulock, - thread_act_t thr_act); - -#endif /* MACH_KERNEL_PRIVATE */ - -#endif /* __APPLE_API_PRIVATE */ - +extern lck_grp_t lock_set_grp; +extern lck_attr_t lock_set_attr; /* - * Forward Declarations + * Data structure internal lock macros */ -extern kern_return_t lock_set_create (task_t task, - lock_set_t *new_lock_set, - int n_ulocks, - int policy); - -extern kern_return_t lock_set_destroy (task_t task, - lock_set_t lock_set); - -extern kern_return_t lock_acquire (lock_set_t lock_set, - int lock_id); +#define lock_set_lock_init(ls) lck_mtx_init(&(ls)->lock, &lock_set_grp, &lock_set_attr) +#define lock_set_lock(ls) lck_mtx_lock(&(ls)->lock) +#define lock_set_unlock(ls) lck_mtx_unlock(&(ls)->lock) -extern kern_return_t lock_release (lock_set_t lock_set, - int lock_id); +#define ulock_lock_init(ul) lck_mtx_init(&(ul)->lock, &lock_set_grp, &lock_set_attr) +#define ulock_lock(ul) lck_mtx_lock(&(ul)->lock) +#define ulock_unlock(ul) lck_mtx_unlock(&(ul)->lock) -extern kern_return_t lock_try (lock_set_t lock_set, - int lock_id); +extern void lock_set_init(void) __attribute__((section("__TEXT, initcode"))); -extern kern_return_t lock_make_stable (lock_set_t lock_set, - int lock_id); +extern kern_return_t ulock_release_internal( + ulock_t ulock, + thread_t thread); -extern kern_return_t lock_make_unstable (ulock_t ulock, - thread_act_t thr_act); +extern kern_return_t lock_make_unstable( + ulock_t ulock, + thread_t thread); -extern kern_return_t lock_handoff (lock_set_t lock_set, - int lock_id); - -extern kern_return_t lock_handoff_accept (lock_set_t lock_set, - int lock_id); +extern void ulock_release_all( + thread_t thread); extern void lock_set_reference (lock_set_t lock_set); extern void lock_set_dereference (lock_set_t lock_set); +#endif /* MACH_KERNEL_PRIVATE */ + #endif /* _KERN_SYNC_LOCK_H_ */