1 files changed, 35 insertions, 26 deletions

diff --git a/openmp/runtime/src/kmp_wait_release.h b/openmp/runtime/src/kmp_wait_release.h
index 261df2762f6..97949efdd5c 100644
--- a/openmp/runtime/src/kmp_wait_release.h
+++ b/openmp/runtime/src/kmp_wait_release.h
@@ -56,6 +56,10 @@ class kmp_flag {
      */
     volatile P * get() { return loc; }
     /*!
+     * @param new_loc in   set loc to point at new_loc
+     */
+    void set(volatile P *new_loc) { loc = new_loc; }
+    /*!
      * @result the flag_type
      */
     flag_type get_type() { return t; }
@@ -67,10 +71,15 @@ class kmp_flag {
     bool done_check_val(P old_loc);
     bool notdone_check();
     P internal_release();
+    void suspend(int th_gtid);
+    void resume(int th_gtid);
     P set_sleeping();
     P unset_sleeping();
     bool is_sleeping();
+    bool is_any_sleeping();
     bool is_sleeping_val(P old_loc);
+    int execute_tasks(kmp_info_t *this_thr, kmp_int32 gtid, int final_spin, int *thread_finished
+                      USE_ITT_BUILD_ARG(void * itt_sync_obj), kmp_int32 is_constrained);
     */
 };
 
@@ -281,26 +290,24 @@ static inline void __kmp_release_template(C *flag)
     KF_TRACE(20, ("__kmp_release: T#%d releasing T#%d spin(%p)\n", gtid, target_gtid, flag->get()));
     KMP_DEBUG_ASSERT(flag->get());
     KMP_FSYNC_RELEASING(flag->get());
-
-    typename C::flag_t old_spin = flag->internal_release();
-
-    KF_TRACE(100, ("__kmp_release: T#%d old spin(%p)=%d, set new spin=%d\n",
-                   gtid, flag->get(), old_spin, *(flag->get())));
-
+    
+    flag->internal_release();
+    
+    KF_TRACE(100, ("__kmp_release: T#%d set new spin=%d\n", gtid, flag->get(), *(flag->get())));
+    
     if (__kmp_dflt_blocktime != KMP_MAX_BLOCKTIME) {
         // Only need to check sleep stuff if infinite block time not set
-        if (flag->is_sleeping_val(old_spin)) {
+        if (flag->is_any_sleeping()) { // Are *any* of the threads that wait on this flag sleeping?
             for (unsigned int i=0; i<flag->get_num_waiters(); ++i) {
-                kmp_info_t * waiter = flag->get_waiter(i);
-                int wait_gtid = waiter->th.th_info.ds.ds_gtid;
-                // Wake up thread if needed
-                KF_TRACE(50, ("__kmp_release: T#%d waking up thread T#%d since sleep spin(%p) set\n",
-                              gtid, wait_gtid, flag->get()));
-                flag->resume(wait_gtid);
+                kmp_info_t * waiter = flag->get_waiter(i); // if a sleeping waiter exists at i, sets current_waiter to i inside the flag
+                if (waiter) {
+                    int wait_gtid = waiter->th.th_info.ds.ds_gtid;
+                    // Wake up thread if needed
+                    KF_TRACE(50, ("__kmp_release: T#%d waking up thread T#%d since sleep flag(%p) set\n",
+                                  gtid, wait_gtid, flag->get()));
+                    flag->resume(wait_gtid); // unsets flag's current_waiter when done
+                }
             }
-        } else {
-            KF_TRACE(50, ("__kmp_release: T#%d don't wake up thread T#%d since sleep spin(%p) not set\n",
-                          gtid, target_gtid, flag->get()));
         }
     }
 }
@@ -382,8 +389,8 @@ public:
      * @result Actual flag value before release was applied.
      * Trigger all waiting threads to run by modifying flag to release state.
      */
-    FlagType internal_release() {
-        return traits_type::test_then_add4((volatile FlagType *)this->get());
+    void internal_release() {
+        (void) traits_type::test_then_add4((volatile FlagType *)this->get());
     }
     /*!
      * @result Actual flag value before sleep bit(s) set.
@@ -408,6 +415,9 @@ public:
      * Test whether there are threads sleeping on the flag.
      */
     bool is_sleeping() { return is_sleeping_val(*(this->get())); }
+    bool is_any_sleeping() { return is_sleeping_val(*(this->get())); }
+    kmp_uint8 *get_stolen() { return NULL; }
+    enum barrier_type get_bt() { return bs_last_barrier; }
 };
 
 class kmp_flag_32 : public kmp_basic_flag<kmp_uint32> {
@@ -508,18 +518,15 @@ public:
         }
         return false;
     }
-    kmp_uint64 internal_release() { 
-        kmp_uint64 old_val;
+    void internal_release() {
         if (__kmp_dflt_blocktime == KMP_MAX_BLOCKTIME) {
-            old_val = *get();
             byteref(get(),offset) = 1;
         }
         else {
             kmp_uint64 mask=0;
             byteref(&mask,offset) = 1;
-            old_val = KMP_TEST_THEN_OR64((volatile kmp_int64 *)get(), mask);
+            (void) KMP_TEST_THEN_OR64((volatile kmp_int64 *)get(), mask);
         }
-        return old_val;
     }
     kmp_uint64 set_sleeping() { 
         return KMP_TEST_THEN_OR64((kmp_int64 volatile *)get(), KMP_BARRIER_SLEEP_STATE);
@@ -529,9 +536,9 @@ public:
     }
     bool is_sleeping_val(kmp_uint64 old_loc) { return old_loc & KMP_BARRIER_SLEEP_STATE; }
     bool is_sleeping() { return is_sleeping_val(*get()); }
-    void wait(kmp_info_t *this_thr, int final_spin
-              USE_ITT_BUILD_ARG(void * itt_sync_obj)) {
-        __kmp_wait_template(this_thr, this, final_spin
+    bool is_any_sleeping() { return is_sleeping_val(*get()); }
+    void wait(kmp_info_t *this_thr, int final_spin) {
+        __kmp_wait_template<kmp_flag_oncore>(this_thr, this, final_spin
                             USE_ITT_BUILD_ARG(itt_sync_obj));
     }
     void release() { __kmp_release_template(this); }
@@ -542,6 +549,8 @@ public:
         return __kmp_execute_tasks_oncore(this_thr, gtid, this, final_spin, thread_finished
                                       USE_ITT_BUILD_ARG(itt_sync_obj), is_constrained);
     }
+    kmp_uint8 *get_stolen() { return NULL; }
+    enum barrier_type get_bt() { return bt; }
 };
 
 /*!