Merge remote-tracking branch 'upstream/mueller/master' into mueller/master

CMakeLists.txt

@@ -138,9 +138,9 @@ else()
 	)
 endif()
 
-foreach(INCLUDE_PATH ${FSFW_ADDITIONAL_INC_PATH})
+foreach(INCLUDE_PATH ${FSFW_ADDITIONAL_INC_PATHS})
     if(IS_ABSOLUTE ${INCLUDE_PATH})
-        set(CURR_ABS_INC_PATH "${FREERTOS_PATH}")
+        set(CURR_ABS_INC_PATH "${INCLUDE_PATH}")
     else()
         get_filename_component(CURR_ABS_INC_PATH
             ${INCLUDE_PATH} REALPATH BASE_DIR ${CMAKE_SOURCE_DIR})

events/EventManager.cpp

@@ -156,11 +156,11 @@ void EventManager::printUtility(sif::OutputTypes printType, EventMessage *messag
             sif::info << "0x" << std::hex << std::setw(8) << std::setfill('0') <<
                     message->getReporter() << std::setfill(' ') << std::dec;
         }
-        sif::info << " report event with ID " << message->getEventId() << std::endl;
-        sif::info << std::hex << "P1 Hex: 0x" << message->getParameter1() <<
-                " | P1 Dec: " << std::dec << message->getParameter1() <<  std::hex <<
-                " | P2 Hex: 0x" << message->getParameter2() << " | P2 Dec: " <<  std::dec <<
-                message->getParameter2() << std::endl;
+        sif::info << " reported event with ID " << message->getEventId() << std::endl;
+        sif::debug << translateEvents(message->getEvent()) << " | " <<std::hex << "P1 Hex: 0x" <<
+                message->getParameter1() << " | P1 Dec: " << std::dec << message->getParameter1() <<
+                std::hex << " | P2 Hex: 0x" << message->getParameter2() << " | P2 Dec: " <<
+                std::dec << message->getParameter2() << std::endl;
 #else
         if (string != 0) {
             sif::printInfo("Event Manager: %s reported event with ID %d\n", string,
@@ -186,11 +186,11 @@ void EventManager::printUtility(sif::OutputTypes printType, EventMessage *messag
             sif::debug << "0x" << std::hex << std::setw(8) << std::setfill('0') <<
                     message->getReporter() << std::setfill(' ') << std::dec;
         }
-        sif::debug << " report event with ID " << message->getEventId() << std::endl;
-        sif::debug << std::hex << "P1 Hex: 0x" << message->getParameter1() <<
-                " | P1 Dec: " << std::dec << message->getParameter1() <<  std::hex <<
-                " | P2 Hex: 0x" << message->getParameter2() << " | P2 Dec: " <<  std::dec <<
-                message->getParameter2() << std::endl;
+        sif::debug << " reported event with ID " << message->getEventId() << std::endl;
+        sif::debug << translateEvents(message->getEvent()) << " | " <<std::hex << "P1 Hex: 0x" <<
+                message->getParameter1() << " | P1 Dec: " << std::dec << message->getParameter1() <<
+                std::hex << " | P2 Hex: 0x" << message->getParameter2() << " | P2 Dec: " <<
+                std::dec << message->getParameter2() << std::endl;
 #else
         if (string != 0) {
             sif::printDebug("Event Manager: %s reported event with ID %d\n", string,

osal/linux/MessageQueue.cpp

@@ -12,8 +12,7 @@
 
 MessageQueue::MessageQueue(uint32_t messageDepth, size_t maxMessageSize):
         id(MessageQueueIF::NO_QUEUE),lastPartner(MessageQueueIF::NO_QUEUE),
-		defaultDestination(MessageQueueIF::NO_QUEUE),
-		maxMessageSize(maxMessageSize) {
+        defaultDestination(MessageQueueIF::NO_QUEUE), maxMessageSize(maxMessageSize) {
     //debug << "MessageQueue::MessageQueue: Creating a queue" << std::endl;
     mq_attr attributes;
     this->id = 0;
@@ -91,15 +90,14 @@ ReturnValue_t MessageQueue::handleError(mq_attr* attributes,
             sif::error << "This error can be fixed by setting the maximum "
                     "allowed message size higher!" << std::endl;
 #endif
-
         }
         break;
     }
     case(EEXIST): {
         // An error occured during open
         // We need to distinguish if it is caused by an already created queue
-		//There's another queue with the same name
-		//We unlink the other queue
+        // There's another queue with the same name
+        // We unlink the other queue
         int status = mq_unlink(name);
         if (status != 0) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
@@ -204,14 +202,11 @@ ReturnValue_t MessageQueue::receiveMessage(MessageQueueMessageIF* message) {
             //O_NONBLOCK or MQ_NONBLOCK was set and there are no messages
             //currently on the specified queue.
             return MessageQueueIF::EMPTY;
-		case EBADF:
+        case EBADF: {
             //mqdes doesn't represent a valid queue open for reading.
-#if FSFW_CPP_OSTREAM_ENABLED == 1
-			sif::error << "MessageQueue::receive: configuration error "
-			           << strerror(errno)  << std::endl;
-#endif
-			/*NO BREAK*/
-		case EINVAL:
+            return handleRecvError("EBADF");
+        }
+        case EINVAL: {
             /*
              * This value indicates one of the following:
              * - The pointer to the buffer for storing the received message,
@@ -221,12 +216,9 @@ ReturnValue_t MessageQueue::receiveMessage(MessageQueueMessageIF* message) {
              *   queue, and the QNX extended option MQ_READBUF_DYNAMIC hasn't
              *   been set in the queue's mq_flags.
              */
-#if FSFW_CPP_OSTREAM_ENABLED == 1
-			sif::error << "MessageQueue::receive: configuration error "
-					   << strerror(errno)  << std::endl;
-#endif
-			/*NO BREAK*/
-		case EMSGSIZE:
+            return handleRecvError("EINVAL");
+        }
+        case EMSGSIZE: {
             /*
              * This value indicates one of the following:
              * - the QNX extended option MQ_READBUF_DYNAMIC hasn't been set,
@@ -236,13 +228,18 @@ ReturnValue_t MessageQueue::receiveMessage(MessageQueueMessageIF* message) {
              *   given msg_len is too short for the message that would have
              *   been received.
              */
-#if FSFW_CPP_OSTREAM_ENABLED == 1
-			sif::error << "MessageQueue::receive: configuration error "
-			           << strerror(errno)  << std::endl;
-#endif
-			/*NO BREAK*/
-		case EINTR:
+            return handleRecvError("EMSGSIZE");
+        }
+
+        case EINTR: {
             //The operation was interrupted by a signal.
+            return handleRecvError("EINTR");
+        }
+        case ETIMEDOUT: {
+            //The operation was interrupted by a signal.
+            return handleRecvError("ETIMEDOUT");
+        }
+
         default:
 
             return HasReturnvaluesIF::RETURN_FAILED;
@@ -406,3 +403,17 @@ ReturnValue_t MessageQueue::sendMessageFromMessageQueue(MessageQueueId_t sendTo,
     }
     return HasReturnvaluesIF::RETURN_OK;
 }
+
+ReturnValue_t MessageQueue::handleRecvError(const char * const failString) {
+    if(failString == nullptr) {
+        return HasReturnvaluesIF::RETURN_FAILED;
+    }
+#if FSFW_CPP_OSTREAM_ENABLED == 1
+    sif::error << "MessageQueue::receiveMessage: " << failString << " error "
+            << strerror(errno)  << std::endl;
+#else
+    sif::printError("MessageQueue::receiveMessage: %s error %s\n", failString,
+            strerror(errno));
+#endif
+    return HasReturnvaluesIF::RETURN_FAILED;
+}

osal/linux/MessageQueue.h

@@ -182,6 +182,7 @@ private:
 	const size_t maxMessageSize;
 
 	ReturnValue_t handleError(mq_attr* attributes, uint32_t messageDepth);
+	ReturnValue_t handleRecvError(const char* const failString);
 };
 
 #endif /* FSFW_OSAL_LINUX_MESSAGEQUEUE_H_ */