Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

wpiutil: SafeThread: Ensure thread is released in destructor (#1358)

Browse Source 
The thread must be released with either a detach or a join, otherwise
std::terminate is called.
This commit is contained in:
Peter Johnson
2018-10-06 18:07:56 -07:00
committed by GitHub
parent 613d5eda0d
commit 0a937bb5b9
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wpiutil/src/main/native/cpp/SafeThread.cpp
View File

@@ -40,9 +40,9 @@ void detail::SafeThreadOwnerBase::Stop() {
if (auto thr = m_thread.lock()) {
thr->m_active = false;
thr->m_cond.notify_all();
m_stdThread.detach();
m_thread.reset();
}
if (m_stdThread.joinable()) m_stdThread.detach();
}
void detail::SafeThreadOwnerBase::Join() {
@@ -54,6 +54,8 @@ void detail::SafeThreadOwnerBase::Join() {
thr->m_active = false;
thr->m_cond.notify_all();
stdThread.join();
} else if (m_stdThread.joinable()) {
m_stdThread.detach();
}
}