#410: pending send: more improvements for serialized msgs

DARMA-tasking · Dec 18, 2019 · eea3771 · eea3771
1 parent 7bab11f
commit eea3771
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/vt/messaging/pending_send.cc b/src/vt/messaging/pending_send.cc
@@ -63,10 +63,12 @@ void PendingSend::produceConsumeMsg(PendingTermEnum op) {
     auto const is_epoch = envelopeIsEpochType(msg_->env);
     auto const is_term = envelopeIsTerm(msg_->env);
     if (is_epoch and not is_term) {
-      auto ep = envelopeGetEpoch(msg_->env);
+      bool const is_produce = op == PendingTermEnum::Produce;
+      auto const ep = is_produce ? envelopeGetEpoch(msg_->env) : epoch_produced_;
       if (ep != no_epoch and ep != term::any_epoch_sentinel) {
-        if (op == PendingTermEnum::Produce) {
+        if (is_produce) {
           theTerm()->produce(ep,1);
+          epoch_produced_ = ep;
         } else {
           theTerm()->consume(ep,1);
         }

diff --git a/src/vt/messaging/pending_send.h b/src/vt/messaging/pending_send.h
@@ -79,7 +79,8 @@ struct PendingSend final {
   PendingSend(PendingSend&& in)
     : msg_(std::move(in.msg_)),
       msg_size_(std::move(in.msg_size_)),
-      send_action_(std::move(in.send_action_))
+      send_action_(std::move(in.send_action_)),
+      epoch_produced_(std::move(in.epoch_produced_))
   {
     in.msg_ = nullptr;
     in.send_action_ = nullptr;
@@ -105,6 +106,7 @@ struct PendingSend final {
   MsgVirtualPtr<BaseMsgType> msg_ = nullptr;
   ByteType msg_size_ = no_byte;
   SendActionType send_action_ = nullptr;
+  EpochType epoch_produced_ = no_epoch;
 };
 
 }} /* end namespace vt::messaging */