2

xinyiZzz · Oct 27, 2023 · 7fe08a2 · 7fe08a2
1 parent 49052e2
commit 7fe08a2
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/be/src/runtime/thread_context.h b/be/src/runtime/thread_context.h
@@ -293,11 +293,15 @@ static ThreadContext* thread_context() {
         DCHECK(pthread_context_ptr_init);
         DCHECK(thread_context_ptr != nullptr);
         return thread_context_ptr;
-    } else {
-        // in bthread
-        DCHECK(bthread_context != nullptr);
-        return bthread_context;
     }
+    // in bthread
+    if (!bthread_equal(bthread_self(), bthread_id)) {
+        // bthread switching pthread may be very frequent, remember not to use lock or other time-consuming operations.
+        bthread_id = bthread_self();
+        bthread_context = static_cast<ThreadContext*>(bthread_getspecific(btls_key));
+    }
+    DCHECK(bthread_context != nullptr);
+    return bthread_context;
 }
 
 class ScopeMemCount {