AllocationAdvisor added to replay

LLNL · Nov 27, 2018 · 3c6ee74 · 3c6ee74
1 parent ea78ece
commit 3c6ee74
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 14 deletions.
diff --git a/src/umpire/util/Replay.cpp b/src/umpire/util/Replay.cpp
@@ -72,7 +72,7 @@ Replay* Replay::getReplayLogger()
 }
 
 std::ostream& operator<< (std::ostream& out, umpire::Allocator& alloc) {
-  out << "," << alloc.getName();
+  out << alloc.getName();
   return out;
 }
 

diff --git a/src/umpire/util/Replay.hpp b/src/umpire/util/Replay.hpp
@@ -40,7 +40,7 @@ class Replay {
   template <typename T, typename... Args>
   static std::string printReplayAllocator(T&& firstArg, Args&&... args) {
     std::stringstream ss;
-    ss << firstArg << printReplayAllocator(std::forward<Args>(args)...);
+    ss << "," << firstArg << printReplayAllocator(std::forward<Args>(args)...);
     return ss.str();
   }
 private:

diff --git a/tests/integration/replay/replay_tests.cpp b/tests/integration/replay/replay_tests.cpp
@@ -34,9 +34,22 @@ class replayTest {
         "host_simpool_defaults", rm.getAllocator("HOST"));
     allocatorNames.push_back("host_simpool_defaults");
 
+    rm.makeAllocator<umpire::strategy::DynamicPool>(
+        "host_simpool_spec1", rm.getAllocator("HOST"), 9876, 1234);
+    allocatorNames.push_back("host_simpool_spec1");
+
+    rm.makeAllocator<umpire::strategy::DynamicPool, false>(
+        "host_simpool_spec2", rm.getAllocator("HOST"), 9876, 1234);
+    allocatorNames.push_back("host_simpool_spec2");
+
     rm.makeAllocator<umpire::strategy::AllocationAdvisor>(
       "read_only_um", rm.getAllocator("UM"), "READ_MOSTLY");
     allocatorNames.push_back("read_only_um");
+
+    rm.makeAllocator<umpire::strategy::AllocationAdvisor>(
+      "preferred_location_host", rm.getAllocator("UM"),
+      "PREFERRED_LOCATION", rm.getAllocator("HOST"));
+    allocatorNames.push_back("preferred_location_host");
   }
 
   ~replayTest( void )

diff --git a/tools/replay.cpp b/tools/replay.cpp
@@ -120,23 +120,19 @@ class Replay {
       get_from_string(m_row[m_row.size() - 1], alloc_obj_ref);
 
       if ( m_row[2] == "umpire::strategy::AllocationAdvisor" ) {
-#if 0
         const std::string& name = m_row[4];
-        int id; get_from_string(m_row[5], id);
-        const std::string& allocName = m_row[6];
-        const std::string& adviceOperation = m_row[7];
-
+        const std::string& allocName = m_row[5];
+        const std::string& adviceOperation = m_row[6];
         // Now grab the optional fields
-        if (m_row.size() > 9) {
-          const std::string& accessingAllocatorName = m_row[8];
-          if ( introspection )  m_rm.makeAllocator<umpire::strategy::AllocationAdvisor, true>( name, id, m_rm.getAllocator(allocName), adviceOperation, m_rm.getAllocator(accessingAllocatorName));
-          else                  m_rm.makeAllocator<umpire::strategy::AllocationAdvisor, false>(name, id, m_rm.getAllocator(allocName), adviceOperation, m_rm.getAllocator(accessingAllocatorName));
+        if (m_row.size() > 8) {
+          const std::string& accessingAllocatorName = m_row[7];
+          if ( introspection )  m_rm.makeAllocator<umpire::strategy::AllocationAdvisor, true>( name, m_rm.getAllocator(allocName), adviceOperation, m_rm.getAllocator(accessingAllocatorName));
+          else                  m_rm.makeAllocator<umpire::strategy::AllocationAdvisor, false>(name, m_rm.getAllocator(allocName), adviceOperation, m_rm.getAllocator(accessingAllocatorName));
         }
         else {
-          if ( introspection )  m_rm.makeAllocator<umpire::strategy::AllocationAdvisor, true>( name, id, m_rm.getAllocator(allocName), adviceOperation);
-          else                  m_rm.makeAllocator<umpire::strategy::AllocationAdvisor, false>(name, id, m_rm.getAllocator(allocName), adviceOperation);
+          if ( introspection )  m_rm.makeAllocator<umpire::strategy::AllocationAdvisor, true>( name, m_rm.getAllocator(allocName), adviceOperation);
+          else                  m_rm.makeAllocator<umpire::strategy::AllocationAdvisor, false>(name, m_rm.getAllocator(allocName), adviceOperation);
         }
-#endif
       }
       else if ( m_row[2] == "umpire::strategy::DynamicPool" ) {
         const std::string& name = m_row[4];