Set max sleep period for threads to prevent hanging

misanthropos · May 18, 2022 · 485ac7f · 485ac7f
1 parent 3cc53b1
commit 485ac7f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -21,6 +21,11 @@ if (CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10)
  message(FATAL_ERROR "GCC 10 and later supported only")
 endif ()
 
+# Set Visual Studio startup project
+if (WIN32)
+ set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT ${EXECUTABLE_TITLE})
+endif ()
+
 configure_file(
  "${PROJECT_SOURCE_DIR}/config/config.h.in" 
  "${PROJECT_BINARY_DIR}/config.h"

diff --git a/config/PKGBUILD b/config/PKGBUILD
diff --git a/docs/BUILDING.md b/docs/BUILDING.md
diff --git a/src/easymode.cpp b/src/easymode.cpp
@@ -438,9 +438,9 @@ void WorkerThread::work()
  this->main_cv->notify_all();
  main_lock.unlock();
  }
-
+ 
  // Wait until we get a new job from the main thread
- this->thread_cv.wait(thread_lock);
+ this->thread_cv.wait_for(thread_lock, std::chrono::seconds(MAX_THREAD_SLEEP));
  }
 
  return;
@@ -555,7 +555,7 @@ void scan_easy(const char *directory, const char *overrides_file)
  // Wait for threads to finish scanning
  int num_active = active_threads.size();
  while (num_active) {
- main_cv.wait(main_lock);
+ main_cv.wait_for(main_lock, std::chrono::seconds(MAX_THREAD_SLEEP));
  for (WorkerThread *at : active_threads) {
  if (at->is_finished(error)) {
  num_active--;

diff --git a/src/easymode.hpp b/src/easymode.hpp
@@ -16,6 +16,8 @@
 #define CALC_TIME 1
 #endif
 
+#define MAX_THREAD_SLEEP 30
+
 typedef enum {
  INVALID = -1,
  MP2,