#1052: epoch: make changes to support memory footprinting

DARMA-tasking · Jan 12, 2021 · 0d5ca12 · 0d5ca12
1 parent 7ff0e70
commit 0d5ca12
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 3 deletions.
diff --git a/src/vt/epoch/epoch_manip.h b/src/vt/epoch/epoch_manip.h
@@ -300,6 +300,13 @@ struct EpochManip : runtime::component::Component<EpochManip> {
    */
   EpochType getArchetype(EpochType epoch) const;
 
+  template <typename SerializerT>
+  void serialize(SerializerT& s) {
+    s | live_scopes_
+      | terminated_epochs_
+      | terminated_collective_epochs_;
+  }
+
 private:
   /**
    * \internal \brief Destroy an eopch scope by removing it

diff --git a/src/vt/epoch/epoch_window.h b/src/vt/epoch/epoch_window.h
@@ -134,7 +134,9 @@ struct EpochWindow {
   template <typename Serializer>
   void serialize(Serializer& s) {
     s | archetype_epoch_
-      | terminated_epochs_;
+      | terminated_epochs_
+      | next_epoch_
+      | total_terminated_;
   }
 
   /**
@@ -147,6 +149,7 @@ struct EpochWindow {
 private:
   /// The archetypical epoch for this window container (category,rooted,user,..)
   EpochType archetype_epoch_ = no_epoch;
+
   /// The set of epochs terminated
   vt::IntegralSet<EpochType> terminated_epochs_;
 

diff --git a/src/vt/runtime/runtime.cc b/src/vt/runtime/runtime.cc
@@ -1157,6 +1157,10 @@ void Runtime::printMemoryFootprint() const {
       printComponentFootprint(
         static_cast<vt::phase::PhaseManager*>(base)
       );
+    } else if (name == "EpochManip") {
+      printComponentFootprint(
+        static_cast<vt::epoch::EpochManip*>(base)
+      );
     #if vt_check_enabled(trace_enabled)
     } else if (name == "Trace") {
       printComponentFootprint(

diff --git a/src/vt/termination/termination.h b/src/vt/termination/termination.h
@@ -642,8 +642,6 @@ struct TerminationDetector :
     s | any_epoch_state_
       | hang_
       | epoch_state_
-      | epoch_arch_
-      | epoch_coll_
       | epoch_ready_
       | epoch_wait_status_
       | has_printed_epoch_graph;

diff --git a/tests/unit/runtime/test_memory_footprint.cc b/tests/unit/runtime/test_memory_footprint.cc
@@ -210,6 +210,10 @@ TEST_F(TestMemoryFootprinting, test_stats_reader) {
   printMemoryFootprint(theStatsReader());
 }
 
+TEST_F(TestMemoryFootprinting, test_epoch) {
+  printMemoryFootprint(theEpoch());
+}
+
 #if vt_check_enabled(trace_enabled)
 TEST_F(TestMemoryFootprinting, test_trace) {
   printMemoryFootprint(theTrace());