Merge pull request OpenDDS#5023 from mitza-oci/rtpsrelay-fixes

Updates from testing RtpsRelay

Author: mitza-oci

dds/DCPS/Message_Block_Ptr.h

@@ -61,6 +61,11 @@ class OpenDDS_Dcps_Export Message_Block_Shared_Ptr {
     return *this;
   }
 
+#ifdef ACE_HAS_CPP11
+  Message_Block_Shared_Ptr(Message_Block_Shared_Ptr&&) = default;
+  Message_Block_Shared_Ptr& operator=(Message_Block_Shared_Ptr&&) = default;
+#endif
+
   operator bool() const { return msg_.get(); }
 
   ACE_Message_Block& operator*() const { return *msg_; }
@@ -123,7 +128,15 @@ class OpenDDS_Dcps_Export Lockable_Message_Block_Ptr {
     return *this;
   }
 
-  Lockable_Message_Block_Ptr& operator=(Lockable_Message_Block_Ptr&&) = default;
+  Lockable_Message_Block_Ptr& operator=(Lockable_Message_Block_Ptr&& other)
+  {
+    if (&other != this) {
+      // msgblock_ first so that this->msgblock_ can use this->lock_ in its own operator=
+      msgblock_ = exchange(other.msgblock_, Message_Block_Shared_Ptr{});
+      lock_ = exchange(other.lock_, Lock_Shared_Ptr{});
+    }
+    return *this;
+  }
 
   Lock_Policy lock_policy() const { return lock_ ? Lock_Policy::Use_Lock : Lock_Policy::No_Lock; }
 
@@ -172,6 +185,15 @@ class OpenDDS_Dcps_Export Lockable_Message_Block_Ptr {
       }
     }
   };
+
+  // In C++14 this is std::exchange
+  template <typename T, typename U = T>
+  T exchange(T& from, U&& to)
+  {
+    const T old = std::move(from);
+    from = std::forward<U>(to);
+    return old;
+  }
 };
 #endif
 

dds/DCPS/RTPS/RtpsDiscovery.cpp

@@ -499,7 +499,7 @@ bool RtpsDiscovery::remove_domain_participant(
   if (domain->second.empty()) {
     participants_.erase(domain);
   }
-  if (participants_.empty()) {
+  if (participants_.empty() && stats_task_) {
     stats_task_->disable();
   }
   g.release();

dds/DCPS/RTPS/Spdp.cpp

@@ -4022,6 +4022,7 @@ Spdp::send_participant_crypto_tokens(const DCPS::GUID_t& id)
     DDS::Security::ParticipantVolatileMessageSecure msg;
     msg.message_identity.source_guid = writer;
     msg.related_message_identity.source_guid = GUID_UNKNOWN;
+    msg.related_message_identity.sequence_number = 0;
     msg.message_class_id = DDS::Security::GMCLASSID_SECURITY_PARTICIPANT_CRYPTO_TOKENS;
     msg.destination_participant_guid = peer;
     msg.destination_endpoint_guid = GUID_UNKNOWN; // unknown = whole participant
@@ -4844,6 +4845,7 @@ void Spdp::fill_stats(DCPS::StatisticSeq& stats) const
   stats[Stats_Index_TotalReaderPending].value = total_reader_pending_;
   stats[Stats_Index_TotalReaderAssociated].value = total_reader_associated_;
   stats[Stats_Index_DirectedGuids].value = tport_ ? tport_->directed_guids_.size() : 0;
+  sedp_->fill_stats(stats, Stats_Len);
 }
 
 DCPS::TopicStatus Spdp::assert_topic(GUID_t& topicId, const char* topicName,

docs/news.d/rtpsrelay-new-statistics.rst

@@ -1,4 +1,4 @@
-.. news-prs: 4990 5000 5006
+.. news-prs: 4990 5000 5006 5023
 
 .. news-start-section: Additions
 - Output from :option:`RtpsRelay -LogRelayStatistics` / :option:`RtpsRelay -PublishRelayStatistics` includes internal OpenDDS statistics

tools/rtpsrelay/GuidAddrSet.h

@@ -170,6 +170,7 @@ class GuidAddrSet {
     , total_ips_(0)
     , total_ports_(0)
     , participant_admission_limit_reached_(false)
+    , last_admit_(true)
   {}
 
   using CreatedAddrSetStats = std::pair<bool, AddrSetStats&>;