iox-#10 Do not offer iceoryx services on creation

Signed-off-by: Simon Hoinkis <[email protected]>
eclipse-iceoryx · Jun 21, 2022 · bee1e54 · bee1e54
1 parent a34b2e1
commit bee1e54
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 4 deletions.
diff --git a/include/owl/kom/field_publisher.hpp b/include/owl/kom/field_publisher.hpp
@@ -34,6 +34,7 @@ class FieldPublisher
   public:
     using FieldType = T;
     static constexpr uint64_t HISTORY_CAPACITY{1U};
+    static constexpr bool NOT_OFFERED_ON_CREATE{false};
 
     FieldPublisher(const ServiceIdentifier& service,
                    const InstanceIdentifier& instance,
@@ -46,6 +47,9 @@ class FieldPublisher
     FieldPublisher& operator=(const FieldPublisher&) = delete;
     FieldPublisher& operator=(FieldPublisher&&) = delete;
 
+    void Offer() noexcept;
+    void StopOffer() noexcept;
+
     bool Update(const FieldType& userField) noexcept;
 
     void RegisterGetHandler(const iox::cxx::function<void()>) noexcept;

diff --git a/include/owl/kom/field_publisher.inl b/include/owl/kom/field_publisher.inl
@@ -28,11 +28,10 @@ inline FieldPublisher<T>::FieldPublisher(const ServiceIdentifier& service,
                                          const InstanceIdentifier& instance,
                                          const FieldIdentifier& field,
                                          const FieldType& fieldValue) noexcept
-    : m_publisher({service, instance, field}, {HISTORY_CAPACITY})
-    , m_server({service, instance, field})
+    : m_publisher({service, instance, field}, {HISTORY_CAPACITY, iox::NodeName_t(), NOT_OFFERED_ON_CREATE})
+    , m_server({service, instance, field}, {HISTORY_CAPACITY, iox::NodeName_t(), NOT_OFFERED_ON_CREATE})
     , m_latestValue(fieldValue)
 {
-    // publisher is automatically offered
     Update(m_latestValue);
 
     //! [FieldPublisher attach]
@@ -51,6 +50,20 @@ inline FieldPublisher<T>::~FieldPublisher() noexcept
     m_publisher.stopOffer();
 }
 
+template <typename T>
+void FieldPublisher<T>::Offer() noexcept
+{
+    m_publisher.offer();
+    m_server.offer();
+}
+
+template <typename T>
+void FieldPublisher<T>::StopOffer() noexcept
+{
+    m_publisher.stopOffer();
+    m_server.stopOffer();
+}
+
 template <typename T>
 inline bool FieldPublisher<T>::Update(const FieldType& userField) noexcept
 {

diff --git a/include/owl/kom/method_server.hpp b/include/owl/kom/method_server.hpp
@@ -31,6 +31,9 @@ namespace kom
 class MethodServer
 {
   public:
+    static constexpr uint64_t HISTORY_CAPACITY{1U};
+    static constexpr bool NOT_OFFERED_ON_CREATE{false};
+
     MethodServer(const ServiceIdentifier& service,
                  const InstanceIdentifier& instance,
                  const MethodIdentifier& method) noexcept;
@@ -42,6 +45,9 @@ class MethodServer
     MethodServer& operator=(const MethodServer&) = delete;
     MethodServer& operator=(MethodServer&&) = delete;
 
+    void Offer() noexcept;
+    void StopOffer() noexcept;
+
     Future<AddResponse> computeSum(const uint64_t addend1, const uint64_t addend2);
 
   private:

diff --git a/src/minimal_skeleton.cpp b/src/minimal_skeleton.cpp
@@ -32,9 +32,13 @@ MinimalSkeleton::~MinimalSkeleton() noexcept
 void MinimalSkeleton::Offer() noexcept
 {
     m_event.Offer();
+    m_field.Offer();
+    computeSum.Offer();
 }
 
 void MinimalSkeleton::StopOffer() noexcept
 {
     m_event.StopOffer();
+    m_field.StopOffer();
+    computeSum.StopOffer();
 }
diff --git a/src/owl/kom/method_server.cpp b/src/owl/kom/method_server.cpp
@@ -23,7 +23,7 @@ namespace kom
 MethodServer::MethodServer(const ServiceIdentifier& service,
                            const InstanceIdentifier& instance,
                            const MethodIdentifier& method) noexcept
-    : m_server({service, instance, method})
+    : m_server({service, instance, method}, {HISTORY_CAPACITY, iox::NodeName_t(), NOT_OFFERED_ON_CREATE})
 {
     m_listener
         .attachEvent(m_server,
@@ -37,6 +37,16 @@ MethodServer::~MethodServer() noexcept
     m_listener.detachEvent(m_server, iox::popo::ServerEvent::REQUEST_RECEIVED);
 }
 
+void MethodServer::Offer() noexcept
+{
+    m_server.offer();
+}
+
+void MethodServer::StopOffer() noexcept
+{
+    m_server.stopOffer();
+}
+
 Future<AddResponse> MethodServer::computeSum(const uint64_t addend1, const uint64_t addend2)
 {
     // for simplicity we don't create thread here and make the call synchronous