We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent bc27649 commit 6c12977Copy full SHA for 6c12977
thread/workerpool.cpp
@@ -57,11 +57,16 @@ class WorkPool::impl {
57
~impl() {
58
for (auto num = vcpus.size(); num; --num) enqueue({});
59
for (auto &worker : owned_std_threads) worker.join();
60
+<<<<<<< HEAD
61
if (likely(CURRENT)) {
62
while (vcpus.size()) thread_yield();
63
} else {
64
while (vcpus.size()) std::this_thread::yield();
65
}
66
+=======
67
+ while (vcpus.size()) std::this_thread::yield();
68
+ worker_lock.lock();
69
+>>>>>>> c4118ca (worker_lock.lock() in WorkPool::~impl() to ensure destruction order (#1026))
70
71
72
void enqueue(Delegate<void> call, AutoContext = {}) {
0 commit comments