Avoid leaking memory when doing lock detection

STEllAR-GROUP · Dec 18, 2015 · 3d7c9c8 · 3d7c9c8
1 parent 9877c5c
commit 3d7c9c8
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 2 deletions.
diff --git a/hpx/config.hpp b/hpx/config.hpp
@@ -426,7 +426,13 @@
 // This limits how deep the internal recursion of future continuations will go
 // before a new operation is re-spawned.
 #if !defined(HPX_CONTINUATION_MAX_RECURSION_DEPTH)
-#if defined(HPX_DEBUG)
+#if defined(__has_feature)
+#  if __has_feature(address_sanitizer)
+// if we build under AddressSanitizer we set the max recursion depth to 1 to not
+// run into stack overflows.
+#define HPX_CONTINUATION_MAX_RECURSION_DEPTH 1
+#  endif
+#elif defined(HPX_DEBUG)
 #define HPX_CONTINUATION_MAX_RECURSION_DEPTH 14
 #else
 #define HPX_CONTINUATION_MAX_RECURSION_DEPTH 20

diff --git a/hpx/util/register_locks.hpp b/hpx/util/register_locks.hpp
@@ -40,6 +40,7 @@ namespace hpx { namespace util
     HPX_API_EXPORT void reset_ignored(void const* lock);
     HPX_API_EXPORT void ignore_all_locks();
     HPX_API_EXPORT void reset_ignored_all();
+    HPX_API_EXPORT void reset_held_lock_data();
 
     ///////////////////////////////////////////////////////////////////////////
     struct ignore_all_while_checking
@@ -188,6 +189,9 @@ namespace hpx { namespace util
     inline void reset_ignored_all()
     {
     }
+    inline void reset_held_lock_data()
+    {
+    }
 #endif
 }}
 

diff --git a/src/runtime.cpp b/src/runtime.cpp
@@ -509,7 +509,7 @@ namespace hpx
     boost::atomic<int> runtime::instance_number_counter_(-1);
 
     ///////////////////////////////////////////////////////////////////////////
-    util::thread_specific_ptr<runtime *, runtime::tls_tag> runtime::runtime_;
+    util::thread_specific_ptr<runtime*, runtime::tls_tag> runtime::runtime_;
     util::thread_specific_ptr<std::string, runtime::tls_tag> runtime::thread_name_;
     util::thread_specific_ptr<boost::uint64_t, runtime::tls_tag> runtime::uptime_;
 
@@ -534,6 +534,7 @@ namespace hpx
         threads::coroutine_type::impl_type::reset_self();
         runtime::uptime_.reset();
         runtime::runtime_.reset();
+        util::reset_held_lock_data();
     }
 
     std::string runtime::get_thread_name()

diff --git a/src/util/register_locks.cpp b/src/util/register_locks.cpp
@@ -135,6 +135,11 @@ namespace hpx { namespace util
 
                 m->ignore_all_locks_ = enable;
             }
+
+            static void reset_held_lock_data()
+            {
+                held_locks_.reset();
+            }
         };
 
         hpx::util::thread_specific_ptr<
@@ -359,6 +364,11 @@ namespace hpx { namespace util
     {
         detail::register_locks::set_ignore_all_locks(false);
     }
+
+    void reset_held_lock_data()
+    {
+        detail::register_locks::reset_held_lock_data();
+    }
 #else
 
     bool register_lock(void const*, util::register_lock_data*)
@@ -394,6 +404,10 @@ namespace hpx { namespace util
     void reset_ignored_all()
     {
     }
+
+    void reset_held_lock_data()
+    {
+    }
 #endif
 }}