Conditional Variable support

Change-Id: Ib715b3a4e775ef183244e8769c6560a85ac19104
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/612
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

2 files changed, 17 insertions, 23 deletions

diff --git a/src/include/kernel/futexmgr.H b/src/include/kernel/futexmgr.H
index 75fc31b08..aeba05291 100644
--- a/src/include/kernel/futexmgr.H
+++ b/src/include/kernel/futexmgr.H
@@ -53,12 +53,18 @@ class FutexManager
         static uint64_t wait(task_t * i_task, uint64_t * i_addr, uint64_t i_val);
 
         /**
-         * Wakeup threads
-         * @param[in] i_addr pointer to a futex
-         * @param[in] i_count The max number of threads to wake
-         * @returns The number of threads awoken
+         * Wakeup and optionally move waiting processes.
+         * @param[in] i_futex1 pointer to a futex
+         * @param[in] i_count1 The max number of tasks to wake
+         * @param[in] i_futex2 pointer to a futex, (default NULL) Optional
+         *                     futex to move i_count_2 unwoken tasks to.
+         * @param[in] i_count2 The max number of theads to move from futex1 to 
+         *                     futex2. (default 0)
+         *
+         * @returns The number of tasks awoken
          */
-        static uint64_t wake(uint64_t * i_addr, uint64_t i_count);
+        static uint64_t wake(uint64_t * i_futex1, uint64_t i_count1,
+                             uint64_t * i_futex2 = NULL, uint64_t i_count2 = 0);
 
     protected:
 
@@ -74,22 +80,12 @@ class FutexManager
 
     private: // functions
 
-        /**
-         * Put the current processes on a wait queue
-         * @param[in] i_task  pointer to the current task structure
-         * @param[in] i_addr  Futex address 
-         * @param[in] i_val   Value that *i_addr should contain
-         * @returns [0 | error code]  if *i_addr != i_val returns EWOULDBLOCK
-         */
+        /** see wait(...) */
         uint64_t _wait(task_t * i_task, uint64_t * i_addr, uint64_t i_val);
 
-        /**
-         * Wakeup threads
-         * @param[in] i_addr pointer to a futex
-         * @param[in] i_count The max number of threads to wake
-         * @returns The number of threads awoken
-         */
-        uint64_t _wake(uint64_t * i_addr, uint64_t i_count);
+        /** see wake(...) */
+        uint64_t _wake(uint64_t * i_futex1, uint64_t i_count1,
+                       uint64_t * i_futex2, uint64_t i_count2);
 
     private: // data
 
diff --git a/src/include/kernel/syscalls.H b/src/include/kernel/syscalls.H
index 856666d74..e09171596 100644
--- a/src/include/kernel/syscalls.H
+++ b/src/include/kernel/syscalls.H
@@ -77,10 +77,8 @@ namespace Systemcalls
             /** nanosleep() */
         TIME_NANOSLEEP,
 
-            /** futex_wait() */
-        FUTEX_WAIT,
-            /** futex_wake() */
-        FUTEX_WAKE,
+            /** futex_wake() futex_wait() futex_requeue() */
+        SYS_FUTEX,
 
             /** shutdown() */
         MISC_SHUTDOWN,