Merge pull request #1881 from ApexAI/iox-1391-move-buffer-and-container-classes

iox-1391 move buffer and container classes

Author: FerdinandSpitzschnueffler

.clang-tidy-diff-scans.txt

@@ -64,6 +64,9 @@
 ./iceoryx_hoofs/time/**/*
 ./iceoryx_hoofs/test/moduletests/test_time_*
 
+./iceoryx_hoofs/buffer/**/*
+./iceoryx_hoofs/test/moduletests/test_buffer_*
+
 # IMPORTANT:
 #    after the first # everything is considered a comment, add new files and
 #    directories only at the top of this file

doc/website/release-notes/iceoryx-unreleased.md

@@ -56,7 +56,7 @@
 - Add check in `RelativePointer::get` to avoid `nullptr` dereferencing [\#1596](https://github.com/eclipse-iceoryx/iceoryx/issues/1596)
 - iceoryx_posh_testing cannot find iceoryx_hoofs_testing in CMake [\#1602](https://github.com/eclipse-iceoryx/iceoryx/issues/1602)
 - locking_policy.cpp calls error handler without log message [\#1609](https://github.com/eclipse-iceoryx/iceoryx/issues/1609)
-- Implement destructor, copy and move operations in `cxx::stack` [\#1469](https://github.com/eclipse-iceoryx/iceoryx/issues/1469)
+- Implement destructor, copy and move operations in `iox::stack` [\#1469](https://github.com/eclipse-iceoryx/iceoryx/issues/1469)
 - `gw::GatewayGeneric` sometimes terminates discovery and forward threads immediately [\#1666](https://github.com/eclipse-iceoryx/iceoryx/issues/1666)
 - `m_originId` in `mepoo::ChunkHeader` sometimes not set [\#1668](https://github.com/eclipse-iceoryx/iceoryx/issues/1668)
 - Remove `cxx::unique_ptr::reset` [\#1655](https://github.com/eclipse-iceoryx/iceoryx/issues/1655)
@@ -104,7 +104,7 @@
 - Extract `iceoryx_hoofs/platform` into separate package `iceoryx_platform` [\#1615](https://github.com/eclipse-iceoryx/iceoryx/issues/1615)
 - `cxx::unique_ptr` is no longer nullable [\#1104](https://github.com/eclipse-iceoryx/iceoryx/issues/1104)
 - Use builder pattern in mutex [\#1036](https://github.com/eclipse-iceoryx/iceoryx/issues/1036)
-- Change return type of `cxx::vector::erase` to bool [\#1662](https://github.com/eclipse-iceoryx/iceoryx/issues/1662)
+- Change return type of `vector::erase` to bool [\#1662](https://github.com/eclipse-iceoryx/iceoryx/issues/1662)
 - `ReleativePointer::registerPtr` returns `iox::optional` [\#605](https://github.com/eclipse-iceoryx/iceoryx/issues/605)
 - `cxx::function` is no longer nullable [\#1104](https://github.com/eclipse-iceoryx/iceoryx/issues/1104)
 - Rename `BaseRelativePointer` to `UntypedRelativePointer` [\#605](https://github.com/eclipse-iceoryx/iceoryx/issues/605)
@@ -594,7 +594,7 @@
     myMutex->lock();
     ```
 
-26. Change return type of `cxx::vector::erase` from iterator to bool
+26. Change return type of `vector::erase` from iterator to bool
 
     ```cpp
     // before

iceoryx_binding_c/test/moduletests/test_listener.cpp

@@ -192,7 +192,7 @@ class iox_listener_test : public Test
     std::unique_ptr<PoshRuntimeMock> runtimeMock = PoshRuntimeMock::create("long_live_lord_buckethead");
 
     iox_user_trigger_storage_t m_userTriggerStorage[MAX_NUMBER_OF_EVENTS_PER_LISTENER + 1U];
-    cxx::vector<iox_user_trigger_t, MAX_NUMBER_OF_EVENTS_PER_LISTENER + 1U> m_userTrigger;
+    vector<iox_user_trigger_t, MAX_NUMBER_OF_EVENTS_PER_LISTENER + 1U> m_userTrigger;
 
     static constexpr uint32_t NUM_CHUNKS_IN_POOL = MAX_CHUNKS_HELD_PER_SUBSCRIBER_SIMULTANEOUSLY + 2U;
     static constexpr uint32_t CHUNK_SIZE = 128U;
@@ -210,10 +210,9 @@ class iox_listener_test : public Test
         {"ServiceA", "InstanceA", "EventA"}, "der_wilde_bert", ServerOptions(), &m_memoryManager};
     ClientPortData clientPortData{
         {"ServiceA", "InstanceA", "EventA"}, "rudi_ruessel", ClientOptions(), &m_memoryManager};
-    cxx::vector<iox::popo::SubscriberPortData, MAX_NUMBER_OF_EVENTS_PER_LISTENER + 1> m_subscriberPortData;
-    cxx::vector<cpp2c_Subscriber, MAX_NUMBER_OF_EVENTS_PER_LISTENER + 1> m_subscriber;
-    cxx::vector<ChunkQueuePusher<SubscriberPortData::ChunkQueueData_t>, MAX_NUMBER_OF_EVENTS_PER_LISTENER + 1>
-        m_chunkPusher;
+    vector<iox::popo::SubscriberPortData, MAX_NUMBER_OF_EVENTS_PER_LISTENER + 1> m_subscriberPortData;
+    vector<cpp2c_Subscriber, MAX_NUMBER_OF_EVENTS_PER_LISTENER + 1> m_subscriber;
+    vector<ChunkQueuePusher<SubscriberPortData::ChunkQueueData_t>, MAX_NUMBER_OF_EVENTS_PER_LISTENER + 1> m_chunkPusher;
     static constexpr std::chrono::milliseconds TIMEOUT = std::chrono::milliseconds(100);
 };
 constexpr std::chrono::milliseconds iox_listener_test::TIMEOUT;

iceoryx_binding_c/test/moduletests/test_service_discovery.cpp

@@ -31,7 +31,7 @@ extern "C" {
 namespace
 {
 using namespace ::testing;
-using description_vector = cxx::vector<iox_service_description_t, MAX_FINDSERVICE_RESULT_SIZE>;
+using description_vector = vector<iox_service_description_t, MAX_FINDSERVICE_RESULT_SIZE>;
 
 class iox_service_discovery_test : public RouDi_GTest
 {

iceoryx_binding_c/test/moduletests/test_wait_set.cpp

@@ -86,14 +86,14 @@ class iox_ws_test : public Test
     std::unique_ptr<PoshRuntimeMock> runtimeMock = PoshRuntimeMock::create("rudi_ruessel");
     const iox::capro::ServiceDescription TEST_SERVICE_DESCRIPTION{"a", "b", "c"};
     iox::popo::SubscriberOptions m_subscriberOptions{MAX_CHUNKS_HELD_PER_SUBSCRIBER_SIMULTANEOUSLY, 0U};
-    cxx::vector<iox::popo::SubscriberPortData, MAX_NUMBER_OF_ATTACHMENTS_PER_WAITSET + 1U> m_portDataVector;
-    cxx::vector<cpp2c_Subscriber, MAX_NUMBER_OF_ATTACHMENTS_PER_WAITSET + 1U> m_subscriberVector;
+    vector<iox::popo::SubscriberPortData, MAX_NUMBER_OF_ATTACHMENTS_PER_WAITSET + 1U> m_portDataVector;
+    vector<cpp2c_Subscriber, MAX_NUMBER_OF_ATTACHMENTS_PER_WAITSET + 1U> m_subscriberVector;
 
     ConditionVariableData m_condVar{"Horscht"};
     WaitSetMock* m_sut = new WaitSetMock{m_condVar};
 
     iox_user_trigger_storage_t m_userTriggerStorage[MAX_NUMBER_OF_ATTACHMENTS_PER_WAITSET + 1];
-    cxx::vector<iox_user_trigger_t, MAX_NUMBER_OF_ATTACHMENTS_PER_WAITSET + 1> m_userTrigger;
+    vector<iox_user_trigger_t, MAX_NUMBER_OF_ATTACHMENTS_PER_WAITSET + 1> m_userTrigger;
 
     iox_notification_info_t m_eventInfoStorage[MAX_NUMBER_OF_ATTACHMENTS_PER_WAITSET];
     uint64_t m_missedElements = 0U;

iceoryx_dust/include/iceoryx_dust/internal/cli/arguments.hpp

@@ -19,8 +19,8 @@
 #include "iceoryx_dust/cli/types.hpp"
 #include "iceoryx_dust/cxx/convert.hpp"
 #include "iceoryx_dust/internal/cli/option.hpp"
-#include "iceoryx_hoofs/cxx/vector.hpp"
 #include "iox/expected.hpp"
+#include "iox/vector.hpp"
 
 namespace iox
 {
@@ -67,7 +67,7 @@ class Arguments
 
   private:
     const char* m_binaryName;
-    cxx::vector<Option, MAX_NUMBER_OF_ARGUMENTS> m_arguments;
+    vector<Option, MAX_NUMBER_OF_ARGUMENTS> m_arguments;
 };
 } // namespace internal
 } // namespace cli

iceoryx_dust/include/iceoryx_dust/internal/cli/option_definition.hpp

@@ -20,7 +20,7 @@
 #include "iceoryx_dust/cli/types.hpp"
 #include "iceoryx_dust/internal/cli/arguments.hpp"
 #include "iceoryx_hoofs/cxx/function.hpp"
-#include "iceoryx_hoofs/cxx/vector.hpp"
+#include "iox/vector.hpp"
 #include <cstdint>
 
 namespace iox
@@ -89,7 +89,7 @@ class OptionDefinition
 
   private:
     OptionDescription_t m_programDescription;
-    cxx::vector<OptionWithDetails, MAX_NUMBER_OF_ARGUMENTS> m_availableOptions;
+    vector<OptionWithDetails, MAX_NUMBER_OF_ARGUMENTS> m_availableOptions;
     cxx::function<void()> m_onFailureCallback;
 };
 

iceoryx_dust/include/iceoryx_dust/internal/cli/option_manager.hpp

@@ -20,15 +20,15 @@
 #include "iceoryx_dust/internal/cli/command_line_parser.hpp"
 #include "iceoryx_dust/internal/cli/option_definition.hpp"
 #include "iceoryx_hoofs/cxx/function.hpp"
-#include "iceoryx_hoofs/cxx/vector.hpp"
+#include "iox/vector.hpp"
 
 namespace iox
 {
 namespace cli
 {
 namespace internal
 {
-using CmdAssignments_t = cxx::vector<cxx::function<void(Arguments&)>, MAX_NUMBER_OF_ARGUMENTS>;
+using CmdAssignments_t = vector<cxx::function<void(Arguments&)>, MAX_NUMBER_OF_ARGUMENTS>;
 
 /// @brief Manages command line options which were defined via the IOX_CLI_ macros in a
 ///        user defined struct.

iceoryx_examples/complexdata/README.md

@@ -6,7 +6,7 @@ To implement zero-copy data transfer we use a shared memory approach. This requi
 contained in the shared memory and must not internally use pointers or references. The complete list of restrictions can be found
 [here](../../doc/website/getting-started/overview.md#restrictions). Therefore, most of the STL types cannot be used, but we
 reimplemented some [constructs](../../iceoryx_hoofs/README.md#cxx). This example shows how
-to send/receive a iox::cxx::vector and how to send/receive a complex data structure containing some of our STL container surrogates.
+to send/receive a iox::vector and how to send/receive a complex data structure containing some of our STL container surrogates.
 
 ## Expected Output
 
@@ -17,14 +17,14 @@ to send/receive a iox::cxx::vector and how to send/receive a complex data struct
 The following examples demonstrate how to send/receive the STL containers that were reimplemented in iceoryx so that they meet
 our requirements.
 
-### Publisher application sending a `iox::cxx::vector`
+### Publisher application sending a `iox::vector`
 
 In this example we want our publisher to send a vector containing double. Since we cannot use dynamic memory, we use the
-`iox::cxx::vector` with a capacity of 5.
+`iox::vector` with a capacity of 5.
 
 <!--[geoffrey][iceoryx_examples/complexdata/iox_publisher_vector.cpp][create publisher]-->
 ```cpp
-iox::popo::Publisher<iox::cxx::vector<double, 5>> publisher({"Radar", "FrontRight", "VectorData"});
+iox::popo::Publisher<iox::vector<double, 5>> publisher({"Radar", "FrontRight", "VectorData"});
 ```
 
 We use a while-loop similar to the one described in the
@@ -45,7 +45,7 @@ The only difference here to the `std::vector` is that `emplace_back` returns a b
 false otherwise. `emplace_back` fails when the vector is already full. In our case, we can omit the check of the return value
 since the for-loop doesn't exceed the capacity of the vector.
 
-### Subscriber application receiving a `iox::cxx::vector`
+### Subscriber application receiving a `iox::vector`
 
 Our subscriber application iterates over the received vector to print its entries to the console. Note that the `separator` is only
 used for a easy to read output.

iceoryx_examples/complexdata/iox_publisher_vector.cpp

@@ -14,7 +14,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-#include "iceoryx_hoofs/cxx/vector.hpp"
+#include "iox/vector.hpp"
 
 #include "iceoryx_dust/posix_wrapper/signal_watcher.hpp"
 #include "iceoryx_posh/popo/publisher.hpp"
@@ -29,7 +29,7 @@ int main()
 
     // initialize publisher
     //! [create publisher]
-    iox::popo::Publisher<iox::cxx::vector<double, 5>> publisher({"Radar", "FrontRight", "VectorData"});
+    iox::popo::Publisher<iox::vector<double, 5>> publisher({"Radar", "FrontRight", "VectorData"});
     //! [create publisher]
 
     uint64_t ct = 0;