caiyu/openEMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MT engine: fix threads not cleaned up, #104

Browse Source 
Signed-off-by: Thorsten Liebig <Thorsten.Liebig@gmx.de>
This commit is contained in:
Thorsten Liebig 2023-02-11 10:43:28 +01:00
parent 0342eefd27
commit b49bd2af80
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
FDTD/engine_multithread.cpp
View File

@ -119,16 +119,13 @@ void Engine_Multithread::Init()
void Engine_Multithread::Reset() void Engine_Multithread::Reset()
{ {
if (!m_stopThreads) // prevent multiple invocations if (m_thread_group!=0) // prevent multiple invocations
{ {
ClearExtensions(); //prevent extensions from interfering with thread reset... ClearExtensions(); //prevent extensions from interfering with thread reset...
// stop the threads // stop the threads
//NS_Engine_Multithread::DBG().cout() << "stopping all threads" << endl; //NS_Engine_Multithread::DBG().cout() << "stopping all threads" << endl;
m_iterTS = 1; m_thread_group->interrupt_all();
m_startBarrier->wait(); // start the threads
m_stopThreads = true;
m_stopBarrier->wait(); // wait for the threads to finish
m_thread_group->join_all(); // wait for termination m_thread_group->join_all(); // wait for termination
delete m_IterateBarrier; delete m_IterateBarrier;
m_IterateBarrier = 0; m_IterateBarrier = 0;
@ -148,10 +145,7 @@ void Engine_Multithread::changeNumThreads(unsigned int numThreads)
if (m_thread_group!=0) if (m_thread_group!=0)
{ {
m_thread_group->interrupt_all(); m_thread_group->interrupt_all();
//m_stopThreads = true;
//m_startBarrier->wait(); // start the threads
m_thread_group->join_all(); // wait for termination m_thread_group->join_all(); // wait for termination
delete m_thread_group; delete m_thread_group;
m_thread_group = 0; m_thread_group = 0;
//m_stopThreads = false; //m_stopThreads = false;
@ -335,6 +329,7 @@ void thread::operator()()
if (m_enginePtr->m_stopThreads) if (m_enginePtr->m_stopThreads)
{ {
//DBG().cout() << "Thread " << m_threadID << " (" << boost::this_thread::get_id() << ") stop!." << endl;
return; return;
} }