Solving hang-up after end of simulation

3dgeo-heidelberg · Mar 4, 2024 · 30c5e78 · 30c5e78
1 parent cefd1fc
commit 30c5e78
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/main/helios_version.cpp b/src/main/helios_version.cpp
@@ -4,7 +4,7 @@
 
 const char * HELIOS_VERSION = "1.3.0";
 
-const char * HELIOS_GIT_HASH = "31904380";
+const char * HELIOS_GIT_HASH = "cefd1fce";
 
 const char * getHeliosVersion(){
     return HELIOS_VERSION;

diff --git a/src/util/threadpool/ThreadPool.h b/src/util/threadpool/ThreadPool.h
@@ -77,7 +77,8 @@ class ThreadPool{
 
         // Suppress all exceptions.
         try{
-            threads_.join_all();
+            threads_.interrupt_all();  // Avoid hang-up after end of simulation
+            //threads_.join_all();  // Legacy mode
         }
         catch (const std::exception&) {}
     }