iox-eclipse-iceoryx#1054 removing undefined behavior since a message …

…queue descriptor is not a file descriptor Signed-off-by: Christian Eltzschig <me@elchris.org>
ApexAI · Feb 4, 2022 · f2b7ee9 · f2b7ee9
1 parent cd27ecf
commit f2b7ee9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/iceoryx_examples/iceperf/mq.cpp b/iceoryx_examples/iceperf/mq.cpp
@@ -175,7 +175,7 @@ void MQ::open(const std::string& name, const iox::posix::IpcChannelSide channelS
         mode_t umaskSaved = umask(0);
 
         auto mqCall = iox::posix::posixCall(iox_mq_open4)(name.c_str(), openFlags, m_filemode, &m_attributes)
-                          .failureReturnValue(ERROR_CODE)
+                          .failureReturnValue(INVALID_DESCRIPTOR)
                           .ignoreErrnos(ENOENT)
                           .evaluate()
                           .or_else([&](auto& r) {

diff --git a/iceoryx_examples/iceperf/mq.hpp b/iceoryx_examples/iceperf/mq.hpp
@@ -35,7 +35,7 @@ class MQ : public IcePerfBase
     static constexpr uint32_t MAX_MESSAGE_SIZE = 4 * IcePerfBase::ONE_KILOBYTE;
     static constexpr uint32_t MAX_MESSAGES = 8;
     static constexpr int32_t ERROR_CODE = -1;
-    static constexpr mqd_t INVALID_DESCRIPTOR = -1;
+    static constexpr mqd_t INVALID_DESCRIPTOR = std::numeric_limits<mqd_t>::max();
 
     MQ(const std::string& publisherName, const std::string& subscriberName) noexcept;
     /// @brief Cleans up outdated message queues, e.g. from a previous test

diff --git a/iceoryx_hoofs/source/posix_wrapper/message_queue.cpp b/iceoryx_hoofs/source/posix_wrapper/message_queue.cpp
@@ -223,7 +223,7 @@ cxx::expected<mqd_t, IpcChannelError> MessageQueue::open(const IpcChannelName_t&
     // the mask will be applied to the permissions, therefore we need to set it to 0
     mode_t umaskSaved = umask(0);
     auto mqCall = posixCall(iox_mq_open4)(l_name.c_str(), openFlags, m_filemode, &m_attributes)
-                      .failureReturnValue(ERROR_CODE)
+                      .failureReturnValue(INVALID_DESCRIPTOR)
                       .suppressErrorMessagesForErrnos(ENOENT)
                       .evaluate();
 
@@ -323,13 +323,7 @@ cxx::expected<IpcChannelError> MessageQueue::timedSend(const std::string& msg,
 
 cxx::expected<bool, IpcChannelError> MessageQueue::isOutdated() noexcept
 {
-    struct stat sb = {};
-    auto fstatCall = posixCall(fstat)(m_mqDescriptor, &sb).failureReturnValue(-1).evaluate();
-    if (fstatCall.has_error())
-    {
-        return createErrorFromErrnum(fstatCall.get_error().errnum);
-    }
-    return cxx::success<bool>(sb.st_nlink == 0);
+    return cxx::success<bool>(false);
 }
 
 cxx::error<IpcChannelError> MessageQueue::createErrorFromErrnum(const int32_t errnum) const noexcept