Iox #32 implement posix timer and introduced timing test

iceoryx_posh/include/iceoryx_posh/internal/runtime/message_queue_interface.hpp

@@ -185,7 +185,7 @@ class MqBase
     MqBase() = delete;
     // TODO: unique identifier problem, multiple MqBase objects with the
     //        same InterfaceName are using the same message queue
-    MqBase(const std::string& InterfaceName, const long maxMessages, const long messageSize) noexcept;
+    MqBase(const std::string& InterfaceName, const int64_t maxMessages, const int64_t messageSize) noexcept;
     virtual ~MqBase() = default;
 
     /// @brief delete copy and move ctor and assignment since they are not needed
@@ -243,8 +243,8 @@ class MqInterfaceUser : public MqBase
     /// @param[in] maxMessages maximum number of queued messages
     /// @param[in] message size maximum message size
     MqInterfaceUser(const std::string& name,
-                    const long maxMessages = APP_MAX_MESSAGES,
-                    const long messageSize = APP_MESSAGE_SIZE) noexcept;
+                    const int64_t maxMessages = APP_MAX_MESSAGES,
+                    const int64_t messageSize = APP_MESSAGE_SIZE) noexcept;
 
     /// @brief The copy constructor and assignment operator are deleted since
     ///         this class manages a resource (message queue) which cannot
@@ -272,8 +272,8 @@ class MqInterfaceCreator : public MqBase
     /// @param[in] maxMessages maximum number of queued messages
     /// @param[in] message size maximum message size
     MqInterfaceCreator(const std::string& name,
-                       const long maxMessages = ROUDI_MAX_MESSAGES,
-                       const long messageSize = ROUDI_MESSAGE_SIZE) noexcept;
+                       const int64_t maxMessages = ROUDI_MAX_MESSAGES,
+                       const int64_t messageSize = ROUDI_MESSAGE_SIZE) noexcept;
 
     /// @brief The copy constructor and assignment operator is deleted since
     ///         this class manages a resource (message queue) which cannot

iceoryx_posh/source/roudi/memory/mempool_collection_memory_block.cpp

@@ -36,15 +36,15 @@ MemPoolCollectionMemoryBlock::~MemPoolCollectionMemoryBlock() noexcept
 
 uint64_t MemPoolCollectionMemoryBlock::size() const noexcept
 {
-    return cxx::align(sizeof(mepoo::MemoryManager), mepoo::MemPool::MEMORY_ALIGNMENT)
+    return cxx::align(static_cast<uint64_t>(sizeof(mepoo::MemoryManager)), mepoo::MemPool::MEMORY_ALIGNMENT)
            + mepoo::MemoryManager::requiredFullMemorySize(m_memPoolConfig);
 }
 
 uint64_t MemPoolCollectionMemoryBlock::alignment() const noexcept
 {
     // algorithm::align doesn't like constexpr values
     auto memPoolAlignment = mepoo::MemPool::MEMORY_ALIGNMENT;
-    return algorithm::max(alignof(mepoo::MemoryManager), memPoolAlignment);
+    return algorithm::max(static_cast<uint64_t>(alignof(mepoo::MemoryManager)), memPoolAlignment);
 }
 
 void MemPoolCollectionMemoryBlock::memoryAvailable(void* memory) noexcept

iceoryx_posh/source/roudi/memory/mempool_segment_manager_memory_block.cpp

@@ -32,13 +32,13 @@ MemPoolSegmentManagerMemoryBlock::~MemPoolSegmentManagerMemoryBlock() noexcept
 
 uint64_t MemPoolSegmentManagerMemoryBlock::size() const noexcept
 {
-    return cxx::align(sizeof(mepoo::SegmentManager<>), SHARED_MEMORY_ALIGNMENT)
+    return cxx::align(static_cast<uint64_t>(sizeof(mepoo::SegmentManager<>)), SHARED_MEMORY_ALIGNMENT)
            + mepoo::SegmentManager<>::requiredManagementMemorySize(m_segmentConfig);
 }
 
 uint64_t MemPoolSegmentManagerMemoryBlock::alignment() const noexcept
 {
-    return algorithm::max(alignof(mepoo::SegmentManager<>), SHARED_MEMORY_ALIGNMENT);
+    return algorithm::max(static_cast<uint64_t>(alignof(mepoo::SegmentManager<>)), SHARED_MEMORY_ALIGNMENT);
 }
 
 void MemPoolSegmentManagerMemoryBlock::memoryAvailable(void* memory) noexcept

iceoryx_posh/source/roudi/roudi_multi_process.cpp

@@ -20,7 +20,6 @@
 #include "iceoryx_posh/runtime/port_config_info.hpp"
 #include "iceoryx_utils/cxx/convert.hpp"
 #include "iceoryx_utils/fixed_string/string100.hpp"
-#include "iceoryx_utils/posix_wrapper/timer.hpp"
 
 namespace iox
 {

iceoryx_posh/test/CMakeLists.txt

@@ -1,5 +1,6 @@
 cmake_minimum_required(VERSION 3.5)
-project(test_iceoryx_posh VERSION ${test_iceoryx_posh})
+set(test_iceoryx_posh_VERSION 0)
+project(test_iceoryx_posh VERSION ${test_iceoryx_posh_VERSION})
 
 find_package(iceoryx_utils_testing REQUIRED)
 

iceoryx_utils/include/iceoryx_utils/internal/cxx/convert.inl

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <limits>
 namespace iox
 {
 namespace cxx
@@ -105,15 +104,18 @@ inline bool convert::stringIsNumberWithErrorMessage(const char* v, const NumberT
         std::cerr << v << " is not ";
         switch (type)
         {
-        case NumberType::FLOAT: {
+        case NumberType::FLOAT:
+        {
             std::cerr << "a float";
             break;
         }
-        case NumberType::INTEGER: {
+        case NumberType::INTEGER:
+        {
             std::cerr << "a signed integer";
             break;
         }
-        case NumberType::UNSIGNED_INTEGER: {
+        case NumberType::UNSIGNED_INTEGER:
+        {
             std::cerr << "an unsigned integer";
             break;
         }
@@ -205,6 +207,19 @@ inline bool convert::fromString<uint64_t>(const char* v, uint64_t& dest)
     return true;
 }
 
+#ifdef __APPLE__
+/// introduced for mac os since unsigned long is not uint64_t despite it has the same size
+/// who knows why ¯\_(ツ)_/¯
+template <>
+inline bool convert::fromString<unsigned long>(const char* v, unsigned long& dest)
+{
+    uint64_t temp{0};
+    bool retVal = fromString(v, temp);
+    dest = temp;
+    return retVal;
+}
+#endif
+
 template <>
 inline bool convert::fromString<uint32_t>(const char* v, uint32_t& dest)
 {

iceoryx_utils/include/iceoryx_utils/posix_wrapper/timer.hpp

@@ -43,6 +43,7 @@ enum class TimerError
     NO_PERMISSION,
     INVALID_POINTER,
     NO_TIMER_TO_DELETE,
+    TIMEOUT_IS_ZERO,
     INTERNAL_LOGIC_ERROR
 };
 
@@ -115,7 +116,7 @@ class Timer
         /// @brief Wrapper that can be registered with the operating system
         static void callbackHelper(sigval data);
 
-        OsTimer(units::Duration timeToWait, std::function<void()> callback) noexcept;
+        OsTimer(const units::Duration timeToWait, const std::function<void()>& callback) noexcept;
 
         OsTimer(const OsTimer&) = delete;
         OsTimer(OsTimer&&) = delete;
@@ -129,7 +130,8 @@ class Timer
         ///
         /// The callback is called by the operating system after the time has expired.
         ///
-        /// @param[in] periodic - can be a periodic timer if set to true, default false
+        /// @param[in] periodic - can be a periodic timer if set to RunMode::PERIODIC or
+        ///                     once when in RunMode::ONCE
         /// @note Shall only be called when callback is given
         cxx::expected<TimerError> start(const RunMode runMode) noexcept;
 
@@ -155,7 +157,7 @@ class Timer
         bool hasError() const noexcept;
 
         /// @brief Returns the error that occured on constructing the object
-        cxx::error<TimerError> getError() const noexcept;
+        TimerError getError() const noexcept;
 
       private:
         /// @brief Call the user-defined callback
@@ -196,7 +198,7 @@ class Timer
     /// @param[in] timeToWait - How long should be waited?
     /// @note Does not set up an operating system timer, but uses CLOCK_REALTIME instead
     /// @todo refactor this cTor and its functionality to a class called StopWatch
-    Timer(units::Duration timeToWait) noexcept;
+    Timer(const units::Duration timeToWait) noexcept;
 
     /// @brief Creates a timer with an operating system callback
     ///
@@ -206,7 +208,7 @@ class Timer
     /// @param[in] callback - Function called after timeToWait (User needs to ensure lifetime of function till stop()
     ///                       call)
     /// @note Operating systems needs a valid reference to this object, hence DesignPattern::Creation can't be used
-    Timer(units::Duration timeToWait, std::function<void()> callback) noexcept;
+    Timer(const units::Duration timeToWait, const std::function<void()>& callback) noexcept;
 
     /// @brief creates Duration from the result of clock_gettime(CLOCK_REALTIME, ...)
     /// @return if the clock_gettime call failed TimerError is returned otherwise Duration
@@ -266,7 +268,7 @@ class Timer
     bool hasError() const noexcept;
 
     /// @brief Returns the error that occured on constructing the object
-    cxx::error<TimerError> getError() const noexcept;
+    TimerError getError() const noexcept;
 
   private:
     cxx::optional<OsTimer> m_osTimer;

iceoryx_utils/platform/mac/include/iceoryx_utils/platform/time.hpp

@@ -14,37 +14,40 @@
 
 #pragma once
 
+#include <condition_variable>
+#include <mutex>
 #include <sys/time.h>
-
-using timer_t = void*;
+#include <thread>
 
 struct itimerspec
 {
     timespec it_interval;
     timespec it_value;
 };
 
-inline int timer_create(clockid_t clockid, struct sigevent* sevp, timer_t* timerid)
-{
-    return 0;
-}
-
-inline int timer_delete(timer_t timerid)
-{
-    return 0;
-}
-
-inline int timer_settime(timer_t timerid, int flags, const struct itimerspec* new_value, struct itimerspec* old_value)
+struct appleTimer_t
 {
-    return 0;
-}
+    std::thread thread;
+    void (*callback)(union sigval);
+    sigval callbackParameter;
+    std::atomic_bool keepRunning{true};
+
+    struct
+    {
+        std::mutex mutex;
+        timespec startTime;
+        bool wasCallbackCalled{false};
+        bool runOnce{false};
+        bool isTimerRunning{false};
+        itimerspec timeParameters;
+        std::condition_variable wakeup;
+    } parameter;
+};
 
-inline int timer_gettime(timer_t timerid, struct itimerspec* curr_value)
-{
-    return 0;
-}
+using timer_t = appleTimer_t*;
 
-inline int timer_getoverrun(timer_t timerid)
-{
-    return 0;
-}
+int timer_create(clockid_t clockid, struct sigevent* sevp, timer_t* timerid);
+int timer_delete(timer_t timerid);
+int timer_settime(timer_t timerid, int flags, const struct itimerspec* new_value, struct itimerspec* old_value);
+int timer_gettime(timer_t timerid, struct itimerspec* curr_value);
+int timer_getoverrun(timer_t timerid);

iceoryx_utils/platform/mac/source/semaphore.cpp

@@ -242,7 +242,10 @@ iox_sem_t* iox_sem_open_impl(const char* name, int oflag, ...)
     {
         va_list va;
         va_start(va, oflag);
-        mode_t mode = va_arg(va, mode_t);
+        // mode_t is an alias for unsigned short but this causes undefined
+        // behavior in va_arg since it is a promotable type - which will be
+        // promoted to int
+        mode_t mode = static_cast<mode_t>(va_arg(va, unsigned int));
         unsigned int value = va_arg(va, unsigned int);
         va_end(va);