Adds immediate migration results in progress

qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/generic_data_reader.h

@@ -47,19 +47,19 @@ public:
               const std::string &topicName = DDS::Helper::getShortTopicName(DDS::topic_type_name<TopicType>::value()),
               bool bCreateDataReader = true)
   {
-    DEBUG_LOG() << "IN GenericDataReader::create ("
+    DEBUG_LOG(m_logger) << "IN GenericDataReader::create ("
                         << DDS::topic_type_name<TopicType>::value()
                         << "), this: " << this;
 
     if (domainParticipant == nullptr)
     {
-      ERROR_LOG() << "DomainParticipant does not exist ";
+      ERROR_LOG(m_logger) << "DomainParticipant does not exist ";
       return false;
     }
 
     if (m_ddsTopic != nullptr)
     {
-      ERROR_LOG() << "Type '"
+      ERROR_LOG(m_logger) << "Type '"
                           << DDS::topic_type_name<TopicType>::value()
                           << "' already created";
       return false;
@@ -67,7 +67,7 @@ public:
 
     try
     {
-      DEBUG_LOG() << "Creating read topic " << topicName << " with type: "
+      DEBUG_LOG(m_logger) << "Creating read topic " << topicName << " with type: "
                           << DDS::topic_type_name<TopicType>::value();
 
       m_ddsTopic = dds::topic::find<DataTopic>(domainParticipant, topicName);
@@ -79,9 +79,9 @@ public:
         dds::sub::qos::SubscriberQos subscriberQoS = ddsSubscriber.qos();
         dds::core::policy::Partition partition = subscriberQoS.policy<dds::core::policy::Partition>();
         dds::core::StringSeq parititionNames = partition.name();
-        DEBUG_LOG() << "Subscribing partitions: " << parititionNames.size();
+        DEBUG_LOG(m_logger) << "Subscribing partitions: " << parititionNames.size();
         for (const std::string &name : parititionNames)
-          DEBUG_LOG() << " partition name = " << name;
+          DEBUG_LOG(m_logger) << " partition name = " << name;
       }
 
       if (bCreateDataReader)
@@ -90,7 +90,7 @@ public:
         m_dataReader = DataReader(ddsSubscriber, m_ddsTopic, drQos);
         if (m_dataReader == nullptr)
         {
-          ERROR_LOG() << "Creating dataReader for '" << topicName << "' with type: '"
+          ERROR_LOG(m_logger) << "Creating dataReader for '" << topicName << "' with type: '"
                               << DDS::topic_type_name<TopicType>::value()
                               << "' failed";
           return false;
@@ -99,11 +99,11 @@ public:
     }
     catch (const dds::core::Exception &ex)
     {
-      ERROR_LOG() << ex.what();
+      ERROR_LOG(m_logger) << ex.what();
       return false;
     }
 
-    DEBUG_LOG() << "dataReader created ("
+    DEBUG_LOG(m_logger) << "dataReader created ("
                         << DDS::topic_type_name<TopicType>::value()
                         << ")";
 
@@ -114,7 +114,7 @@ public:
   bool hasSamples() const
   {
     qint64 sampleSize = m_dataReader->datareader_cache_status().sample_count();
-    DEBUG_LOG() << "sampleSize = " << sampleSize;
+    DEBUG_LOG(m_logger) << "sampleSize = " << sampleSize;
     return sampleSize > 0;
   }
 
@@ -124,7 +124,7 @@ public:
   {
     dds::sub::LoanedSamples<TopicTypeRead> samples =
       m_dataReader.select().state(dds::sub::status::InstanceState::alive()).read();
-    TRACE_LOG() << "readAlive for " << DDS::topic_type_name<TopicType>::value()
+    TRACE_LOG(m_logger) << "readAlive for " << DDS::topic_type_name<TopicType>::value()
                         << ", count: " << samples.length()
                         << ", this: " << this << ", instance handle " << m_dataReader.instance_handle();
 
@@ -138,7 +138,7 @@ public:
   {
     dds::sub::LoanedSamples<TopicTypeRead> samples =
       m_dataReader.select().state(dds::sub::status::InstanceState::alive()).take();
-    TRACE_LOG() << "takeAlive for " << DDS::topic_type_name<TopicType>::value()
+    TRACE_LOG(m_logger) << "takeAlive for " << DDS::topic_type_name<TopicType>::value()
                         << ", count: " << samples.length()
                         << ", this: " << this << ", instance handle " << m_dataReader.instance_handle();
 
@@ -150,7 +150,7 @@ public:
   {
     dds::sub::LoanedSamples<TopicTypeRead> samples =
       m_dataReader.select().state(dds::sub::status::InstanceState::not_alive_disposed()).take();
-    TRACE_LOG() << "takeDisposed for " << DDS::topic_type_name<TopicType>::value()
+    TRACE_LOG(m_logger) << "takeDisposed for " << DDS::topic_type_name<TopicType>::value()
                         << ", count: " << samples.length()
                         << ", this: " << this << ", instance handle " << m_dataReader.instance_handle();
     return samples;
@@ -159,18 +159,18 @@ public:
   template<typename C>
   bool read(C callbackFunc)
   {
-    DEBUG_LOG() << "IN read ("
+    DEBUG_LOG(m_logger) << "IN read ("
                         << DDS::topic_type_name<TopicType>::value()
                         << "), this: " << this << ", instance handle " << m_dataReader.instance_handle();
 
     if (m_dataReader == nullptr)
     {
-      ERROR_LOG() << "No dataReader initialised ";
+      ERROR_LOG(m_logger) << "No dataReader initialised ";
       return false;
     }
     if (!isValid(callbackFunc))
     {
-      ERROR_LOG() << "No subscriber set for "
+      ERROR_LOG(m_logger) << "No subscriber set for "
                           << DDS::topic_type_name<TopicType>::value();
       return false;
     }
@@ -189,7 +189,7 @@ public:
       }
     }
 
-    DEBUG_LOG() << "got " << samples.size() + m_newSamplesDuringRead.size() << " samples from reader for "
+    DEBUG_LOG(m_logger) << "got " << samples.size() + m_newSamplesDuringRead.size() << " samples from reader for "
                         << DDS::topic_type_name<TopicType>::value();
 
     for (const SampleStruct &ss : samples)
@@ -265,7 +265,7 @@ private:
     if (samples.length() == 0)
       return false;
 
-    DEBUG_LOG() << "got " << samples.length() << " disposed instances from reader for "
+    DEBUG_LOG(m_logger) << "got " << samples.length() << " disposed instances from reader for "
                         << DDS::topic_type_name<TopicType>::value();
 
     for (const auto &sample : samples)