Run Github Ubuntu CI on PRs (#4598)

* Refs #20679: Run Github Ubuntu CI on PRs Signed-off-by: EduPonz <[email protected]> * Refs #20679: Fix remaining hidden overloads Signed-off-by: EduPonz <[email protected]> * Refs #20679: Run CI on PRs to intermediate branches Signed-off-by: EduPonz <[email protected]> --------- Signed-off-by: EduPonz <[email protected]> (cherry picked from commit 7154a57) # Conflicts: # .github/workflows/address-sanitizers.yaml # .github/workflows/documentation-tests.yaml # .github/workflows/mac-ci.yml # .github/workflows/thread-sanitizer.yaml # .github/workflows/windows-ci.yml # src/cpp/fastdds/domain/DomainParticipantImpl.hpp # src/cpp/statistics/rtps/monitor-service/MonitorServiceListener.hpp # test/blackbox/common/BlackboxTestsDiscovery.cpp
eProsima · Mar 22, 2024 · 9c42ff2 · 9c42ff2
1 parent d4f57b0
commit 9c42ff2
Show file tree

Hide file tree

Showing 28 changed files with 350 additions and 0 deletions.
diff --git a/.github/workflows/address-sanitizers.yaml b/.github/workflows/address-sanitizers.yaml
@@ -13,8 +13,11 @@ on:
         default: '2.6.x'
 
   pull_request:
+<<<<<<< HEAD
     branches:
       - '2.6.x'
+=======
+>>>>>>> 7154a57a0 (Run Github Ubuntu CI on PRs (#4598))
     paths-ignore:
       - '**.md'
       - '**.txt'

diff --git a/.github/workflows/documentation-tests.yaml b/.github/workflows/documentation-tests.yaml
@@ -9,8 +9,11 @@ on:
         default: '2.6.x'
 
   pull_request:
+<<<<<<< HEAD
     branches:
       - '2.6.x'
+=======
+>>>>>>> 7154a57a0 (Run Github Ubuntu CI on PRs (#4598))
     paths-ignore:
       - '**.md'
       - '**.txt'

diff --git a/.github/workflows/mac-ci.yml b/.github/workflows/mac-ci.yml
@@ -25,8 +25,11 @@ on:
         required: true
 
   pull_request:
+<<<<<<< HEAD
     branches:
       - '2.6.x'
+=======
+>>>>>>> 7154a57a0 (Run Github Ubuntu CI on PRs (#4598))
     paths-ignore:
       - '**.md'
       - '**.txt'

diff --git a/.github/workflows/thread-sanitizer.yaml b/.github/workflows/thread-sanitizer.yaml
@@ -16,8 +16,11 @@ on:
         type: string
 
   pull_request:
+<<<<<<< HEAD
     branches:
       - '2.6.x'
+=======
+>>>>>>> 7154a57a0 (Run Github Ubuntu CI on PRs (#4598))
     paths-ignore:
       - '**.md'
       - '**.txt'

diff --git a/.github/workflows/ubuntu-ci.yml b/.github/workflows/ubuntu-ci.yml
@@ -24,6 +24,12 @@ on:
         type: string
         required: true
 
+  pull_request:
+    paths-ignore:
+      - '**.md'
+      - '**.txt'
+      - '!**/CMakeLists.txt'
+
 concurrency:
   group: ${{ github.workflow }}
   cancel-in-progress: true

diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml
@@ -25,8 +25,11 @@ on:
         required: true
 
   pull_request:
+<<<<<<< HEAD
     branches:
       - '2.6.x'
+=======
+>>>>>>> 7154a57a0 (Run Github Ubuntu CI on PRs (#4598))
     paths-ignore:
       - '**.md'
       - '**.txt'

diff --git a/include/fastrtps/subscriber/SubscriberHistory.h b/include/fastrtps/subscriber/SubscriberHistory.h
@@ -179,6 +179,10 @@ class SubscriberHistory : public rtps::ReaderHistory
 
 private:
 
+    using rtps::ReaderHistory::completed_change;
+    using rtps::ReaderHistory::received_change;
+    using rtps::ReaderHistory::remove_change_nts;
+
     using t_m_Inst_Caches = std::map<rtps::InstanceHandle_t, KeyedChanges>;
 
     //!Map where keys are instance handles and values vectors of cache changes

diff --git a/src/cpp/fastdds/domain/DomainParticipantImpl.hpp b/src/cpp/fastdds/domain/DomainParticipantImpl.hpp
@@ -525,6 +525,62 @@ class DomainParticipantImpl
 
     class MyRTPSParticipantListener : public fastrtps::rtps::RTPSParticipantListener
     {
+<<<<<<< HEAD
+=======
+        struct Sentry
+        {
+            Sentry(
+                    MyRTPSParticipantListener* listener)
+                : listener_(listener)
+                , on_guard_(false)
+            {
+                std::lock_guard<std::mutex> _(listener_->participant_->mtx_gs_);
+                if (listener_ != nullptr && listener_->participant_ != nullptr &&
+                        listener_->participant_->listener_ != nullptr &&
+                        listener_->participant_->participant_ != nullptr)
+                {
+                    if (listener_->callback_counter_ >= 0)
+                    {
+                        ++listener_->callback_counter_;
+                        on_guard_ = true;
+                    }
+                }
+            }
+
+            ~Sentry()
+            {
+                if (on_guard_)
+                {
+                    bool notify = false;
+                    {
+                        std::lock_guard<std::mutex> lock(listener_->participant_->mtx_gs_);
+                        assert(
+                            listener_ != nullptr && listener_->participant_ != nullptr && listener_->participant_->listener_ != nullptr &&
+                            listener_->participant_->participant_ != nullptr);
+                        --listener_->callback_counter_;
+                        notify = !listener_->callback_counter_;
+                    }
+                    if (notify)
+                    {
+                        listener_->participant_->cv_gs_.notify_all();
+                    }
+                }
+            }
+
+            operator bool () const
+            {
+                return on_guard_;
+            }
+
+            MyRTPSParticipantListener* listener_ = nullptr;
+            bool on_guard_;
+        };
+
+        using fastrtps::rtps::RTPSParticipantListener::onParticipantDiscovery;
+        using fastrtps::rtps::RTPSParticipantListener::onReaderDiscovery;
+        using fastrtps::rtps::RTPSParticipantListener::onWriterDiscovery;
+
+>>>>>>> 7154a57a0 (Run Github Ubuntu CI on PRs (#4598))
     public:
 
         MyRTPSParticipantListener(

diff --git a/src/cpp/fastdds/publisher/DataWriterImpl.hpp b/src/cpp/fastdds/publisher/DataWriterImpl.hpp
@@ -378,6 +378,10 @@ class DataWriterImpl : protected rtps::IReaderDataFilter
                 const fastrtps::rtps::ReaderProxyData* reader_info) override;
 
         DataWriterImpl* data_writer_;
+
+    private:
+
+        using fastrtps::rtps::WriterListener::onWriterMatched;
     }
     writer_listener_;
 

diff --git a/src/cpp/fastdds/subscriber/DataReaderImpl.hpp b/src/cpp/fastdds/subscriber/DataReaderImpl.hpp
@@ -389,6 +389,10 @@ class DataReaderImpl
                 int32_t sample_lost_since_last_update) override;
 
         DataReaderImpl* data_reader_;
+
+    private:
+
+        using fastrtps::rtps::ReaderListener::onReaderMatched;
     }
     reader_listener_;
 

diff --git a/src/cpp/fastrtps_deprecated/participant/ParticipantImpl.h b/src/cpp/fastrtps_deprecated/participant/ParticipantImpl.h
@@ -233,6 +233,12 @@ class ParticipantImpl
 
         ParticipantImpl* mp_participantimpl;
 
+    private:
+
+        using rtps::RTPSParticipantListener::onParticipantDiscovery;
+        using rtps::RTPSParticipantListener::onReaderDiscovery;
+        using rtps::RTPSParticipantListener::onWriterDiscovery;
+
     }
     m_rtps_listener;
 

diff --git a/src/cpp/fastrtps_deprecated/publisher/PublisherImpl.h b/src/cpp/fastrtps_deprecated/publisher/PublisherImpl.h
@@ -243,6 +243,10 @@ class PublisherImpl
                 const LivelinessLostStatus& status) override;
 
         PublisherImpl* mp_publisherImpl;
+
+    private:
+
+        using rtps::WriterListener::onWriterMatched;
     }
     m_writerListener;
 

diff --git a/src/cpp/fastrtps_deprecated/subscriber/SubscriberImpl.h b/src/cpp/fastrtps_deprecated/subscriber/SubscriberImpl.h
@@ -221,6 +221,10 @@ class SubscriberImpl
                 rtps::RTPSReader* reader,
                 const LivelinessChangedStatus& status) override;
         SubscriberImpl* mp_subscriberImpl;
+
+    private:
+
+        using rtps::ReaderListener::onReaderMatched;
     }
     m_readerListener;
 

diff --git a/src/cpp/rtps/DataSharing/ReaderPool.hpp b/src/cpp/rtps/DataSharing/ReaderPool.hpp
@@ -283,6 +283,8 @@ class ReaderPool : public DataSharingPayloadPool
 
 private:
 
+    using DataSharingPayloadPool::init_shared_memory;
+
     bool is_volatile_;              //< Whether the reader is volatile or not
     uint64_t next_payload_;         //< Index of the next history position to read
     SequenceNumber_t last_sn_;      //< Sequence number of the last read payload

diff --git a/src/cpp/rtps/DataSharing/WriterPool.hpp b/src/cpp/rtps/DataSharing/WriterPool.hpp
@@ -353,6 +353,8 @@ class WriterPool : public DataSharingPayloadPool
 
 private:
 
+    using DataSharingPayloadPool::init_shared_memory;
+
     octet* payloads_pool_;          //< Shared pool of payloads
 
     uint32_t max_data_size_;        //< Maximum size of the serialized payload data

diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPClient.h b/src/cpp/rtps/builtin/discovery/participant/PDPClient.h
@@ -173,6 +173,8 @@ class PDPClient : public PDP
 
 private:
 
+    using PDP::announceParticipantState;
+
     /**
      * Manually match the local PDP reader with the PDP writer of a given server. The function is
      * not thread safe (nts) in the sense that it does not take the PDP mutex. It does however take

diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPServer.hpp b/src/cpp/rtps/builtin/discovery/participant/PDPServer.hpp
@@ -312,6 +312,8 @@ class PDPServer : public fastrtps::rtps::PDP
 
 private:
 
+    using fastrtps::rtps::PDP::announceParticipantState;
+
 #if HAVE_SECURITY
     /**
      * Returns whether discovery should be secured

diff --git a/src/cpp/rtps/history/BasicPayloadPool_impl/Base.hpp b/src/cpp/rtps/history/BasicPayloadPool_impl/Base.hpp
@@ -18,6 +18,8 @@
 
 class BaseImpl : public IPayloadPool
 {
+public:
+
     bool get_payload(
             uint32_t size,
             CacheChange_t& cache_change) override

diff --git a/src/cpp/rtps/history/BasicPayloadPool_impl/PreallocatedWithRealloc.hpp b/src/cpp/rtps/history/BasicPayloadPool_impl/PreallocatedWithRealloc.hpp
@@ -39,5 +39,7 @@ class Impl<PREALLOCATED_WITH_REALLOC_MEMORY_MODE> : public BaseImpl
 
 private:
 
+    using BaseImpl::get_payload;
+
     uint32_t min_payload_size_;
 };
diff --git a/src/cpp/rtps/history/TopicPayloadPool_impl/Dynamic.hpp b/src/cpp/rtps/history/TopicPayloadPool_impl/Dynamic.hpp
@@ -86,6 +86,10 @@ class DynamicTopicPayloadPool : public TopicPayloadPool
         return DYNAMIC_RESERVE_MEMORY_MODE;
     }
 
+private:
+
+    using TopicPayloadPool::get_payload;
+
 };
 
 }  // namespace rtps

diff --git a/src/cpp/rtps/history/TopicPayloadPool_impl/DynamicReusable.hpp b/src/cpp/rtps/history/TopicPayloadPool_impl/DynamicReusable.hpp
@@ -41,6 +41,10 @@ class DynamicReusableTopicPayloadPool : public TopicPayloadPool
         return DYNAMIC_REUSABLE_MEMORY_MODE;
     }
 
+private:
+
+    using TopicPayloadPool::get_payload;
+
 };
 
 }  // namespace rtps

diff --git a/src/cpp/rtps/history/TopicPayloadPool_impl/Preallocated.hpp b/src/cpp/rtps/history/TopicPayloadPool_impl/Preallocated.hpp
@@ -80,6 +80,8 @@ class PreallocatedTopicPayloadPool : public TopicPayloadPool
 
 private:
 
+    using TopicPayloadPool::get_payload;
+
     uint32_t payload_size_;
     uint32_t minimum_pool_size_;    //< Minimum initial pool size (sum of all histories)
 };

diff --git a/src/cpp/rtps/history/TopicPayloadPool_impl/PreallocatedWithRealloc.hpp b/src/cpp/rtps/history/TopicPayloadPool_impl/PreallocatedWithRealloc.hpp
@@ -80,6 +80,8 @@ class PreallocatedReallocTopicPayloadPool : public TopicPayloadPool
 
 private:
 
+    using TopicPayloadPool::get_payload;
+
     uint32_t min_payload_size_;
     uint32_t minimum_pool_size_;    //< Minimum initial pool size (sum of all histories)
 };

diff --git a/src/cpp/rtps/transport/TCPTransportInterface.h b/src/cpp/rtps/transport/TCPTransportInterface.h
@@ -71,6 +71,8 @@ class TCPTransportInterface : public TransportInterface
 
     std::atomic<bool> alive_;
 
+    using TransportInterface::transform_remote_locator;
+
 protected:
 
     std::vector<fastrtps::rtps::IPFinder::info_IP> current_interfaces_;

diff --git a/src/cpp/rtps/transport/UDPTransportInterface.h b/src/cpp/rtps/transport/UDPTransportInterface.h
@@ -38,6 +38,8 @@ class UDPTransportInterface : public TransportInterface
 {
     friend class UDPSenderResource;
 
+    using TransportInterface::transform_remote_locator;
+
 public:
 
     ~UDPTransportInterface() override;

diff --git a/src/cpp/rtps/transport/shared_mem/SharedMemTransport.h b/src/cpp/rtps/transport/shared_mem/SharedMemTransport.h
@@ -194,6 +194,8 @@ class SharedMemTransport : public TransportInterface
 
 private:
 
+    using TransportInterface::transform_remote_locator;
+
     //! Constructor with no descriptor is necessary for implementations derived from this class.
     SharedMemTransport();