Merge pull request #1263 from DARMA-tasking/1258-serialize-missing-fi…

…elds

1258: add missing fields in 'serialize' methods

src/vt/configs/arguments/app_config.h

@@ -301,7 +301,14 @@ struct AppConfig {
       | vt_term_rooted_use_wave
       | vt_hang_freq
 
+      | vt_diag_enable
+      | vt_diag_print_summary
+      | vt_diag_summary_csv_file
+      | vt_diag_summary_file
+      | vt_diag_csv_base_units
+
       | vt_pause
+      | vt_max_mpi_send_size
 
       | vt_debug_all
       | vt_debug_verbose
@@ -336,6 +343,7 @@ struct AppConfig {
       | vt_debug_group
       | vt_debug_broadcast
       | vt_debug_objgroup
+      | vt_debug_phase
 
       | vt_debug_print_flush
 

src/vt/messaging/active.h

@@ -1710,7 +1710,20 @@ struct ActiveMessenger : runtime::component::PollableComponent<ActiveMessenger>
       | in_progress_active_msg_irecv
       | in_progress_data_irecv
       | in_progress_ops
-      | this_node_;
+      | this_node_
+      | amForwardCounterGauge
+      | amHandlerCount
+      | amPollCount
+      | amPostedCounterGauge
+      | amRecvCounterGauge
+      | amSentCounterGauge
+      | bcastsSentCount
+      | dmPollCount
+      | dmPostedCounterGauge
+      | dmRecvCounterGauge
+      | dmSentCounterGauge
+      | tdRecvCount
+      | tdSentCount;
 
   # if vt_check_enabled(trace_enabled)
     s | current_trace_context_

src/vt/messaging/message/smart_ptr.h

@@ -227,6 +227,10 @@ struct MsgSharedPtr final {
       auto ptr = get();
       auto const msg_size = vt::serialization::MsgSizer<MsgType>::get(ptr);
       s.addBytes(msg_size);
+
+      // skip footprinting of members, we rely on message size estimate instead
+      s.skip(impl_);
+      s.skip(ptr_);
     }
   }
 

src/vt/pipe/callback/cb_union/cb_raw.h

@@ -219,37 +219,44 @@ struct GeneralCallback {
 
   template <typename SerializerT>
   void serialize(SerializerT& s) {
-    using EnumDataType = typename std::underlying_type<CallbackEnum>::type;
-    EnumDataType val = static_cast<EnumDataType>(active_);
-    s | val;
-    active_ = static_cast<CallbackEnum>(val);
+    s | active_;
+
+    // serialize actual content of the union and account for leftovers and
+    // padding bytes when footprinting
+    auto union_size = sizeof(this->u_);
+    auto ser = [&](auto& cb){
+      s | cb;
+      s.addBytes(union_size - sizeof(cb));
+    };
+    s.skip(u_);
     switch (active_) {
     case CallbackEnum::AnonCB:
-      s | u_.anon_cb_;
+      ser(u_.anon_cb_);
       break;
     case CallbackEnum::SendMsgCB:
-      s | u_.send_msg_cb_;
+      ser(u_.send_msg_cb_);
       break;
     case CallbackEnum::SendColMsgCB:
-      s | u_.send_col_msg_cb_;
+      ser(u_.send_col_msg_cb_);
       break;
     case CallbackEnum::BcastMsgCB:
-      s | u_.bcast_msg_cb_;
+      ser(u_.bcast_msg_cb_);
       break;
     case CallbackEnum::BcastColMsgCB:
-      s | u_.bcast_col_msg_cb_;
+      ser(u_.bcast_col_msg_cb_);
       break;
     case CallbackEnum::BcastColDirCB:
-      s | u_.bcast_col_dir_cb_;
+      ser(u_.bcast_col_dir_cb_);
       break;
     case CallbackEnum::BcastObjGrpCB:
-      s | u_.bcast_obj_cb_;
+      ser(u_.bcast_obj_cb_);
       break;
     case CallbackEnum::SendObjGrpCB:
-      s | u_.send_obj_cb_;
+      ser(u_.send_obj_cb_);
       break;
     case CallbackEnum::NoCB:
       // Serializing empty callback!
+      s.addBytes(sizeof(u_) - sizeof(active_));
       break;
     default:
       vtAssert(0, "Should be unreachable");

src/vt/pipe/signal/signal.h

@@ -74,6 +74,8 @@ struct Signal : SignalBase {
   template <typename SerializerT>
   void serialize(SerializerT& s) {
     s | signal_tag_;
+
+    s.skip(data_ptr_);
   }
 
 public:

src/vt/rdma/state/rdma_state.h

@@ -158,13 +158,14 @@ struct State {
       | get_tag_holder
       | put_tag_holder
       | pending_tag_gets
-      | pending_tag_puts;
-
-      s.countBytes(user_state_get_msg_);
-      s.countBytes(user_state_put_msg_);
-
-      s.countBytes(rdma_get_fn);
-      s.countBytes(rdma_put_fn);
+      | pending_tag_puts
+      | user_state_get_msg_
+      | user_state_put_msg_
+      | rdma_get_fn
+      | rdma_put_fn
+      | no_rdma_handle
+      | no_rdma_ptr
+      | no_byte;
   }
 
   bool using_default_put_handler = false;

src/vt/rdmahandle/base_handle.h

@@ -160,6 +160,10 @@ struct BaseTypedHandle : BaseHandle {
   void serialize(SerializerT& s) {
     s | count_;
     s | hoff_;
+
+    s.skip(actions_);
+    s.skip(lock_);
+    s.skip(user_buffer_);
   }
 
 protected:

src/vt/rdmahandle/handle_key.h

@@ -91,9 +91,8 @@ struct HandleKey {
 
   template <typename SerializerT>
   void serialize(SerializerT& s) {
-    s | handle_;
-
-    s.countBytes(proxy_);
+    s | handle_
+      | proxy_;
   }
 };
 

src/vt/rdmahandle/manager.h

@@ -238,6 +238,7 @@ struct Manager : runtime::component::Component<Manager> {
       | collective_scope_;
 
     s.addBytes(getHolderFootprint());
+    s.skip(holder_footprint_);
   }
 
 private:

src/vt/termination/graph/epoch_graph.h

@@ -119,6 +119,7 @@ struct EpochGraph {
         s | *successors_[i];
       }
     }
+    s.skip(successors_);
   }
 
 private:

src/vt/termination/interval/integral_set.h

@@ -468,6 +468,8 @@ struct IntegralSetBase {
     if (s.isUnpacking()) {
       hint_ = set_.end();
     }
+    s.skip(hint_);
+
     s | elms_;
   }
 

src/vt/trace/trace.h

@@ -387,6 +387,8 @@ struct Trace : runtime::component::Component<Trace>, TraceLite {
       | flush_event_
       | between_sched_event_type_
       | between_sched_event_;
+
+    s.skip(log_file_); // definition unavailable
   }
 
 private:

src/vt/vrt/collection/balance/elm_stats.impl.h

@@ -68,6 +68,7 @@ void ElementStats::serialize(Serializer& s) {
   s | phase_comm_;
   s | cur_subphase_;
   s | subphase_timings_;
+  s | subphase_comm_;
 }
 
 template <typename ColT>

src/vt/vrt/collection/messages/user.impl.h

@@ -121,6 +121,7 @@ void CollectionMessage<ColT, BaseMsgT>::serialize(SerializerT& s) {
   s | bcast_proxy_;
   s | bcast_epoch_;
   s | is_wrap_;
+  s | from_node_;
 
   #if vt_check_enabled(lblite)
     s | lb_lite_instrument_;

tests/unit/termination/test_term_dep_send_chain.cc

@@ -287,6 +287,7 @@ struct MyCol : vt::Collection<MyCol,vt::Index2D> {
     if (not s.isUnpacking()) {
       vtAssert(op6_msgs_.size() == 0, "Stack should be empty during serialize");
     }
+    s.skip(op6_msgs_);
   }
 
 private:
@@ -439,7 +440,13 @@ struct MyObjGroup {
   }
 
   template <typename SerializerT>
-  void serialize(SerializerT& s) {}
+  void serialize(SerializerT& s) {
+    s | started_
+      | epoch_
+      | backend_proxy_
+      | frontend_proxy_
+      | chains_;
+  }
 
 private:
   // Has an update been started
@@ -634,7 +641,12 @@ struct MergeObjGroup
   }
 
   template <typename SerializerT>
-  void serialize(SerializerT& s) {}
+  void serialize(SerializerT& s) {
+    s | epoch_
+      | backend_proxy_
+      | frontend_proxy_
+      | chains_;
+  }
 
   private: