X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/9bccf70c0258c7cac2dcb80011b2a964d884c552..5d5c5d0d5b79ade9a973d55186ffda2638ba2b6e:/osfmk/kern/sync_lock.h

diff --git a/osfmk/kern/sync_lock.h b/osfmk/kern/sync_lock.h
index 99f2d098c..ec80c5103 100644
--- a/osfmk/kern/sync_lock.h
+++ b/osfmk/kern/sync_lock.h
@@ -1,23 +1,31 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
+ * 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.  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 
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, 
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
+ * Please see the License for the specific language governing rights and 
+ * limitations under the License.
+ *
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -35,10 +43,6 @@
 
 #include <mach/mach_types.h>
 
-#include <sys/appleapiopts.h>
-
-#ifdef	__APPLE_API_PRIVATE
-
 #ifdef	MACH_KERNEL_PRIVATE
 
 #include <kern/wait_queue.h>
@@ -54,7 +58,7 @@ typedef struct ulock {
 	decl_mutex_data(,lock)		/* ulock lock			    */
 
 	struct lock_set *lock_set;	/* the retaining lock set	    */
-	thread_act_t	holder;		/* thread_act that holds the lock   */
+	thread_t	holder;		/* thread that holds the lock   */
 	unsigned int			/* flags                            */
 	/* boolean_t */ blocked:1,	/*     did threads block waiting?   */
 	/* boolean_t */	unstable:1,	/*     unstable? (holder died)	    */
@@ -89,60 +93,30 @@ typedef struct lock_set {
  *  Data structure internal lock macros
  */
 
-#define lock_set_lock_init(ls)		mutex_init(&(ls)->lock, \
-						   ETAP_THREAD_LOCK_SET)
+#define lock_set_lock_init(ls)		mutex_init(&(ls)->lock, 0)
 #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_init(ul)		mutex_init(&(ul)->lock, 0)
 #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	kern_return_t	ulock_release_internal(
+					ulock_t		ulock,
+					thread_t	thread);
 
+extern	kern_return_t	lock_make_unstable(
+					ulock_t 	ulock, 
+					thread_t 	thread);
 
-/*
- *	Forward Declarations
- */
-
-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);
-
-extern	kern_return_t	lock_release	     	(lock_set_t lock_set,
-						 int lock_id);
-
-extern	kern_return_t	lock_try	     	(lock_set_t lock_set,
-						 int lock_id);
-
-extern	kern_return_t	lock_make_stable	(lock_set_t lock_set,
-						 int lock_id);	       
-
-extern  kern_return_t	lock_make_unstable	(ulock_t ulock,
-						 thread_act_t thr_act);
-
-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_ */