common: adding config.hpp entry to disable background profiler thread

bingmann · Apr 26, 2016 · a16e1ef · a16e1ef
1 parent 7d49440
commit a16e1ef
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/thrill/common/config.hpp b/thrill/common/config.hpp
@@ -31,6 +31,9 @@ static constexpr bool g_debug_mode = !g_ndebug;
 //! set false if NDEBUG is set in production mode.
 static constexpr bool g_self_verify = g_debug_mode;
 
+//! global flag to enable background profiler thread
+static constexpr bool g_profile_thread = true;
+
 //! Finding cache line size is hard - we assume 64 byte.
 static constexpr unsigned g_cache_line_size = 64;
 

diff --git a/thrill/common/profile_thread.cpp b/thrill/common/profile_thread.cpp
@@ -13,22 +13,27 @@
 
 #include <thrill/common/profile_thread.hpp>
 
+#include <thrill/common/config.hpp>
+
 namespace thrill {
 namespace common {
 
 /******************************************************************************/
 // ProfileThread
 
 ProfileThread::ProfileThread() {
-    thread_ = std::thread(&ProfileThread::Worker, this);
+    if (common::g_profile_thread)
+        thread_ = std::thread(&ProfileThread::Worker, this);
 }
 
 ProfileThread::~ProfileThread() {
-    std::unique_lock<std::timed_mutex> lock(mutex_);
-    terminate_ = true;
-    cv_.notify_one();
-    lock.unlock();
-    thread_.join();
+    if (common::g_profile_thread) {
+        std::unique_lock<std::timed_mutex> lock(mutex_);
+        terminate_ = true;
+        cv_.notify_one();
+        lock.unlock();
+        thread_.join();
+    }
 
     for (Timer& t : tasks_.container()) {
         if (t.own_task)