iox-#2499 Add 'IOX_HOOFS_SUBSET as define in iceoryx_hoofs_deployment.hpp'

Author: elBoberido

iceoryx_hoofs/BUILD.bazel

@@ -22,6 +22,7 @@ configure_file(
     src = "cmake/iceoryx_hoofs_deployment.hpp.in",
     out = "generated/include/iox/iceoryx_hoofs_deployment.hpp",
     config_constants = {
+        "IOX_HOOFS_SUBSET": "0",
         "IOX_MAX_NAMED_PIPE_MESSAGE_SIZE": "4096",
         "IOX_MAX_NAMED_PIPE_NUMBER_OF_MESSAGES": "10",
         # FIXME: for values see "iceoryx_hoofs/cmake/IceoryxHoofsDeployment.cmake" ... for now some nice defaults

iceoryx_hoofs/CMakeLists.txt

@@ -104,8 +104,10 @@ iox_add_library(
 )
 
 if(IOX_USE_HOOFS_SUBSET_ONLY)
-    target_compile_definitions(iceoryx_hoofs PUBLIC IOX_HOOFS_SUBSET)
-endif(IOX_USE_HOOFS_SUBSET_ONLY)
+    set(IOX_HOOFS_SUBSET 1)
+else()
+    set(IOX_HOOFS_SUBSET 0)
+endif()
 
 if(NOT IOX_USE_HOOFS_SUBSET_ONLY)
     target_sources(

iceoryx_hoofs/cmake/iceoryx_hoofs_deployment.hpp.in

@@ -19,6 +19,8 @@
 
 #include "iox/iceoryx_hoofs_types.hpp"
 
+#define IOX_HOOFS_SUBSET @IOX_HOOFS_SUBSET@
+
 namespace iox
 {
 namespace build

iceoryx_hoofs/container/include/iox/detail/fixed_position_container.inl

@@ -19,6 +19,7 @@
 #define IOX_HOOFS_CONTAINER_DETAIL_FIXED_POSITION_CONTAINER_INL
 
 #include "iox/fixed_position_container.hpp"
+#include "iox/iceoryx_hoofs_deployment.hpp"
 
 namespace iox
 {
@@ -86,80 +87,6 @@ FixedPositionContainer<T, CAPACITY>::operator=(FixedPositionContainer&& rhs) noe
     return *this;
 }
 
-#ifndef IOX_HOOFS_SUBSET
-template <typename T, uint64_t CAPACITY>
-template <MoveAndCopyOperations Opt, typename RhsType>
-inline void FixedPositionContainer<T, CAPACITY>::copy_and_move_impl(RhsType&& rhs) noexcept
-{
-    // alias helper struct
-    using Helper = MoveAndCopyHelper<Opt>;
-
-    constexpr bool is_ctor = Helper::is_ctor;
-    constexpr bool is_move = Helper::is_move;
-
-    // status array is not yet initialized for constructor creation
-    if constexpr (is_ctor)
-    {
-        for (IndexType i = 0; i < CAPACITY; ++i)
-        {
-            m_status[i] = SlotStatus::FREE;
-        }
-    }
-
-    IndexType i{Index::FIRST};
-    auto rhs_it = (std::forward<RhsType>(rhs)).begin();
-
-    for (; rhs_it.to_index() != Index::INVALID; ++i, ++rhs_it)
-    {
-        if (m_status[i] == SlotStatus::USED)
-        {
-            // When the slot is in the 'USED' state, it is safe to proceed with either construction (ctor) or assignment
-            // operation. Therefore, creation can be carried out according to the option specified by Opt.
-            Helper::transfer(m_data[i], Helper::move_or_copy_it(rhs_it));
-        }
-        else
-        {
-            // When the slot is in the 'FREE' state, it is unsafe to proceed with assignment operation.
-            // Therefore, we need to force helper to use ctor create to make sure that the 'FREE' slots get initialized.
-            Helper::create_new(m_data[i], Helper::move_or_copy_it(rhs_it));
-        }
-
-        m_status[i] = SlotStatus::USED;
-        m_next[i] = static_cast<IndexType>(i + 1U);
-    }
-
-    // reset rest
-    for (; i < CAPACITY; ++i)
-    {
-        if (m_status[i] == SlotStatus::USED)
-        {
-            m_data[i].~T();
-        }
-
-        m_status[i] = SlotStatus::FREE;
-
-        auto next = static_cast<IndexType>(i + 1U);
-        m_next[i] = next;
-    }
-
-    // correct m_next
-    m_next[Index::LAST] = Index::INVALID;
-    if (!rhs.empty())
-    {
-        m_next[rhs.m_size - 1] = Index::INVALID;
-    }
-
-    m_begin_free = static_cast<IndexType>(rhs.m_size);
-    m_begin_used = rhs.empty() ? Index::INVALID : Index::FIRST;
-    m_size = rhs.m_size;
-
-    // reset rhs if is_move is true
-    if constexpr (is_move)
-    {
-        rhs.clear();
-    }
-}
-#else
 template <typename T, uint64_t CAPACITY>
 template <MoveAndCopyOperations Opt, typename RhsType>
 inline void FixedPositionContainer<T, CAPACITY>::copy_and_move_impl(RhsType&& rhs) noexcept
@@ -171,7 +98,11 @@ inline void FixedPositionContainer<T, CAPACITY>::copy_and_move_impl(RhsType&& rh
     constexpr bool is_move = Helper::is_move;
 
     // status array is not yet initialized for constructor creation
+#if IOX_HOOFS_SUBSET
     if (is_ctor)
+#else
+    if constexpr (is_ctor)
+#endif
     {
         for (IndexType i = 0; i < CAPACITY; ++i)
         {
@@ -227,12 +158,15 @@ inline void FixedPositionContainer<T, CAPACITY>::copy_and_move_impl(RhsType&& rh
     m_size = rhs.m_size;
 
     // reset rhs if is_move is true
+#if IOX_HOOFS_SUBSET
     if (is_move)
+#else
+    if constexpr (is_move)
+#endif
     {
         rhs.clear();
     }
 }
-#endif
 
 template <typename T, uint64_t CAPACITY>
 inline void FixedPositionContainer<T, CAPACITY>::clear() noexcept