TimeLord serialization

feldergast · Apr 19, 2024 · 771c035 · 771c035
1 parent 1c37903
commit 771c035
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 deletions.
diff --git a/src/sst/core/output.h b/src/sst/core/output.h
@@ -13,6 +13,7 @@
 #define SST_CORE_OUTPUT_H
 
 #include <string.h>
+#include <vector>
 
 // UNCOMMENT OUT THIS LINE TO ENABLE THE DEBUG METHOD -OR_
 // CHOOSE THE --enable-debug OPTION DURING SST CONFIGURATION

diff --git a/src/sst/core/simulation.cc b/src/sst/core/simulation.cc
@@ -1296,6 +1296,7 @@ Simulation_impl::checkpoint()
     ser& currentPriority;
     ser& endSimCycle;
     ser& output_directory;
+    ser& timeLord;
     // Actions that may also be in TV
     ser& m_exit;
     ser& syncManager;
@@ -1327,6 +1328,7 @@ Simulation_impl::checkpoint()
     ser& currentPriority;
     ser& endSimCycle;
     ser& output_directory;
+    ser& timeLord;
     // Actions that may also be in TV
     ser& m_exit;
     ser& syncManager;
@@ -1463,6 +1465,7 @@ Simulation_impl::restart(Config* cfg)
     ser& endSimCycle;
     ser& output_directory;
     printf("outdir: %s\n", output_directory.c_str());
+    ser& timeLord;
     // Actions that may also be in TV
     ser& m_exit;
     printf("here3.1, %s\n", m_exit->toString().c_str());
@@ -1496,6 +1499,9 @@ Simulation_impl::restart(Config* cfg)
         compInfoMap.insert(compInfo);
     }   
 
+    /* Fix-up TimeLord */
+    timeLord.init(timeLord.timeBaseString);
+
     fs.close();
     delete [] buffer;
 

diff --git a/src/sst/core/timeLord.cc b/src/sst/core/timeLord.cc
@@ -176,6 +176,14 @@ TimeLord::getSimCycles(const std::string& ts, const std::string& UNUSED(where))
     return parseCache[ts]->getFactor();
 }
 
+void
+TimeLord::serialize_order(SST::Core::Serialization::serializer& ser)
+{
+    ser& timeBaseString;
+    ser& timeBase;
+    ser& tcMap;
+}
+
 UnitAlgebra
 TimeConverter::getPeriod() const
 {

diff --git a/src/sst/core/timeLord.h b/src/sst/core/timeLord.h
@@ -34,7 +34,7 @@ class UnitAlgebra;
 /**
     Class for creating and managing TimeConverter objects
  */
-class TimeLord
+class TimeLord : public SST::Core::Serialization::serializable
 {
     typedef std::map<SimTime_t, TimeConverter*>   TimeConverterMap_t;
     typedef std::map<std::string, TimeConverter*> StringToTCMap_t;
@@ -76,7 +76,9 @@ class TimeLord
      */
     SimTime_t getSimCycles(const std::string& timeString, const std::string& where);
 
-
+    void serialize_order(SST::Core::Serialization::serializer& ser) override;
+    ImplementSerializable(SST::TimeLord)
+
 private:
     friend class SST::Simulation;
     friend class SST::Simulation_impl;