xnu-1699.22.73.tar.gz

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

diff --git a/osfmk/kern/wait_queue.h b/osfmk/kern/wait_queue.h
index 386bd093c2f9cbbc180e38088ead087e3a51ccd6..42675a30b2bb11361132e23ab05363674ea94f05 100644 (file)
--- a/osfmk/kern/wait_queue.h
+++ b/osfmk/kern/wait_queue.h
@@ -43,6 +43,7 @@
 
 #include <kern/lock.h>
 #include <kern/queue.h>
 
 #include <kern/lock.h>
 #include <kern/queue.h>

+#include <mach/branch_predicates.h>

 
 #include <machine/cpu_number.h>
 #include <machine/machine_routines.h> /* machine_timeout_suspended() */
 
 #include <machine/cpu_number.h>
 #include <machine/machine_routines.h> /* machine_timeout_suspended() */


@@ -153,7 +154,7 @@ typedef struct _wait_queue_link {
 #define wait_queue_lock_try(wq) (hw_lock_try(&(wq)->wq_interlock))
 
 /* For x86, the hardware timeout is in TSC units. */
 #define wait_queue_lock_try(wq) (hw_lock_try(&(wq)->wq_interlock))
 
 /* For x86, the hardware timeout is in TSC units. */

-#if defined(i386)
+#if defined(i386) || defined(x86_64)

 #define        hwLockTimeOut LockTimeOutTSC
 #else
 #define        hwLockTimeOut LockTimeOut
 #define        hwLockTimeOut LockTimeOutTSC
 #else
 #define        hwLockTimeOut LockTimeOut


@@ -166,8 +167,9 @@ typedef struct _wait_queue_link {
  */
 
 static inline void wait_queue_lock(wait_queue_t wq) {
  */
 
 static inline void wait_queue_lock(wait_queue_t wq) {

-       if (hw_lock_to(&(wq)->wq_interlock, hwLockTimeOut * 2) == 0) {
+       if (__improbable(hw_lock_to(&(wq)->wq_interlock, hwLockTimeOut * 2) == 0)) {

                boolean_t wql_acquired = FALSE;
                boolean_t wql_acquired = FALSE;

+

                while (machine_timeout_suspended()) {
 #if    defined(__i386__) || defined(__x86_64__)
 /*
                while (machine_timeout_suspended()) {
 #if    defined(__i386__) || defined(__x86_64__)
 /*


@@ -179,7 +181,6 @@ static inline void wait_queue_lock(wait_queue_t wq) {
                        if ((wql_acquired = hw_lock_to(&(wq)->wq_interlock, hwLockTimeOut * 2)))
                                break;
                }
                        if ((wql_acquired = hw_lock_to(&(wq)->wq_interlock, hwLockTimeOut * 2)))
                                break;
                }

-

                if (wql_acquired == FALSE)
                        panic("wait queue deadlock - wq=%p, cpu=%d\n", wq, cpu_number());
        }
                if (wql_acquired == FALSE)
                        panic("wait queue deadlock - wq=%p, cpu=%d\n", wq, cpu_number());
        }


@@ -329,6 +330,15 @@ extern kern_return_t wait_queue_unlink_all(
 extern kern_return_t wait_queue_set_unlink_all(
                        wait_queue_set_t set_queue);
 
 extern kern_return_t wait_queue_set_unlink_all(
                        wait_queue_set_t set_queue);
 

+#ifdef XNU_KERNEL_PRIVATE
+extern kern_return_t wait_queue_set_unlink_one(
+                       wait_queue_set_t set_queue,
+                       wait_queue_link_t link);
+
+extern wait_queue_link_t wait_queue_link_allocate(void);
+
+#endif /* XNU_KERNEL_PRIVATE */
+

 /* legacy API */
 kern_return_t wait_queue_sub_init(
                        wait_queue_set_t set_queue,
 /* legacy API */
 kern_return_t wait_queue_sub_init(
                        wait_queue_set_t set_queue,


@@ -388,7 +398,8 @@ extern wait_result_t wait_queue_assert_wait(
 extern kern_return_t wait_queue_wakeup_one(
                        wait_queue_t wait_queue,
                        event_t wake_event,
 extern kern_return_t wait_queue_wakeup_one(
                        wait_queue_t wait_queue,
                        event_t wake_event,

-                       wait_result_t result);
+                       wait_result_t result,
+                       int priority);

 
 /* wakeup all the threads waiting on <wait_queue,event> pair */
 extern kern_return_t wait_queue_wakeup_all(
 
 /* wakeup all the threads waiting on <wait_queue,event> pair */
 extern kern_return_t wait_queue_wakeup_all(