xnu-4903.270.47.tar.gz

[apple/xnu.git] / osfmk / kern / sync_lock.h

diff --git a/osfmk/kern/sync_lock.h b/osfmk/kern/sync_lock.h
index 70a142bd00fab85643beed56216dfb60ce7ad13f..bcbe466dd9647c7b1ccd9260af0025aa5cafec6f 100644 (file)
--- a/osfmk/kern/sync_lock.h
+++ b/osfmk/kern/sync_lock.h
@@ -1,17 +1,20 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  *
  *

- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 

  * 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
  * 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
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * 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,


@@ -19,12 +22,12 @@
  * 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.
  * 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_HEADER_END@
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /*
  * @OSF_COPYRIGHT@
  */
 /*
  * @OSF_COPYRIGHT@

- * 
+ *

  */
 /*
  *     File:   kern/sync_lock.h
  */
 /*
  *     File:   kern/sync_lock.h


@@ -38,114 +41,15 @@
 
 #include <mach/mach_types.h>
 
 
 #include <mach/mach_types.h>
 

-#include <sys/appleapiopts.h>
+#ifdef  MACH_KERNEL_PRIVATE

 
 

-#ifdef __APPLE_API_PRIVATE
-
-#ifdef MACH_KERNEL_PRIVATE
-
-#include <kern/wait_queue.h>

 #include <kern/macro_help.h>
 #include <kern/queue.h>
 #include <kern/macro_help.h>
 #include <kern/queue.h>

-#include <kern/lock.h>
-
-typedef struct ulock {
-       queue_chain_t   thread_link;    /* ulocks owned by a thread         */
-       queue_chain_t   held_link;      /* ulocks held in the lock set      */
-       queue_chain_t   handoff_link;   /* ulocks w/ active handoffs        */
-
-       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   */
-       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                       */
-       task_t          owner;       /* task that owns the lock set         */
-       ipc_port_t      port;        /* lock set port                       */
-       int             ref_count;   /* reference count                     */
-
-       boolean_t       active;      /* active status                       */
-       int             n_ulocks;    /* number of ulocks in the lock set    */
-
-       struct ulock    ulock_list[1];  /* ulock group list place holder    */
-} Lock_Set;
-
-#define ULOCK_NULL     ((ulock_t) 0)
-
-#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 */
-
-
-/*
- *     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);
+#include <kern/locks.h>

 
 

-extern kern_return_t   lock_handoff_accept     (lock_set_t lock_set,
-                                                int lock_id);
+extern  void            lock_set_reference(lock_set_t lock_set);
+extern  void            lock_set_dereference(lock_set_t lock_set);

 
 

-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_ */
 
 #endif /* _KERN_SYNC_LOCK_H_ */