iox-#2076 Implement pub/sub options in introspection

Signed-off-by: AlessandroCanossa <[email protected]>
Signed-off-by: Luca Miccio <[email protected]>

Author: AlessandroCanossa

doc/website/release-notes/iceoryx-unreleased.md

@@ -77,6 +77,7 @@
 - Add std::atomic abstraction [#2329](https://github.com/eclipse-iceoryx/iceoryx/issues/2329)
 - Port iceoryx to bzlmod [#2325](https://github.com/eclipse-iceoryx/iceoryx/issues/2325)
 - Make ACL support optional [#1176](https://github.com/eclipse-iceoryx/iceoryx/issues/1176)
+- Implement subscriber/publisher options in introspection [#2076](https://github.com/eclipse-iceoryx/iceoryx/issues/2076)
 
 **Bugfixes:**
 

iceoryx_posh/include/iceoryx_posh/internal/roudi/introspection/port_introspection.hpp

@@ -19,6 +19,8 @@
 
 #include "iceoryx_posh/iceoryx_posh_types.hpp"
 #include "iceoryx_posh/internal/popo/ports/publisher_port_data.hpp"
+#include "iceoryx_posh/popo/publisher_options.hpp"
+#include "iceoryx_posh/popo/subscriber_options.hpp"
 #include "iceoryx_posh/roudi/introspection_types.hpp"
 #include "iox/assertions.hpp"
 #include "iox/atomic.hpp"
@@ -76,12 +78,14 @@ class PortIntrospection
                 : portData(&portData)
                 , process(portData.m_runtimeName)
                 , service(portData.m_serviceDescription)
+                , options(portData.m_options)
             {
             }
 
             typename PublisherPort::MemberType_t* portData{nullptr};
             RuntimeName_t process;
             capro::ServiceDescription service;
+            popo::PublisherOptions options;
 
             /// map from indices to ConnectionContainer indices
             std::map<int, ConnectionContainerIndexType> connectionMap;
@@ -96,12 +100,14 @@ class PortIntrospection
                 : portData(&portData)
                 , process(portData.m_runtimeName)
                 , service(portData.m_serviceDescription)
+                , options(portData.m_options)
             {
             }
 
             typename SubscriberPort::MemberType_t* portData{nullptr};
             RuntimeName_t process;
             capro::ServiceDescription service;
+            popo::SubscriberOptions options;
         };
 
         struct ConnectionInfo

iceoryx_posh/include/iceoryx_posh/internal/roudi/introspection/port_introspection.inl

@@ -552,6 +552,7 @@ PortIntrospection<PublisherPort, SubscriberPort>::PortData::prepareTopic(PortInt
                 publisherData.m_publisherPortID = static_cast<uint64_t>(port.getUniqueID());
                 publisherData.m_sourceInterface = publisherInfo->service.getSourceInterface();
                 publisherData.m_name = publisherInfo->process;
+                publisherData.m_publisherOptions = publisherInfo->options;
 
                 publisherData.m_caproInstanceID = publisherInfo->service.getInstanceIDString();
                 publisherData.m_caproServiceID = publisherInfo->service.getServiceIDString();
@@ -576,6 +577,7 @@ PortIntrospection<PublisherPort, SubscriberPort>::PortData::prepareTopic(PortInt
                 auto& subscriberInfo = connection->subscriberInfo;
 
                 subscriberData.m_name = subscriberInfo.process;
+                subscriberData.m_subscriberOptions = subscriberInfo.options;
 
                 subscriberData.m_caproInstanceID = subscriberInfo.service.getInstanceIDString();
                 subscriberData.m_caproServiceID = subscriberInfo.service.getServiceIDString();

iceoryx_posh/include/iceoryx_posh/roudi/introspection_types.hpp

@@ -19,6 +19,8 @@
 
 #include "iceoryx_posh/capro/service_description.hpp"
 #include "iceoryx_posh/iceoryx_posh_types.hpp"
+#include "iceoryx_posh/popo/publisher_options.hpp"
+#include "iceoryx_posh/popo/subscriber_options.hpp"
 #include "iox/vector.hpp"
 
 namespace iox
@@ -72,13 +74,17 @@ struct PortData
     capro::IdString_t m_caproEventMethodID;
 };
 
-using SubscriberPortData = PortData;
+struct SubscriberPortData : public PortData
+{
+    iox::popo::SubscriberOptions m_subscriberOptions{};
+};
 
 /// @brief container for publisher port introspection data.
 struct PublisherPortData : public PortData
 {
     uint64_t m_publisherPortID{0};
     iox::capro::Interfaces m_sourceInterface{iox::capro::Interfaces::INTERFACE_END};
+    iox::popo::PublisherOptions m_publisherOptions{};
 };
 
 /// @brief the topic for the port introspection that a user can subscribe to