iox-#1036 Remove creation pattern

eclipse-iceoryx · Sep 2, 2023 · 503a0da · 503a0da
1 parent daa1737
commit 503a0da
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 292 deletions.
diff --git a/doc/website/release-notes/iceoryx-unreleased.md b/doc/website/release-notes/iceoryx-unreleased.md
@@ -935,7 +935,7 @@
     #include "iceoryx_hoofs/design_pattern/creation.hpp"
 
     // after
-    #include "iceoryx_dust/design/creation.hpp"
+    // fully removed
     ```
 
     ```cpp

diff --git a/iceoryx_dust/include/iceoryx_dust/design/creation.hpp b/iceoryx_dust/include/iceoryx_dust/design/creation.hpp
diff --git a/iceoryx_dust/include/iceoryx_dust/internal/design/creation.inl b/iceoryx_dust/include/iceoryx_dust/internal/design/creation.inl
diff --git a/iceoryx_posh/include/iceoryx_posh/internal/mepoo/shared_pointer.hpp b/iceoryx_posh/include/iceoryx_posh/internal/mepoo/shared_pointer.hpp
@@ -17,9 +17,9 @@
 #ifndef IOX_POSH_MEPOO_SHARED_POINTER_HPP
 #define IOX_POSH_MEPOO_SHARED_POINTER_HPP
 
-#include "iceoryx_dust/design/creation.hpp"
 #include "iceoryx_posh/internal/mepoo/shared_chunk.hpp"
 #include "iceoryx_posh/mepoo/chunk_header.hpp"
+#include "iox/expected.hpp"
 
 namespace iox
 {
@@ -30,22 +30,22 @@ enum class SharedPointerError
     SharedChunkIsEmpty
 };
 
-/// @brief DesignPattern::Creation offers us a create method which forwards the arguments to
-/// the constructor. Use this class like in the code example below
+/// @brief A typed shared pointer for the untyped 'SharedChunk'.
 /// @code
 ///     // expected
-///     auto sharedPointer = SharedPointer<int>::Create(mySharedChunk, 123);
+///     auto sharedPointer = SharedPointer<int>::create(mySharedChunk, 123);
 ///     if ( sharedPointer.has_error() ) {
 ///         // ...
 ///     } else {
 ///         // ...
 ///     }
 /// @endcode
 template <typename T>
-class SharedPointer : public DesignPattern::Creation<SharedPointer<T>, SharedPointerError>
+class SharedPointer
 {
   public:
-    using CreationPattern_t = DesignPattern::Creation<SharedPointer<T>, SharedPointerError>;
+    template <typename... Targs>
+    static expected<SharedPointer<T>, SharedPointerError> create(const SharedChunk& chunk, Targs&&... args) noexcept;
 
     SharedPointer() = default;
     SharedPointer(const SharedPointer&) = default;
@@ -66,13 +66,15 @@ class SharedPointer : public DesignPattern::Creation<SharedPointer<T>, SharedPoi
 
     explicit operator bool() const noexcept;
 
-    friend class DesignPattern::Creation<SharedPointer<T>, SharedPointerError>;
-
   private:
     template <typename... Targs>
     SharedPointer(const SharedChunk& chunk, Targs&&... args) noexcept;
 
+    SharedPointer(const SharedChunk& chunk) noexcept;
+
     void deleteManagedObjectIfNecessary() noexcept;
+
+  private:
     SharedChunk m_chunk;
 };
 

diff --git a/iceoryx_posh/include/iceoryx_posh/internal/mepoo/shared_pointer.inl b/iceoryx_posh/include/iceoryx_posh/internal/mepoo/shared_pointer.inl
@@ -22,19 +22,23 @@ namespace mepoo
 {
 template <typename T>
 template <typename... Targs>
-inline SharedPointer<T>::SharedPointer(const SharedChunk& chunk, Targs&&... args) noexcept
-    : m_chunk(chunk)
+inline expected<SharedPointer<T>, SharedPointerError> SharedPointer<T>::create(const SharedChunk& chunk,
+                                                                               Targs&&... args) noexcept
 {
-    if (chunk.m_chunkManagement != nullptr)
-    {
-        new (chunk.m_chunkManagement->m_chunkHeader->userPayload()) T(std::forward<Targs>(args)...);
-        this->m_isInitialized = true;
-    }
-    else
+    if (chunk.m_chunkManagement == nullptr)
     {
-        this->m_isInitialized = false;
-        this->m_errorValue = SharedPointerError::SharedChunkIsEmpty;
+        return err(SharedPointerError::SharedChunkIsEmpty);
     }
+
+    new (chunk.m_chunkManagement->m_chunkHeader->userPayload()) T(std::forward<Targs>(args)...);
+
+    return ok(SharedPointer(chunk));
+}
+
+template <typename T>
+inline SharedPointer<T>::SharedPointer(const SharedChunk& chunk) noexcept
+    : m_chunk(chunk)
+{
 }
 
 template <typename T>
@@ -50,8 +54,6 @@ inline SharedPointer<T>& SharedPointer<T>::operator=(const SharedPointer& rhs) n
     {
         deleteManagedObjectIfNecessary();
 
-        CreationPattern_t::operator=(rhs);
-
         m_chunk = rhs.m_chunk;
     }
     return *this;
@@ -64,8 +66,6 @@ inline SharedPointer<T>& SharedPointer<T>::operator=(SharedPointer&& rhs) noexce
     {
         deleteManagedObjectIfNecessary();
 
-        CreationPattern_t::operator=(std::move(rhs));
-
         m_chunk = std::move(rhs.m_chunk);
     }
     return *this;

diff --git a/iceoryx_posh/include/iceoryx_posh/internal/mepoo/typed_mem_pool.hpp b/iceoryx_posh/include/iceoryx_posh/internal/mepoo/typed_mem_pool.hpp
@@ -56,9 +56,6 @@ class TypedMemPool
 
     template <typename... Targs>
     expected<SharedPointer<T>, TypedMemPoolError> createObject(Targs&&... args) noexcept;
-    template <typename ErrorType, typename... Targs>
-    expected<SharedPointer<T>, variant<TypedMemPoolError, ErrorType>>
-    createObjectWithCreationPattern(Targs&&... args) noexcept;
     uint32_t getChunkCount() const noexcept;
     uint32_t getUsedChunks() const noexcept;