iox-eclipse-iceoryx#2067 Support move-only types in the LockFreeQueue

Signed-off-by: Graham Palmer <[email protected]>
gpalmer-latai · Oct 27, 2023 · a6f2d88 · a6f2d88
1 parent a49f57c
commit a6f2d88
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/doc/website/release-notes/iceoryx-unreleased.md b/doc/website/release-notes/iceoryx-unreleased.md
@@ -54,6 +54,7 @@
 
 **Bugfixes:**
 
+- LockFreeQueue fails to support move-only types [\#2067](https://github.com/eclipse-iceoryx/iceoryx/issues/2067)
 - FreeBSD CI build is broken [\#1338](https://github.com/eclipse-iceoryx/iceoryx/issues/1338)
 - High CPU load in blocked publisher is reduced by introducing smart busy loop waiting (adaptive_wait) [\#1347](https://github.com/eclipse-iceoryx/iceoryx/issues/1347)
 - Compile Error : iceoryx_dds/Mempool.hpp: No such file or directory [\#1364](https://github.com/eclipse-iceoryx/iceoryx/issues/1364)

diff --git a/iceoryx_hoofs/include/iceoryx_hoofs/internal/concurrent/lockfree_queue/lockfree_queue.inl b/iceoryx_hoofs/include/iceoryx_hoofs/internal/concurrent/lockfree_queue/lockfree_queue.inl
@@ -1,5 +1,6 @@
 // Copyright (c) 2019 - 2020 by Robert Bosch GmbH. All rights reserved.
 // Copyright (c) 2020 - 2022 by Apex.AI Inc. All rights reserved.
+// Copyright (c) 2023 by Latitude AI. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -105,7 +106,7 @@ iox::optional<ElementType> LockFreeQueue<ElementType, Capacity>::pushImpl(T&& va
 
     // if we removed from a full queue via popIfFull it might not be full anymore when a concurrent pop occurs
 
-    writeBufferAt(index, value); //&& version is called due to explicit conversion via std::move
+    writeBufferAt(index, std::forward<T>(value));
 
     m_usedIndices.push(index);
 

diff --git a/...fs/include/iceoryx_hoofs/internal/concurrent/lockfree_queue/resizeable_lockfree_queue.inl b/...fs/include/iceoryx_hoofs/internal/concurrent/lockfree_queue/resizeable_lockfree_queue.inl
@@ -1,4 +1,5 @@
 // Copyright (c) 2020 - 2022 by Apex.AI Inc. All rights reserved.
+// Copyright (c) 2023 by Latitude AI. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -213,7 +214,7 @@ iox::optional<ElementType> ResizeableLockFreeQueue<ElementType, MaxCapacity>::pu
 
     // if we removed from a full queue via popIfFull it might not be full anymore when a concurrent pop occurs
 
-    Base::writeBufferAt(index, value);
+    Base::writeBufferAt(index, std::forward<T>(value));
 
     Base::m_usedIndices.push(index);
 

diff --git a/iceoryx_hoofs/test/moduletests/test_concurrent_lockfree_queue.cpp b/iceoryx_hoofs/test/moduletests/test_concurrent_lockfree_queue.cpp
@@ -1,5 +1,6 @@
 // Copyright (c) 2019 - 2020 by Robert Bosch GmbH. All rights reserved.
 // Copyright (c) 2020 - 2022 by Apex.AI Inc. All rights reserved.
+// Copyright (c) 2023 by Latitude AI. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -39,6 +40,14 @@ struct Integer
     {
     }
 
+    // Delete copy constructor to ensure that the queue supports move-only types.
+    Integer(const Integer&) = delete;
+    Integer& operator=(const Integer&) = delete;
+    Integer(Integer&&) = default;
+    Integer& operator=(Integer&&) = default;
+
+    ~Integer() = default;
+
     int value{0};
 
     // so that it behaves like an int for comparison purposes