iox-eclipse-iceoryx#408 remove memoryInfo from PortOptions

Signed-off-by: Mathias Kraus <mathias.kraus@apex.ai>
ApexAI · Dec 17, 2020 · 5d1bd34 · 5d1bd34
1 parent de142e0
commit 5d1bd34
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 11 deletions.
diff --git a/iceoryx_binding_c/test/moduletests/test_publisher.cpp b/iceoryx_binding_c/test/moduletests/test_publisher.cpp
@@ -107,7 +107,7 @@ class iox_pub_test : public Test
     PublisherPortData m_publisherPortData{ServiceDescription("a", "b", "c"), "myApp", &m_memoryManager};
 
     // publisher port w/ history
-    PublisherOptions m_publisherOptions{MAX_PUBLISHER_HISTORY, mepoo::MemoryInfo()};
+    PublisherOptions m_publisherOptions{MAX_PUBLISHER_HISTORY};
     PublisherPortData m_publisherPortDataHistory{
         capro::ServiceDescription("x", "y", "z"), "myApp", &m_memoryManager, m_publisherOptions};
     cpp2c_Publisher m_sut;

diff --git a/iceoryx_posh/include/iceoryx_posh/internal/popo/ports/publisher_port_data.hpp b/iceoryx_posh/include/iceoryx_posh/internal/popo/ports/publisher_port_data.hpp
@@ -22,6 +22,7 @@
 #include "iceoryx_posh/internal/popo/building_blocks/locking_policy.hpp"
 #include "iceoryx_posh/internal/popo/ports/base_port_data.hpp"
 #include "iceoryx_posh/internal/popo/ports/subscriber_port_data.hpp"
+#include "iceoryx_posh/mepoo/memory_info.hpp"
 #include "iceoryx_posh/popo/publisher_options.hpp"
 
 #include <atomic>
@@ -36,7 +37,8 @@ struct PublisherPortData : public BasePortData
     PublisherPortData(const capro::ServiceDescription& serviceDescription,
                       const ProcessName_t& processName,
                       mepoo::MemoryManager* const memoryManager,
-                      const PublisherOptions& publisherOptions = PublisherOptions()) noexcept;
+                      const PublisherOptions& publisherOptions = PublisherOptions(),
+                      const mepoo::MemoryInfo& memoryInfo = mepoo::MemoryInfo()) noexcept;
 
     using ChunkQueueData_t = SubscriberPortData::ChunkQueueData_t;
     using ChunkDistributorData_t =

diff --git a/iceoryx_posh/include/iceoryx_posh/popo/publisher_options.hpp b/iceoryx_posh/include/iceoryx_posh/popo/publisher_options.hpp
@@ -26,7 +26,6 @@ namespace popo
 struct PublisherOptions
 {
     uint64_t historyCapacity{0};
-    mepoo::MemoryInfo memoryInfo;
 };
 
 } // namespace popo

diff --git a/iceoryx_posh/include/iceoryx_posh/roudi/port_pool.hpp b/iceoryx_posh/include/iceoryx_posh/roudi/port_pool.hpp
@@ -65,7 +65,8 @@ class PortPool
     addPublisherPort(const capro::ServiceDescription& serviceDescription,
                      mepoo::MemoryManager* const memoryManager,
                      const ProcessName_t& applicationName,
-                     const popo::PublisherOptions& publisherOptions = popo::PublisherOptions()) noexcept;
+                     const popo::PublisherOptions& publisherOptions = popo::PublisherOptions(),
+                     const mepoo::MemoryInfo& memoryInfo = mepoo::MemoryInfo()) noexcept;
 
     cxx::expected<SubscriberPortType::MemberType_t*, PortPoolError>
     addSubscriberPort(const capro::ServiceDescription& serviceDescription,

diff --git a/iceoryx_posh/source/popo/ports/publisher_port_data.cpp b/iceoryx_posh/source/popo/ports/publisher_port_data.cpp
@@ -21,9 +21,10 @@ namespace popo
 PublisherPortData::PublisherPortData(const capro::ServiceDescription& serviceDescription,
                                      const ProcessName_t& processName,
                                      mepoo::MemoryManager* const memoryManager,
-                                     const PublisherOptions& publisherOptions) noexcept
+                                     const PublisherOptions& publisherOptions,
+                                     const mepoo::MemoryInfo& memoryInfo) noexcept
     : BasePortData(serviceDescription, processName)
-    , m_chunkSenderData(memoryManager, publisherOptions.historyCapacity, publisherOptions.memoryInfo)
+    , m_chunkSenderData(memoryManager, publisherOptions.historyCapacity, memoryInfo)
 {
 }
 

diff --git a/iceoryx_posh/source/roudi/port_manager.cpp b/iceoryx_posh/source/roudi/port_manager.cpp
@@ -573,8 +573,9 @@ PortManager::acquirePublisherPortData(const capro::ServiceDescription& service,
     }
 
     // we can create a new port
-    auto options = popo::PublisherOptions{historyCapacity, portConfigInfo.memoryInfo};
-    auto maybePublisherPortData = m_portPool->addPublisherPort(service, payloadMemoryManager, processName, options);
+    auto options = popo::PublisherOptions{historyCapacity};
+    auto maybePublisherPortData =
+        m_portPool->addPublisherPort(service, payloadMemoryManager, processName, options, portConfigInfo.memoryInfo);
     if (!maybePublisherPortData.has_error())
     {
         m_portIntrospection.addPublisher(maybePublisherPortData.value(), processName, service, node);

diff --git a/iceoryx_posh/source/roudi/port_pool.cpp b/iceoryx_posh/source/roudi/port_pool.cpp
@@ -134,12 +134,13 @@ cxx::expected<PublisherPortRouDiType::MemberType_t*, PortPoolError>
 PortPool::addPublisherPort(const capro::ServiceDescription& serviceDescription,
                            mepoo::MemoryManager* const memoryManager,
                            const ProcessName_t& applicationName,
-                           const popo::PublisherOptions& publisherOptions) noexcept
+                           const popo::PublisherOptions& publisherOptions,
+                           const mepoo::MemoryInfo& memoryInfo) noexcept
 {
     if (m_portPoolData->m_publisherPortMembers.hasFreeSpace())
     {
         auto publisherPortData = m_portPoolData->m_publisherPortMembers.insert(
-            serviceDescription, applicationName, memoryManager, publisherOptions);
+            serviceDescription, applicationName, memoryManager, publisherOptions, memoryInfo);
         return cxx::success<PublisherPortRouDiType::MemberType_t*>(publisherPortData);
     }
     else

diff --git a/iceoryx_posh/test/moduletests/test_popo_publisher_port.cpp b/iceoryx_posh/test/moduletests/test_popo_publisher_port.cpp
@@ -78,7 +78,7 @@ class PublisherPort_test : public Test
     iox::popo::PublisherPortUser m_sutUserSide{&m_publisherPortData};
 
     // publisher port w/ history
-    iox::popo::PublisherOptions m_publisherPortOptions{iox::MAX_PUBLISHER_HISTORY, iox::mepoo::MemoryInfo()};
+    iox::popo::PublisherOptions m_publisherPortOptions{iox::MAX_PUBLISHER_HISTORY};
     iox::popo::PublisherPortData m_publisherPortDataHistory{
         iox::capro::ServiceDescription("x", "y", "z"), "myApp", &m_memoryManager, m_publisherPortOptions};
     iox::popo::PublisherPortUser m_sutWithHistoryUseriSide{&m_publisherPortDataHistory};