iox-eclipse-iceoryx#1036 Baseaddress as optional ctor argument

Signed-off-by: Christian Eltzschig <me@elchris.org>
ApexAI · Jan 25, 2022 · 6d3c7eb · 6d3c7eb
1 parent c55a172
commit 6d3c7eb
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 14 deletions.
diff --git a/iceoryx_hoofs/include/iceoryx_hoofs/cxx/helplets.hpp b/iceoryx_hoofs/include/iceoryx_hoofs/cxx/helplets.hpp
@@ -343,9 +343,6 @@ constexpr T into(const F value) noexcept;
 ///   class MyBuilder {
 ///     IOX_BUILDER_PARAMETER(TypeA, NameB, ValueC)
 ///     // START generates the following code
-///     private:
-///       TypeA m_NameB = ValueC;
-///
 ///     public:
 ///       decltype(auto) NameB(TypeA const& value) &&
 ///       {
@@ -358,13 +355,13 @@ constexpr T into(const F value) noexcept;
 ///           m_NameB = std::move(value);
 ///           return std::move(*this);
 ///       }
+///
+///     private:
+///       TypeA m_NameB = ValueC;
 ///     // END
 ///   };
 /// @endcode
 #define IOX_BUILDER_PARAMETER(type, name, defaultValue)                                                                \
-  private:                                                                                                             \
-    type m_##name = defaultValue;                                                                                      \
-                                                                                                                       \
   public:                                                                                                              \
     decltype(auto) name(type const& value)&&                                                                           \
     {                                                                                                                  \
@@ -376,7 +373,10 @@ constexpr T into(const F value) noexcept;
     {                                                                                                                  \
         m_##name = std::move(value);                                                                                   \
         return std::move(*this);                                                                                       \
-    }
+    }                                                                                                                  \
+                                                                                                                       \
+  private:                                                                                                             \
+    type m_##name = defaultValue;
 
 
 } // namespace cxx

diff --git a/iceoryx_hoofs/include/iceoryx_hoofs/internal/posix_wrapper/shared_memory_object.hpp b/iceoryx_hoofs/include/iceoryx_hoofs/internal/posix_wrapper/shared_memory_object.hpp
@@ -66,7 +66,7 @@ class SharedMemoryObject : public DesignPattern::Creation<SharedMemoryObject, Sh
                        const uint64_t memorySizeInBytes,
                        const AccessMode accessMode,
                        const OpenMode openMode,
-                       const void* const baseAddressHint,
+                       const cxx::optional<const void*>& baseAddressHint = cxx::nullopt,
                        const mode_t permissions = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP) noexcept;
 
     bool isInitialized() const noexcept;

diff --git a/iceoryx_hoofs/source/posix_wrapper/shared_memory_object.cpp b/iceoryx_hoofs/source/posix_wrapper/shared_memory_object.cpp
@@ -51,7 +51,7 @@ SharedMemoryObject::SharedMemoryObject(const SharedMemory::Name_t& name,
                                        const uint64_t memorySizeInBytes,
                                        const AccessMode accessMode,
                                        const OpenMode openMode,
-                                       const void* const baseAddressHint,
+                                       const cxx::optional<const void*>& baseAddressHint,
                                        const mode_t permissions) noexcept
     : m_memorySizeInBytes(cxx::align(memorySizeInBytes, Allocator::MEMORY_ALIGNMENT))
 {
@@ -69,7 +69,7 @@ SharedMemoryObject::SharedMemoryObject(const SharedMemory::Name_t& name,
     if (m_isInitialized)
     {
         MemoryMapBuilder()
-            .baseAddressHint(baseAddressHint)
+            .baseAddressHint((baseAddressHint) ? *baseAddressHint : nullptr)
             .length(memorySizeInBytes)
             .fileDescriptor(m_sharedMemory->getHandle())
             .accessMode(accessMode)
@@ -90,9 +90,16 @@ SharedMemoryObject::SharedMemoryObject(const SharedMemory::Name_t& name,
         std::cerr << "Unable to create a shared memory object with the following properties [ name = " << name
                   << ", sizeInBytes = " << memorySizeInBytes
                   << ", access mode = " << ACCESS_MODE_STRING[static_cast<uint64_t>(accessMode)]
-                  << ", open mode = " << OPEN_MODE_STRING[static_cast<uint64_t>(openMode)]
-                  << ", baseAddressHint = " << std::hex << baseAddressHint << std::dec
-                  << ", permissions = " << std::bitset<sizeof(mode_t)>(permissions) << " ]" << std::endl;
+                  << ", open mode = " << OPEN_MODE_STRING[static_cast<uint64_t>(openMode)] << ", baseAddressHint = ";
+        if (baseAddressHint)
+        {
+            std::cerr << std::hex << *baseAddressHint << std::dec;
+        }
+        else
+        {
+            std::cerr << "no hint set";
+        }
+        std::cerr << ", permissions = " << std::bitset<sizeof(mode_t)>(permissions) << " ]" << std::endl;
         std::cerr.setf(flags);
         return;
     }
@@ -120,7 +127,7 @@ SharedMemoryObject::SharedMemoryObject(const SharedMemory::Name_t& name,
                 static_cast<unsigned long long>(memorySizeInBytes),
                 ACCESS_MODE_STRING[static_cast<uint64_t>(accessMode)],
                 OPEN_MODE_STRING[static_cast<uint64_t>(openMode)],
-                baseAddressHint,
+                *baseAddressHint,
                 std::bitset<sizeof(mode_t)>(permissions).to_ulong());
 
             memset(m_memoryMap->getBaseAddress(), 0, m_memorySizeInBytes);