Merge branch 'develop' of git.nic.uoregon.edu:/gitroot/xpress-apex in…

…to develop
UO-OACISS · Nov 18, 2019 · 2ad3986 · 2ad3986
2 parents 0fd3c40 + 7d91ea3
commit 2ad3986
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/etc/buildbot_hpx.sh b/etc/buildbot_hpx.sh
@@ -158,7 +158,7 @@ test_step()
     export CTEST_OUTPUT_ON_FAILURE=1
     export APEX_SCREEN_OUTPUT=1
     make ${1} tests.examples
-    ctest -V --timeout 10 -R tests.examples
+    ctest --timeout 100 -R tests.examples
 }
 
 install_step()

diff --git a/src/apex/apex.cpp b/src/apex/apex.cpp
@@ -1115,7 +1115,7 @@ std::shared_ptr<task_wrapper> update_task(
     APEX_ASSERT(wrapper != nullptr);
     task_identifier * id = task_identifier::get_task_id(timer_name);
     if (id != wrapper->get_task_id()) {
-        wrapper->aliases.insert(id);
+        wrapper->alias = id;
         /* printf("New alias: %s to %s\n",
            wrapper->task_id->get_name().c_str(), timer_name.c_str()); */
     }

diff --git a/src/apex/task_wrapper.hpp b/src/apex/task_wrapper.hpp
@@ -56,11 +56,11 @@ struct task_wrapper {
   */
     std::vector<profiler*> data_ptr;
 /**
-  \brief An unordered set of other names for this task.  If the task changes names
+  \brief If the task changes names
          after creation (due to the application of an annotation) then the alias
          becomes the new task_identifier for the task.
   */
-    std::unordered_set<task_identifier*> aliases;
+    task_identifier* alias;
 /**
   \brief Constructor.
   */
@@ -69,22 +69,16 @@ struct task_wrapper {
         prof(nullptr),
         guid(0ull),
         parent_guid(0ull),
-        parent(nullptr)
+        parent(nullptr),
+        alias(nullptr)
     { }
 /**
   \brief Get the task_identifier for this task_wrapper.
   \returns A pointer to the task_identifier
   */
     inline task_identifier * get_task_id(void) {
-        if (!aliases.empty()) {
-            task_identifier * id = nullptr;
-            // find the first alias that isn't the same as the original name
-            for (auto tmp : aliases) {
-                if (tmp != id) {
-                    id = tmp;
-                    return id;
-                }
-            }
+        if (alias != nullptr) {
+            return alias;
         }
         return task_id;
     }