Merge pull request eclipse-iceoryx#1865 from ApexAI/iox-1391-move-des…

…ign-types-to-separate-module iox-1391 move design types to separate module
ApexAI · Feb 3, 2023 · 5c55953 · 5c55953
2 parents 2dd519c + d880c2d
commit 5c55953
Show file tree

Hide file tree

Showing 46 changed files with 319 additions and 225 deletions.
diff --git a/.clang-tidy-diff-scans.txt b/.clang-tidy-diff-scans.txt
@@ -51,6 +51,9 @@
 ./iceoryx_hoofs/vocabulary/**/*
 ./iceoryx_hoofs/test/moduletests/test_vocabulary_*
 
+./iceoryx_hoofs/design/**/*
+./iceoryx_hoofs/test/moduletests/test_design_*
+
 # IMPORTANT:
 #    after the first # everything is considered a comment, add new files and
 #    directories only at the top of this file

diff --git a/doc/website/release-notes/iceoryx-unreleased.md b/doc/website/release-notes/iceoryx-unreleased.md
@@ -77,7 +77,7 @@
 - posix wrapper `SharedMemoryObject` is silent on success [\#971](https://github.com/eclipse-iceoryx/iceoryx/issues/971)
 - Remove creation design pattern class with in place implementation [\#1036](https://github.com/eclipse-iceoryx/iceoryx/issues/1036)
   - posix wrapper `SharedMemoryObject` uses builder pattern instead of creation
-  - Builder pattern extracted from `helplets.hpp` into `design_pattern/builder.hpp`
+  - Builder pattern extracted from `helplets.hpp` into `iox/builder.hpp`
 - Uninteresting mock function calls in tests [\#1341](https://github.com/eclipse-iceoryx/iceoryx/issues/1341)
 - `cxx::unique_ptr` owns deleter, remove all deleter classes [\#1143](https://github.com/eclipse-iceoryx/iceoryx/issues/1143)
 - Remove `iox::posix::Timer` [\#337](https://github.com/eclipse-iceoryx/iceoryx/issues/337)
@@ -146,14 +146,14 @@
                             .create();
     ```
 
-2. Builder pattern extracted from `helplets.hpp` into `design_pattern/builder.hpp`
+2. Builder pattern extracted from `helplets.hpp` into `iox/builder.hpp`
 
     ```cpp
     // before
     #include "iceoryx_hoofs/cxx/helplets.hpp"
 
     // after
-    #include "iceoryx_hoofs/design_pattern/builder.hpp"
+    #include "iox/builder.hpp"
     ```
 
 3. `UnnamedSemaphore` replaces `Semaphore` with `CreateUnnamed*` option
@@ -220,7 +220,7 @@
    via a pointer to `FunctionalInterface`
 
    ```cpp
-   iox::cxx::FunctionalInterface<iox::optional<MyClass>, MyClass, void>* soSmart =
+   iox::FunctionalInterface<iox::optional<MyClass>, MyClass, void>* soSmart =
        new iox::optional<MyClass>{};
 
    delete soSmart; // <- not possible anymore
@@ -229,12 +229,12 @@
 7. It is not possible to delete a class which is derived from `NewType` via a pointer to `NewType`
 
    ```cpp
-   struct Foo : public iox::cxx::NewType<uint64_t, iox::cxx::newtype::ConstructByValueCopy>
+   struct Foo : public iox::NewType<uint64_t, iox::newtype::ConstructByValueCopy>
    {
        using ThisType::ThisType;
    };
 
-   iox::cxx::NewType<uint64_t, iox::cxx::newtype::ConstructByValueCopy>* soSmart = new Foo{42};
+   iox::NewType<uint64_t, iox::newtype::ConstructByValueCopy>* soSmart = new Foo{42};
 
    delete soSmart; // <- not possible anymore
    ```
@@ -244,17 +244,17 @@
    ```cpp
    // before
    // for the compiler Foo and Bar are the same type
-   using Foo = iox::cxx::NewType<uint64_t, iox::cxx::newtype::ConstructByValueCopy>;
-   using Bar = iox::cxx::NewType<uint64_t, iox::cxx::newtype::ConstructByValueCopy>;
+   using Foo = iox::NewType<uint64_t, iox::newtype::ConstructByValueCopy>;
+   using Bar = iox::NewType<uint64_t, iox::newtype::ConstructByValueCopy>;
 
    // after
    // compile time error when Foo and Bar are mixed up
-   struct Foo : public iox::cxx::NewType<uint64_t, iox::cxx::newtype::ConstructByValueCopy>
+   struct Foo : public iox::NewType<uint64_t, iox::newtype::ConstructByValueCopy>
    {
        using ThisType::ThisType;
    };
    // or with the IOX_NEW_TYPE macro
-   IOX_NEW_TYPE(Bar, uint64_t, iox::cxx::newtype::ConstructByValueCopy);
+   IOX_NEW_TYPE(Bar, uint64_t, iox::newtype::ConstructByValueCopy);
    ```
 
 9. `FileLock` uses the builder pattern. Path and permissions can now be set.

diff --git a/iceoryx_hoofs/BUILD.bazel b/iceoryx_hoofs/BUILD.bazel
@@ -34,12 +34,14 @@ cc_library(
         "vocabulary/source/**/*.cpp",
         "source/**/*.hpp",
         "memory/source/*.cpp",
+        "design/source/*.cpp",
     ]),
-    hdrs = glob(["include/**"]) + glob(["legacy/**"]) + glob(["memory/**"]) + glob(["container/**"]) + glob(["vocabulary/**"]) + glob(["utility/**"]) + glob(["primitives/**"]) + [
+    hdrs = glob(["include/**"]) + glob(["legacy/**"]) + glob(["memory/**"]) + glob(["container/**"]) + glob(["vocabulary/**"]) + glob(["utility/**"]) + glob(["primitives/**"]) + glob(["design/**"]) + [
         ":iceoryx_hoofs_deployment_hpp",
     ],
     includes = [
         "container/include/",
+        "design/include",
         "include/",
         "legacy/include/",
         "memory/include/",

diff --git a/iceoryx_hoofs/CMakeLists.txt b/iceoryx_hoofs/CMakeLists.txt
@@ -53,6 +53,7 @@ iox_add_library(
                                 ${PROJECT_SOURCE_DIR}/vocabulary/include
                                 ${PROJECT_SOURCE_DIR}/utility/include
                                 ${PROJECT_SOURCE_DIR}/primitives/include
+                                ${PROJECT_SOURCE_DIR}/design/include
                                 ${CMAKE_BINARY_DIR}/generated/iceoryx_hoofs/include
     INSTALL_INTERFACE           include/${PREFIX}
     EXPORT_INCLUDE_DIRS         include/
@@ -62,12 +63,12 @@ iox_add_library(
                                 vocabulary/include/
                                 utility/include/
                                 primitives/include/
+                                design/include/
     FILES
         source/concurrent/loffli.cpp
         source/cxx/adaptive_wait.cpp
         source/cxx/deadline_timer.cpp
         source/cxx/filesystem.cpp
-        source/cxx/functional_interface.cpp
         source/cxx/requires.cpp
         source/cxx/type_traits.cpp
         source/cxx/unique_id.cpp
@@ -95,6 +96,7 @@ iox_add_library(
         source/units/duration.cpp
         memory/source/bump_allocator.cpp
         memory/source/memory.cpp
+        design/source/functional_interface.cpp
 )
 
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/iceoryx_hoofs_deployment.hpp.in"

diff --git a/iceoryx_hoofs/README.md b/iceoryx_hoofs/README.md
@@ -127,6 +127,7 @@ The module structure is a logical grouping. It is replicated for `concurrent` an
 |`PeriodicTask`         | i        | Periodically executes a callable specified by the template parameter in a configurable time interval.                                                                                                                                 |
 |`smart_lock`           | i        | Creates arbitrary thread-safe constructs which then can be used like smart pointers. If some STL type should be thread safe use the smart_lock to create the thread safe version in one line. Based on some ideas presented in [Wrapping C++ Member Function Calls](https://stroustrup.com/wrapper.pdf) |
 |`mutex`                | i        | Mutex interface, see [ManPage pthread_mutex_lock](https://man7.org/linux/man-pages/man3/pthread_mutex_lock.3p.html).                                                                                                                  |
+|`Scheduler`            |          | Supported schedulers and functions to get their priority range are contained here.                                                                                                                                                    |
 |`UnnamedSemaphore`     |          | Unamed semaphore interface, see [ManPage sem_overview](https://man7.org/linux/man-pages/man7/sem_overview.7.html)                                                                                                                     |
 |`NamedSemaphore`       |          | Named semaphore interface, see [ManPage sem_overview](https://man7.org/linux/man-pages/man7/sem_overview.7.html)                                                                                                                      |
 |`thread`               |          | Heap-less replacement for `std::thread`.                                                                                                                                                                                              |

diff --git a/.../iceoryx_hoofs/design_pattern/builder.hpp → iceoryx_hoofs/design/include/iox/builder.hpp b/.../iceoryx_hoofs/design_pattern/builder.hpp → iceoryx_hoofs/design/include/iox/builder.hpp
@@ -14,8 +14,8 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-#ifndef IOX_HOOFS_DESIGN_PATTERN_BUILDER_HPP
-#define IOX_HOOFS_DESIGN_PATTERN_BUILDER_HPP
+#ifndef IOX_HOOFS_DESIGN_BUILDER_HPP
+#define IOX_HOOFS_DESIGN_BUILDER_HPP
 
 /// @brief Macro which generates a setter method useful for a builder pattern.
 /// @param[in] type the data type of the parameter

diff --git a/...ofs/internal/cxx/functional_interface.inl → ...clude/iox/detail/functional_interface.inl b/...ofs/internal/cxx/functional_interface.inl → ...clude/iox/detail/functional_interface.inl
@@ -14,16 +14,14 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-#ifndef IOX_HOOFS_CXX_FUNCTIONAL_INTERFACE_INL
-#define IOX_HOOFS_CXX_FUNCTIONAL_INTERFACE_INL
+#ifndef IOX_HOOFS_DESIGN_FUNCTIONAL_INTERFACE_INL
+#define IOX_HOOFS_DESIGN_FUNCTIONAL_INTERFACE_INL
 
-#include "iceoryx_hoofs/cxx/functional_interface.hpp"
 #include "iox/detail/string_type_traits.hpp"
+#include "iox/functional_interface.hpp"
 
 namespace iox
 {
-namespace cxx
-{
 namespace internal
 {
 ///////////////
@@ -33,31 +31,31 @@ template <typename Derived>
 template <typename StringType>
 inline void Expect<Derived>::expect(const StringType& msg) const noexcept
 {
-    static_assert(is_char_array<StringType>::value || is_cxx_string<StringType>::value,
+    static_assert(cxx::is_char_array<StringType>::value || is_cxx_string<StringType>::value,
                   "Only char arrays and iox::strings are allowed as message type.");
 
     const auto& derivedThis = *static_cast<const Derived*>(this);
 
     if (!derivedThis)
     {
         print_expect_message(&msg[0]);
-        Ensures(false);
+        cxx::Ensures(false);
     }
 }
 
 template <typename Derived, typename ValueType>
 template <typename StringType>
 inline ValueType& ExpectWithValue<Derived, ValueType>::expect(const StringType& msg) & noexcept
 {
-    static_assert(is_char_array<StringType>::value || is_cxx_string<StringType>::value,
+    static_assert(cxx::is_char_array<StringType>::value || is_cxx_string<StringType>::value,
                   "Only char arrays and iox::strings are allowed as message type.");
 
     auto& derivedThis = *static_cast<Derived*>(this);
 
     if (!derivedThis)
     {
         print_expect_message(&msg[0]);
-        Ensures(false);
+        cxx::Ensures(false);
     }
 
     return derivedThis.value();
@@ -312,6 +310,5 @@ inline const Derived&& OrElse<Derived>::or_else(const or_else_callback_t& callab
 
 
 } // namespace internal
-} // namespace cxx
 } // namespace iox
 #endif
diff --git a/...de/iceoryx_hoofs/internal/cxx/newtype.inl → ...ofs/design/include/iox/detail/newtype.inl b/...de/iceoryx_hoofs/internal/cxx/newtype.inl → ...ofs/design/include/iox/detail/newtype.inl
@@ -14,15 +14,13 @@
 // limitations under the License.
 //
 // SPDX-License-Identifier: Apache-2.0
-#ifndef IOX_HOOFS_CXX_NEWTYPE_INL
-#define IOX_HOOFS_CXX_NEWTYPE_INL
+#ifndef IOX_HOOFS_DESIGN_NEWTYPE_INL
+#define IOX_HOOFS_DESIGN_NEWTYPE_INL
 
-#include "iceoryx_hoofs/cxx/newtype.hpp"
+#include "iox/newtype.hpp"
 
 namespace iox
 {
-namespace cxx
-{
 template <typename T, template <typename> class... Policies>
 // AXIVION Next Construct AutosarC++19_03-A12.6.1 : m_value is initialized by the default constructor of T; the code
 // will not compile, if the default constructor of T does not exist or the DefaultConstructable policy is not added
@@ -118,7 +116,6 @@ inline NewType<T, Policies...>::operator T() const noexcept
     return m_value;
 }
 
-} // namespace cxx
 } // namespace iox
 
 #endif
diff --git a/...hoofs/internal/cxx/newtype/assignment.hpp → ...include/iox/detail/newtype/assignment.hpp b/...hoofs/internal/cxx/newtype/assignment.hpp → ...include/iox/detail/newtype/assignment.hpp
@@ -14,13 +14,11 @@
 // limitations under the License.
 //
 // SPDX-License-Identifier: Apache-2.0
-#ifndef IOX_HOOFS_CXX_NEWTYPE_ASSIGNMENT_HPP
-#define IOX_HOOFS_CXX_NEWTYPE_ASSIGNMENT_HPP
+#ifndef IOX_HOOFS_DESIGN_NEWTYPE_ASSIGNMENT_HPP
+#define IOX_HOOFS_DESIGN_NEWTYPE_ASSIGNMENT_HPP
 
 namespace iox
 {
-namespace cxx
-{
 namespace newtype
 {
 template <typename>
@@ -76,7 +74,6 @@ struct AssignByValueMove
 };
 
 } // namespace newtype
-} // namespace cxx
 } // namespace iox
 
 #endif
diff --git a/...hoofs/internal/cxx/newtype/comparable.hpp → ...include/iox/detail/newtype/comparable.hpp b/...hoofs/internal/cxx/newtype/comparable.hpp → ...include/iox/detail/newtype/comparable.hpp
@@ -14,14 +14,13 @@
 // limitations under the License.
 //
 // SPDX-License-Identifier: Apache-2.0
-#ifndef IOX_HOOFS_CXX_NEWTYPE_COMPARABLE_HPP
-#define IOX_HOOFS_CXX_NEWTYPE_COMPARABLE_HPP
-#include "iceoryx_hoofs/internal/cxx/newtype/internal.hpp"
+#ifndef IOX_HOOFS_DESIGN_NEWTYPE_COMPARABLE_HPP
+#define IOX_HOOFS_DESIGN_NEWTYPE_COMPARABLE_HPP
+
+#include "iox/detail/newtype/internal.hpp"
 
 namespace iox
 {
-namespace cxx
-{
 namespace newtype
 {
 template <typename T>
@@ -48,7 +47,6 @@ struct Comparable
 };
 
 } // namespace newtype
-} // namespace cxx
 } // namespace iox
 
 #endif
diff --git a/...oofs/internal/cxx/newtype/constructor.hpp → ...nclude/iox/detail/newtype/constructor.hpp b/...oofs/internal/cxx/newtype/constructor.hpp → ...nclude/iox/detail/newtype/constructor.hpp
@@ -14,13 +14,11 @@
 // limitations under the License.
 //
 // SPDX-License-Identifier: Apache-2.0
-#ifndef IOX_HOOFS_CXX_NEWTYPE_CONSTRUCTOR_HPP
-#define IOX_HOOFS_CXX_NEWTYPE_CONSTRUCTOR_HPP
+#ifndef IOX_HOOFS_DESIGN_NEWTYPE_CONSTRUCTOR_HPP
+#define IOX_HOOFS_DESIGN_NEWTYPE_CONSTRUCTOR_HPP
 
 namespace iox
 {
-namespace cxx
-{
 namespace newtype
 {
 template <typename>
@@ -75,7 +73,6 @@ struct DefaultConstructable
     ~DefaultConstructable() = default;
 };
 } // namespace newtype
-} // namespace cxx
 } // namespace iox
 
 #endif
diff --git a/...oofs/internal/cxx/newtype/convertable.hpp → ...nclude/iox/detail/newtype/convertable.hpp b/...oofs/internal/cxx/newtype/convertable.hpp → ...nclude/iox/detail/newtype/convertable.hpp
@@ -14,13 +14,11 @@
 // limitations under the License.
 //
 // SPDX-License-Identifier: Apache-2.0
-#ifndef IOX_HOOFS_CXX_NEWTYPE_CONVERTABLE_HPP
-#define IOX_HOOFS_CXX_NEWTYPE_CONVERTABLE_HPP
+#ifndef IOX_HOOFS_DESIGN_NEWTYPE_CONVERTABLE_HPP
+#define IOX_HOOFS_DESIGN_NEWTYPE_CONVERTABLE_HPP
 
 namespace iox
 {
-namespace cxx
-{
 namespace newtype
 {
 template <typename>
@@ -37,7 +35,6 @@ struct Convertable
 };
 
 } // namespace newtype
-} // namespace cxx
 } // namespace iox
 
 #endif
diff --git a/...x_hoofs/internal/cxx/newtype/internal.hpp → ...n/include/iox/detail/newtype/internal.hpp b/...x_hoofs/internal/cxx/newtype/internal.hpp → ...n/include/iox/detail/newtype/internal.hpp
@@ -14,15 +14,13 @@
 // limitations under the License.
 //
 // SPDX-License-Identifier: Apache-2.0
-#ifndef IOX_HOOFS_CXX_NEWTYPE_INTERNAL_HPP
-#define IOX_HOOFS_CXX_NEWTYPE_INTERNAL_HPP
+#ifndef IOX_HOOFS_DESIGN_NEWTYPE_INTERNAL_HPP
+#define IOX_HOOFS_DESIGN_NEWTYPE_INTERNAL_HPP
 
 #include <utility>
 
 namespace iox
 {
-namespace cxx
-{
 template <typename, template <typename> class...>
 class NewType;
 namespace newtype
@@ -42,7 +40,6 @@ inline typename T::value_type newTypeAccessor(const T& b) noexcept
 }
 } // namespace internal
 } // namespace newtype
-} // namespace cxx
 } // namespace iox
 
 #endif
diff --git a/...nal/cxx/newtype/protected_constructor.hpp → .../detail/newtype/protected_constructor.hpp b/...nal/cxx/newtype/protected_constructor.hpp → .../detail/newtype/protected_constructor.hpp
@@ -14,13 +14,11 @@
 // limitations under the License.
 //
 // SPDX-License-Identifier: Apache-2.0
-#ifndef IOX_HOOFS_CXX_NEWTYPE_PROTECTED_CONSTRUCTOR_HPP
-#define IOX_HOOFS_CXX_NEWTYPE_PROTECTED_CONSTRUCTOR_HPP
+#ifndef IOX_HOOFS_DESIGN_NEWTYPE_PROTECTED_CONSTRUCTOR_HPP
+#define IOX_HOOFS_DESIGN_NEWTYPE_PROTECTED_CONSTRUCTOR_HPP
 
 namespace iox
 {
-namespace cxx
-{
 namespace newtype
 {
 template <typename>
@@ -36,7 +34,6 @@ struct ProtectedConstructByValueCopy
     ~ProtectedConstructByValueCopy() = default;
 };
 } // namespace newtype
-} // namespace cxx
 } // namespace iox
 
 #endif