iox-eclipse-iceoryx#938 Destroy publisher before aborting with commun…

…ication policy violation
ApexAI · Feb 18, 2022 · 32aa165 · 32aa165
1 parent d686972
commit 32aa165
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/iceoryx_posh/include/iceoryx_posh/internal/roudi/port_manager.hpp b/iceoryx_posh/include/iceoryx_posh/internal/roudi/port_manager.hpp
@@ -128,12 +128,11 @@ class PortManager
     void removeEntryFromServiceRegistry(const capro::ServiceDescription& service) noexcept;
 
     template <typename T, std::enable_if_t<std::is_same<T, iox::build::OneToManyPolicy>::value>* = nullptr>
-    cxx::optional<RuntimeName_t>
-    doesViolateCommunicationPolicy(const capro::ServiceDescription& service) const noexcept;
+    cxx::optional<RuntimeName_t> doesViolateCommunicationPolicy(const capro::ServiceDescription& service) noexcept;
 
     template <typename T, std::enable_if_t<std::is_same<T, iox::build::ManyToManyPolicy>::value>* = nullptr>
     cxx::optional<RuntimeName_t>
-    doesViolateCommunicationPolicy(const capro::ServiceDescription& service IOX_MAYBE_UNUSED) const noexcept;
+    doesViolateCommunicationPolicy(const capro::ServiceDescription& service IOX_MAYBE_UNUSED) noexcept;
 
     void publishServiceRegistry() const noexcept;
 

diff --git a/iceoryx_posh/include/iceoryx_posh/internal/roudi/port_manager.inl b/iceoryx_posh/include/iceoryx_posh/internal/roudi/port_manager.inl
@@ -1,4 +1,5 @@
 // Copyright (c) 2020 by Robert Bosch GmbH. All rights reserved.
+// Copyright (c) 2022 by Apex.AI Inc. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,20 +17,27 @@
 #ifndef IOX_POSH_INTERNAL_ROUDI_PORT_MANAGER_INL
 #define IOX_POSH_INTERNAL_ROUDI_PORT_MANAGER_INL
 
+#include "iceoryx_posh/internal/roudi/port_manager.hpp"
+
 namespace iox
 {
 namespace roudi
 {
 template <typename T, std::enable_if_t<std::is_same<T, iox::build::OneToManyPolicy>::value>*>
 inline cxx::optional<RuntimeName_t>
-PortManager::doesViolateCommunicationPolicy(const capro::ServiceDescription& service) const noexcept
+PortManager::doesViolateCommunicationPolicy(const capro::ServiceDescription& service) noexcept
 {
     // check if the publisher is already in the list
     for (auto publisherPortData : m_portPool->getPublisherPortDataList())
     {
         popo::PublisherPortRouDi publisherPort(publisherPortData);
         if (service == publisherPort.getCaProServiceDescription())
         {
+            if (publisherPortData->m_toBeDestroyed)
+            {
+                destroyPublisherPort(publisherPortData);
+                continue;
+            }
             return cxx::make_optional<RuntimeName_t>(publisherPortData->m_runtimeName);
         }
     }
@@ -38,7 +46,7 @@ PortManager::doesViolateCommunicationPolicy(const capro::ServiceDescription& ser
 
 template <typename T, std::enable_if_t<std::is_same<T, iox::build::ManyToManyPolicy>::value>*>
 inline cxx::optional<RuntimeName_t>
-PortManager::doesViolateCommunicationPolicy(const capro::ServiceDescription& service IOX_MAYBE_UNUSED) const noexcept
+PortManager::doesViolateCommunicationPolicy(const capro::ServiceDescription& service IOX_MAYBE_UNUSED) noexcept
 {
     // Duplicates are allowed when using n:m policy
     return cxx::nullopt;