Fix racy modification of ForThread::m_state during invocation of stop()

10 years ago · f260b13a6f
parent 37ce3b8cfe
commit f260b13a6f
1 changed files with 4 additions and 0 deletions
--- a/modules/core/src/parallel_pthreads.cpp
+++ b/modules/core/src/parallel_pthreads.cpp
@ -304,14 +304,18 @@ void ForThread::stop()
 {
    if(m_state == eFTStarted)
    {
+        pthread_mutex_lock(&m_thread_mutex);
        m_state = eFTToStop;
+        pthread_mutex_unlock(&m_thread_mutex);

        run();

        pthread_join(m_posix_thread, NULL);
    }

+    pthread_mutex_lock(&m_thread_mutex);
    m_state = eFTStoped;
+    pthread_mutex_unlock(&m_thread_mutex);
 }

 void ForThread::run()