iox-#1361 Add workaround for iox-#2055

eclipse-iceoryx · Oct 24, 2023 · 6774499 · 6774499
1 parent 577c8fc
commit 6774499
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/iceoryx_posh/source/roudi/process_manager.cpp b/iceoryx_posh/source/roudi/process_manager.cpp
@@ -289,7 +289,10 @@ bool ProcessManager::addProcess(const RuntimeName_t& name,
         return false;
     }
     auto heartbeatPoolIndex = HeartbeatPool::Index::INVALID;
-    iox::UntypedRelativePointer::offset_t heartbeatOffset{iox::UntypedRelativePointer::NULL_POINTER_OFFSET};
+    /// @todo iox-#2055 this workaround is required sind the conversion of edge cases is broken
+    constexpr uint8_t IOX_2055_WORKAROUND{1};
+    iox::UntypedRelativePointer::offset_t heartbeatOffset{iox::UntypedRelativePointer::NULL_POINTER_OFFSET
+                                                          - IOX_2055_WORKAROUND};
     if (isMonitored)
     {
         auto heartbeat = m_heartbeatPool->emplace();

diff --git a/iceoryx_posh/source/runtime/ipc_runtime_interface.cpp b/iceoryx_posh/source/runtime/ipc_runtime_interface.cpp
@@ -245,7 +245,9 @@ IpcRuntimeInterface::RegAckResult IpcRuntimeInterface::waitForRegAck(int64_t tra
                 cxx::convert::fromString(receiveBuffer.getElementAtIndex(4U).c_str(), m_segmentId);
                 UntypedRelativePointer::offset_t heartbeatOffset{UntypedRelativePointer::NULL_POINTER_OFFSET};
                 cxx::convert::fromString(receiveBuffer.getElementAtIndex(5U).c_str(), heartbeatOffset);
-                if (heartbeatOffset != UntypedRelativePointer::NULL_POINTER_OFFSET)
+                /// @todo iox-#2055 this workaround is required sind the conversion of edge cases is broken
+                constexpr uint8_t IOX_2055_WORKAROUND{1};
+                if (heartbeatOffset != (UntypedRelativePointer::NULL_POINTER_OFFSET - IOX_2055_WORKAROUND))
                 {
                     m_heartbeatAddressOffset = heartbeatOffset;
                 }