IndexerThreadPool: Tightening of thread safety

2026-04-17 21:11:39 +02:00
parent 2f6be24180
commit 20901579af
2 changed files with 6 additions and 5 deletions
@@ -105,8 +105,9 @@ void IndexerThread::Worker(const IndexingSettings &settings, int threadid) {
        {
            std::unique_lock<std::mutex> lock(m);
            c_start.wait(lock, [this] { return stop || state == TaskState::READY; });
-            if (stop)
+            if (stop && (state != TaskState::READY))
                return;
+            state = TaskState::RUNNING;
            input = std::move(task_input);
        }
        if (input) {
@@ -138,8 +139,8 @@ void IndexerThread::Worker(const IndexingSettings &settings, int threadid) {
                std::unique_lock<std::mutex> lock(m);
                state = TaskState::COMPLETED;
                result = std::move(tmp_result);
-                c_done.notify_all();
            }
+            c_done.notify_all();
        }
    }
 }
@@ -149,7 +150,7 @@ void IndexerThread::Finalize() {
        std::unique_lock<std::mutex> lock(m);
        stop = true;
    }
-    c_start.notify_one();
+    c_start.notify_all();
    if (worker_thread.joinable())
        worker_thread.join();
 }
@@ -173,7 +174,7 @@ std::unique_ptr<IndexerResult> IndexerThread::Run(const DiffractionExperiment &e
        tmp_result = std::move(result);
        state = TaskState::IDLE;
    }
-    return std::move(tmp_result);
+    return tmp_result;
 }

 IndexerThread::~IndexerThread() {