Merge pull request #1034 from ApexAI/iox-#415-remove-application-port

Iox #415 remove application port

CHANGELOG.md

@@ -56,6 +56,7 @@
 - Upgrade GTest/GMock to v1.10 [\#841](https://github.com/eclipse-iceoryx/iceoryx/issues/841)
 - Remove the requirement for INVALID_STATE for the cxx::expected [\#987](https://github.com/eclipse-iceoryx/iceoryx/issues/987)
 - Add unique test identifers [\#988](https://github.com/eclipse-iceoryx/iceoryx/issues/988)
+- Remove `ApplicationPort` and `ApplicationPortData` classes [\#415](https://github.com/eclipse-iceoryx/iceoryx/issues/415)
 
 **API Breaking Changes:**
 

iceoryx_hoofs/include/iceoryx_hoofs/error_handling/error_handling.hpp

@@ -48,7 +48,6 @@ namespace iox
     error(POSH__RUNTIME_ROUDI_REQUEST_EVENT_VARIABLE_WRONG_MESSAGE_QUEUE_RESPONSE) \
     error(POSH__RUNTIME_ROUDI_GET_MW_INTERFACE_WRONG_IPC_MESSAGE_RESPONSE) \
     error(POSH__RUNTIME_ROUDI_CREATE_NODE_WRONG_IPC_MESSAGE_RESPONSE) \
-    error(POSH__RUNTIME_ROUDI_GET_MW_APPLICATION_WRONG_IPC_MESSAGE_RESPONSE) \
     error(POSH__RUNTIME_ROUDI_CONDITION_VARIABLE_CREATION_UNKNOWN_ERROR) \
     error(POSH__RUNTIME_APP_WITH_SAME_RUNTIME_NAME_STILL_RUNNING) \
     error(POSH__RUNTIME_NO_WRITABLE_SHM_SEGMENT) \
@@ -74,7 +73,6 @@ namespace iox
     error(POSH__INTERFACEPORT_CAPRO_MESSAGE_DISMISSED) \
     error(POSH__SERVICE_DISCOVERY_INSTANCE_CONTAINER_OVERFLOW) \
     error(POSH__SERVICE_DISCOVERY_FIND_SERVICE_CALLBACKS_CONTAINER_OVERFLOW) \
-    error(POPO__APPLICATION_PORT_QUEUE_OVERFLOW) \
     error(POPO__BASE_SUBSCRIBER_OVERRIDING_WITH_EVENT_SINCE_HAS_DATA_OR_DATA_RECEIVED_ALREADY_ATTACHED) \
     error(POPO__BASE_SUBSCRIBER_OVERRIDING_WITH_STATE_SINCE_HAS_DATA_OR_DATA_RECEIVED_ALREADY_ATTACHED) \
     error(POPO__CHUNK_QUEUE_POPPER_CHUNK_WITH_INCOMPATIBLE_CHUNK_HEADER_VERSION) \

iceoryx_posh/CMakeLists.txt

@@ -98,8 +98,6 @@ add_library(iceoryx_posh # @todo iox-#590 Rename this to iceoryx_posh_core
     source/mepoo/memory_info.cpp
     source/popo/ports/interface_port.cpp
     source/popo/ports/interface_port_data.cpp
-    source/popo/ports/application_port.cpp
-    source/popo/ports/application_port_data.cpp
     source/popo/ports/base_port_data.cpp
     source/popo/ports/base_port.cpp
     source/popo/ports/publisher_port_data.cpp

iceoryx_posh/include/iceoryx_posh/iceoryx_posh_types.hpp

@@ -109,8 +109,6 @@ static_assert(MAX_NUMBER_OF_EVENTS_PER_LISTENER <= MAX_NUMBER_OF_NOTIFIERS_PER_C
               "The Listener capacity is restricted by the maximum amount of notifiers per condition variable.");
 //--------- Communication Resources End---------------------
 
-constexpr uint32_t MAX_APPLICATION_CAPRO_FIFO_SIZE = 128U;
-
 // Memory
 constexpr uint32_t MAX_NUMBER_OF_MEMPOOLS = 32U;
 constexpr uint32_t MAX_SHM_SEGMENTS = 100U;

iceoryx_posh/include/iceoryx_posh/internal/roudi/port_manager.hpp

@@ -25,7 +25,6 @@
 #include "iceoryx_posh/iceoryx_posh_types.hpp"
 #include "iceoryx_posh/internal/capro/capro_message.hpp"
 #include "iceoryx_posh/internal/mepoo/memory_manager.hpp"
-#include "iceoryx_posh/internal/popo/ports/application_port.hpp"
 #include "iceoryx_posh/internal/popo/ports/interface_port.hpp"
 #include "iceoryx_posh/internal/popo/ports/publisher_port_roudi.hpp"
 #include "iceoryx_posh/internal/popo/ports/publisher_port_user.hpp"
@@ -81,8 +80,6 @@ class PortManager
                                                       const RuntimeName_t& runtimeName,
                                                       const NodeName_t& nodeName = {""}) noexcept;
 
-    popo::ApplicationPortData* acquireApplicationPortData(const RuntimeName_t& runtimeName) noexcept;
-
     cxx::expected<runtime::NodeData*, PortPoolError> acquireNodeData(const RuntimeName_t& runtimeName,
                                                                      const NodeName_t& nodeName) noexcept;
 
@@ -118,8 +115,6 @@ class PortManager
 
     void handleInterfaces() noexcept;
 
-    void handleApplications() noexcept;
-
     void handleNodes() noexcept;
 
     void handleConditionVariables() noexcept;

iceoryx_posh/include/iceoryx_posh/internal/roudi/port_pool_data.hpp

@@ -21,7 +21,6 @@
 #include "iceoryx_hoofs/cxx/vector.hpp"
 #include "iceoryx_posh/iceoryx_posh_types.hpp"
 #include "iceoryx_posh/internal/popo/building_blocks/condition_variable_data.hpp"
-#include "iceoryx_posh/internal/popo/ports/application_port.hpp"
 #include "iceoryx_posh/internal/popo/ports/interface_port.hpp"
 #include "iceoryx_posh/internal/popo/ports/publisher_port_data.hpp"
 #include "iceoryx_posh/internal/popo/ports/subscriber_port_data.hpp"
@@ -54,7 +53,6 @@ class FixedPositionContainer
 struct PortPoolData
 {
     FixedPositionContainer<popo::InterfacePortData, MAX_INTERFACE_NUMBER> m_interfacePortMembers;
-    FixedPositionContainer<popo::ApplicationPortData, MAX_PROCESS_NUMBER> m_applicationPortMembers;
     FixedPositionContainer<runtime::NodeData, MAX_NODE_NUMBER> m_nodeMembers;
     FixedPositionContainer<popo::ConditionVariableData, MAX_NUMBER_OF_CONDITION_VARIABLES> m_conditionVariableMembers;
 

iceoryx_posh/include/iceoryx_posh/internal/roudi/process_manager.hpp

@@ -114,8 +114,6 @@ class ProcessManager : public ProcessManagerInterface
     void
     addInterfaceForProcess(const RuntimeName_t& name, capro::Interfaces interface, const NodeName_t& node) noexcept;
 
-    void addApplicationForProcess(const RuntimeName_t& name) noexcept;
-
     void addNodeForProcess(const RuntimeName_t& process, const NodeName_t& node) noexcept;
 
     void addSubscriberForProcess(const RuntimeName_t& name,

iceoryx_posh/include/iceoryx_posh/internal/runtime/ipc_interface_base.hpp

@@ -58,8 +58,6 @@ enum class IpcMessageType : int32_t
     CREATE_SUBSCRIBER_ACK,
     CREATE_INTERFACE,
     CREATE_INTERFACE_ACK,
-    CREATE_APPLICATION,
-    CREATE_APPLICATION_ACK,
     CREATE_CONDITION_VARIABLE,
     CREATE_CONDITION_VARIABLE_ACK,
     CREATE_NODE,

iceoryx_posh/include/iceoryx_posh/internal/runtime/posh_runtime_impl.hpp

@@ -59,9 +59,6 @@ class PoshRuntimeImpl : public PoshRuntime
     popo::InterfacePortData* getMiddlewareInterface(const capro::Interfaces interface,
                                                     const NodeName_t& nodeName = {""}) noexcept override;
 
-    /// @copydoc PoshRuntime::getMiddlewareApplication
-    popo::ApplicationPortData* getMiddlewareApplication() noexcept override;
-
     /// @copydoc PoshRuntime::getMiddlewareConditionVariable
     popo::ConditionVariableData* getMiddlewareConditionVariable() noexcept override;
 

iceoryx_posh/include/iceoryx_posh/roudi/port_pool.hpp

@@ -20,7 +20,6 @@
 #include "iceoryx_hoofs/cxx/type_traits.hpp"
 #include "iceoryx_posh/iceoryx_posh_types.hpp"
 #include "iceoryx_posh/internal/popo/building_blocks/condition_variable_data.hpp"
-#include "iceoryx_posh/internal/popo/ports/application_port.hpp"
 #include "iceoryx_posh/internal/popo/ports/interface_port.hpp"
 #include "iceoryx_posh/internal/popo/ports/publisher_port_data.hpp"
 #include "iceoryx_posh/internal/popo/ports/publisher_port_roudi.hpp"
@@ -44,7 +43,6 @@ enum class PortPoolError : uint8_t
     PUBLISHER_PORT_LIST_FULL,
     SUBSCRIBER_PORT_LIST_FULL,
     INTERFACE_PORT_LIST_FULL,
-    APPLICATION_PORT_LIST_FULL,
     NODE_DATA_LIST_FULL,
     CONDITION_VARIABLE_LIST_FULL,
     EVENT_VARIABLE_LIST_FULL,
@@ -64,7 +62,6 @@ class PortPool
     cxx::vector<PublisherPortRouDiType::MemberType_t*, MAX_PUBLISHERS> getPublisherPortDataList() noexcept;
     cxx::vector<SubscriberPortType::MemberType_t*, MAX_SUBSCRIBERS> getSubscriberPortDataList() noexcept;
     cxx::vector<popo::InterfacePortData*, MAX_INTERFACE_NUMBER> getInterfacePortDataList() noexcept;
-    cxx::vector<popo::ApplicationPortData*, MAX_PROCESS_NUMBER> getApplicationPortDataList() noexcept;
     cxx::vector<runtime::NodeData*, MAX_NODE_NUMBER> getNodeDataList() noexcept;
     cxx::vector<popo::ConditionVariableData*, MAX_NUMBER_OF_CONDITION_VARIABLES>
     getConditionVariableDataList() noexcept;
@@ -97,9 +94,6 @@ class PortPool
     cxx::expected<popo::InterfacePortData*, PortPoolError> addInterfacePort(const RuntimeName_t& runtimeName,
                                                                             const capro::Interfaces interface) noexcept;
 
-    cxx::expected<popo::ApplicationPortData*, PortPoolError>
-    addApplicationPort(const RuntimeName_t& runtimeName) noexcept;
-
     cxx::expected<runtime::NodeData*, PortPoolError> addNodeData(const RuntimeName_t& runtimeName,
                                                                  const NodeName_t& nodeName,
                                                                  const uint64_t nodeDeviceIdentifier) noexcept;
@@ -110,7 +104,6 @@ class PortPool
     void removePublisherPort(PublisherPortRouDiType::MemberType_t* const portData) noexcept;
     void removeSubscriberPort(SubscriberPortType::MemberType_t* const portData) noexcept;
     void removeInterfacePort(popo::InterfacePortData* const portData) noexcept;
-    void removeApplicationPort(popo::ApplicationPortData* const portData) noexcept;
     void removeNodeData(runtime::NodeData* const nodeData) noexcept;
     void removeConditionVariableData(popo::ConditionVariableData* const conditionVariableData) noexcept;
 

iceoryx_posh/include/iceoryx_posh/runtime/posh_runtime.hpp

@@ -21,7 +21,6 @@
 #include "iceoryx_posh/capro/service_description.hpp"
 #include "iceoryx_posh/iceoryx_posh_types.hpp"
 #include "iceoryx_posh/internal/popo/building_blocks/condition_variable_data.hpp"
-#include "iceoryx_posh/internal/popo/ports/application_port.hpp"
 #include "iceoryx_posh/internal/popo/ports/interface_port.hpp"
 #include "iceoryx_posh/internal/popo/ports/publisher_port_user.hpp"
 #include "iceoryx_posh/internal/popo/ports/subscriber_port_user.hpp"
@@ -115,10 +114,6 @@ class PoshRuntime
     virtual popo::InterfacePortData* getMiddlewareInterface(const capro::Interfaces interface,
                                                             const NodeName_t& nodeName = {}) noexcept = 0;
 
-    /// @brief request the RouDi daemon to create an application port
-    /// @return pointer to a created application port data
-    virtual popo::ApplicationPortData* getMiddlewareApplication() noexcept = 0;
-
     /// @brief request the RouDi daemon to create a condition variable
     /// @return pointer to a created condition variable data
     virtual popo::ConditionVariableData* getMiddlewareConditionVariable() noexcept = 0;