mirror/oatpp
2
0
Fork 0
mirror of https://github.com/oatpp/oatpp.git synced 2025-02-17 17:29:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1005 from jerry-skydio/jerry/revup/master/des

Browse Source 
Fix std::thread assertion on destruction
This commit is contained in:
Leonid Stryzhevskyi 2025-01-14 22:46:34 +02:00 committed by GitHub
commit bc10721208
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/oatpp/async/Executor.cpp
View File

@ -66,16 +66,22 @@ void Executor::SubmissionProcessor::pushOneTask(CoroutineHandle* task) {
}
void Executor::SubmissionProcessor::stop() {
m_isRunning = false;
m_processor.stop();
if (m_isRunning) {
m_isRunning = false;
m_processor.stop();
}
}
void Executor::SubmissionProcessor::join() {
m_thread.join();
if (m_thread.joinable()) {
m_thread.join();
}
}
void Executor::SubmissionProcessor::detach() {
m_thread.detach();
if (m_thread.joinable()) {
m_thread.detach();
}
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

4
src/oatpp/async/Executor.hpp
View File

@ -54,6 +54,10 @@ private:
std::thread m_thread;
public:
SubmissionProcessor();
~SubmissionProcessor() override {
stop();
join();
}
public:
template<typename CoroutineType, typename ... Args>