iox-eclipse-iceoryx#1391 Remove 'cxx' namespace from classes in time …

…module

Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>

iceoryx_dust/source/posix_wrapper/named_pipe.cpp

@@ -389,7 +389,7 @@ bool NamedPipe::NamedPipeData::waitForInitialization() const noexcept
         return true;
     }
 
-    cxx::DeadlineTimer deadlineTimer(WAIT_FOR_INIT_TIMEOUT);
+    DeadlineTimer deadlineTimer(WAIT_FOR_INIT_TIMEOUT);
 
     while (!deadlineTimer.hasExpired())
     {

iceoryx_hoofs/README.md

@@ -169,7 +169,7 @@ setTimeout(5_ms); // 5 milliseconds
 | class               | internal | description                                                                                                                                 |
 |:-------------------:|:--------:|:--------------------------------------------------------------------------------------------------------------------------------------------|
 |`Duration`           | i        | Represents the unit time, is convertible to `timespec` and `timeval`. User defined literals are available for convenience and readability.  |
-|`DeadlineTimer`      |          | Polling based timer to check for an elapsed deadline.                                                                                       |
+|`deadline_timer      |          | Polling based timer to check for an elapsed deadline.                                                                                       |
 |`adaptive_wait`      | i        | Building block to realize busy waiting loops with low CPU load.                                                                             |
 
 <center>

iceoryx_hoofs/include/iceoryx_hoofs/cxx/deadline_timer.hpp

@@ -24,8 +24,6 @@
 
 namespace iox
 {
-namespace cxx
-{
 /// @brief This offers the deadline timer functionality. It has user convenient methods to reset the timer [by default
 /// it uses the intialized duration], reset timer to a customized duration, check if the timer is active and user can
 /// also get to know about the remaining time before the timer goes off
@@ -71,8 +69,6 @@ class DeadlineTimer
     iox::units::Duration m_timeToWait;
     iox::units::Duration m_endTime;
 };
-
-} // namespace cxx
 } // namespace iox
 
 

iceoryx_hoofs/include/iceoryx_hoofs/internal/cxx/adaptive_wait.hpp

@@ -24,8 +24,6 @@
 
 namespace iox
 {
-namespace cxx
-{
 namespace internal
 {
 /// @brief Building block to implement a busy waiting loop efficiently. It
@@ -56,7 +54,7 @@ class adaptive_wait
 
     /// @brief Waits in a loop in a smart wait until continueToWait returns false.
     /// @param[in] continueToWait callable which returns if the wait should continue
-    void wait_loop(const function_ref<bool()>& continueToWait) noexcept;
+    void wait_loop(const cxx::function_ref<bool()>& continueToWait) noexcept;
 
   protected:
     /// @note All numbers are not accurate and are just rough estimates
@@ -105,7 +103,6 @@ class adaptive_wait
     uint64_t m_yieldCount = 0U;
 };
 } // namespace internal
-} // namespace cxx
 } // namespace iox
 
 #endif

iceoryx_hoofs/include/iceoryx_hoofs/internal/units/duration.hpp

@@ -24,7 +24,7 @@
 
 #include <chrono>
 #include <cmath>
-#include <iostream>
+//#include <iostream>
 #include <numeric>
 
 namespace iox

iceoryx_hoofs/source/cxx/adaptive_wait.cpp

@@ -20,8 +20,6 @@
 
 namespace iox
 {
-namespace cxx
-{
 namespace internal
 {
 constexpr std::chrono::microseconds adaptive_wait::INITIAL_WAITING_TIME;
@@ -47,13 +45,12 @@ void adaptive_wait::wait() noexcept
     }
 }
 
-void adaptive_wait::wait_loop(const function_ref<bool()>& continueToWait) noexcept
+void adaptive_wait::wait_loop(const cxx::function_ref<bool()>& continueToWait) noexcept
 {
     while (continueToWait())
     {
         wait();
     }
 }
 } // namespace internal
-} // namespace cxx
 } // namespace iox

iceoryx_hoofs/source/cxx/deadline_timer.cpp

@@ -19,8 +19,6 @@
 
 namespace iox
 {
-namespace cxx
-{
 DeadlineTimer::DeadlineTimer(const iox::units::Duration timeToWait) noexcept
     : m_timeToWait(timeToWait)
     , m_endTime(getCurrentMonotonicTime() + timeToWait)
@@ -57,7 +55,4 @@ iox::units::Duration DeadlineTimer::getCurrentMonotonicTime() noexcept
 {
     return iox::units::Duration{std::chrono::steady_clock::now().time_since_epoch()};
 }
-
-
-} // namespace cxx
 } // namespace iox

iceoryx_hoofs/test/moduletests/test_cxx_adaptive_wait.cpp

@@ -22,7 +22,7 @@ using namespace ::testing;
 #include <atomic>
 #include <thread>
 
-using namespace iox::cxx::internal;
+using namespace iox::internal;
 
 namespace
 {

iceoryx_hoofs/test/moduletests/test_cxx_deadline_timer.cpp

@@ -30,7 +30,7 @@ using namespace ::testing;
 using namespace iox::units;
 using namespace iox::units::duration_literals;
 
-using Timer = iox::cxx::DeadlineTimer;
+using Timer = iox::DeadlineTimer;
 
 class DeadlineTimer_test : public Test
 {

iceoryx_posh/include/iceoryx_posh/internal/popo/building_blocks/chunk_distributor.inl

@@ -169,7 +169,7 @@ inline uint64_t ChunkDistributor<ChunkDistributorDataType>::deliverToAllStoredQu
     }
 
     // busy waiting until every queue is served
-    cxx::internal::adaptive_wait adaptiveWait;
+    iox::internal::adaptive_wait adaptiveWait;
     while (!remainingQueues.empty())
     {
         adaptiveWait.wait();

iceoryx_posh/include/iceoryx_posh/internal/runtime/ipc_runtime_interface.hpp

@@ -73,7 +73,7 @@ class IpcRuntimeInterface
         TIMEOUT
     };
 
-    void waitForRoudi(cxx::DeadlineTimer& timer) noexcept;
+    void waitForRoudi(DeadlineTimer& timer) noexcept;
 
     RegAckResult waitForRegAck(const int64_t transmissionTimestamp) noexcept;
 

iceoryx_posh/source/roudi/roudi.cpp

@@ -100,7 +100,7 @@ void RouDi::shutdown() noexcept
 
     if (m_killProcessesInDestructor)
     {
-        cxx::DeadlineTimer finalKillTimer(m_processKillDelay);
+        DeadlineTimer finalKillTimer(m_processKillDelay);
 
         m_prcMgr->requestShutdownOfAllProcesses();
 

iceoryx_posh/source/runtime/ipc_runtime_interface.cpp

@@ -42,7 +42,7 @@ IpcRuntimeInterface::IpcRuntimeInterface(const RuntimeName_t& roudiName,
         return;
     }
 
-    cxx::DeadlineTimer timer(roudiWaitingTimeout);
+    DeadlineTimer timer(roudiWaitingTimeout);
 
     enum class RegState
     {
@@ -181,7 +181,7 @@ size_t IpcRuntimeInterface::getShmTopicSize() noexcept
     return m_shmTopicSize;
 }
 
-void IpcRuntimeInterface::waitForRoudi(cxx::DeadlineTimer& timer) noexcept
+void IpcRuntimeInterface::waitForRoudi(DeadlineTimer& timer) noexcept
 {
     bool printWaitingWarning = true;
     bool printFoundMessage = false;