fixing HPX test bugs

UO-OACISS · Nov 15, 2019 · 3907888 · 3907888
1 parent 69b2ab2
commit 3907888
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/apex/apex.cpp b/src/apex/apex.cpp
@@ -1730,7 +1730,7 @@ std::vector<std::string> get_available_profiles() {
 void print_options() {
     // if APEX is disabled, do nothing.
     if (apex_options::disable() == true) { return; }
-    print_options();
+    apex_options::print_options();
     return;
 }
 

diff --git a/src/apex/policy_handler.cpp b/src/apex/policy_handler.cpp
@@ -33,6 +33,8 @@ namespace apex {
     std::atomic<int> next_id(0);
 
 #ifdef APEX_HAVE_HPX
+    std::atomic<bool> hpx_timer_stopped{false};
+    std::mutex hpx_timer_mutex;
     policy_handler::policy_handler (void) : handler() { }
 #else
     policy_handler::policy_handler (void) : handler() { }
@@ -93,8 +95,13 @@ namespace apex {
     inline void policy_handler::_reset(void) {
 #ifdef APEX_HAVE_HPX
         if (_terminate) {
-                        std::cout << "Stopping HPX timer" << std::endl;
-            hpx_timer.stop();
+            // the timer can only be stopped once, by one thread.
+            std::unique_lock<mutex> l(hpx_timer_mutex);
+            if (!hpx_timer_stopped) {
+                std::cout << "Stopping HPX timer" << std::endl;
+                hpx_timer.stop();
+                hpx_timer_stopped = true;
+            }
         }
 #endif
     }