Merge pull request #128 from shintaro-iwasaki/FixImproperTLS

local: fix improper TLS handling
pmodels · Nov 17, 2019 · deec51f · deec51f
2 parents 549bac0 + e7095f6
commit deec51f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/stream.c b/src/stream.c
@@ -1285,7 +1285,7 @@ int ABTI_xstream_join(ABTI_local **pp_local, ABTI_xstream *p_xstream)
      * mode, the ULT can be blocked. Otherwise, the access mode, if it is a
      * single-writer access mode, may be violated because another ES has to set
      * the blocked ULT ready. */
-    p_local = ABTI_local_get_local();
+    p_local = *pp_local;
     p_thread = p_local ? p_local->p_thread : NULL;
     if (p_thread) {
         ABT_pool_access access = p_thread->p_pool->access;

diff --git a/src/thread.c b/src/thread.c
@@ -2354,6 +2354,7 @@ static inline int ABTI_thread_join(ABTI_local **pp_local, ABTI_thread *p_thread)
     while (ABTD_atomic_load_uint32((uint32_t *)&p_thread->state)
            != ABT_THREAD_STATE_TERMINATED) {
         ABTI_thread_yield(pp_local, p_local->p_thread);
+        p_local = *pp_local;
     }
     goto fn_exit;