stephenseo/EntityComponentMetaSystem
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Add atomic_bool to ThreadPool to ensure validity

Browse source 
The new deque<atomic_bool> ensures that values are not dropped from the
deque until the entry's threads have finished execution.
This commit is contained in:
Stephen Seo 2022-06-16 12:37:09 +09:00
parent 62600cbfa6
commit a879e0ef8c
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/EC/ThreadPool.hpp
View file

@ -28,8 +28,9 @@ using ThreadStackType = std::vector<std::tuple<ThreadPtr, std::thread::id>>;
using ThreadStacksType = std::deque<ThreadStackType>;
using ThreadStacksMutexesT = std::deque<std::mutex>;
using ThreadCountersT = std::deque<std::atomic_uint>;
using PtrsHoldT = std::deque<std::atomic_bool>;
using PointersT =
std::tuple<ThreadStackType *, std::mutex *, std::atomic_uint *>;
std::tuple<ThreadStackType *, std::mutex *, std::atomic_uint *, std::atomic_bool *>;
} // namespace Internal
/*!
@ -147,7 +148,7 @@ class ThreadPool {
} else {
sequentiallyRunTasks();
}
return {nullptr, nullptr, nullptr};
return {nullptr, nullptr, nullptr, nullptr};
}
/*!
@ -184,6 +185,7 @@ class ThreadPool {
{
std::lock_guard<std::mutex> lock(*std::get<1>(pointers));
if (std::get<0>(pointers)->empty()) {
std::get<3>(pointers)->store(false);
break;
}
}
@ -219,6 +221,7 @@ class ThreadPool {
Internal::TPQueueType fnQueue;
std::mutex queueMutex;
Internal::ThreadCountersT threadCounters;
Internal::PtrsHoldT ptrsHoldBools;
std::mutex dequesMutex;
void sequentiallyRunTasks() {
@ -253,9 +256,12 @@ class ThreadPool {
erased = false;
{
std::lock_guard<std::mutex> lock(threadStackMutexes.front());
if (threadStacks.front().empty()) {
if (ptrsHoldBools.front().load()) {
break;
} else if (threadStacks.front().empty()) {
threadStacks.pop_front();
threadCounters.pop_front();
ptrsHoldBools.pop_front();
erased = true;
}
}
@ -265,7 +271,7 @@ class ThreadPool {
break;
}
} while (!threadStacks.empty() && !threadStackMutexes.empty() &&
!threadCounters.empty());
!threadCounters.empty() && !ptrsHoldBools.empty());
}
Internal::PointersT newStackEntry() {
@ -274,9 +280,11 @@ class ThreadPool {
threadStackMutexes.emplace_back();
threadCounters.emplace_back();
threadCounters.back().store(0);
ptrsHoldBools.emplace_back();
ptrsHoldBools.back().store(true);
return {&threadStacks.back(), &threadStackMutexes.back(),
&threadCounters.back()};
&threadCounters.back(), &ptrsHoldBools.back()};
}
};