cache mq args

src/fsfw/events/EventManager.cpp

@@ -53,8 +53,8 @@ void EventManager::notifyListeners(EventMessage* message) {
       if (result != HasReturnvaluesIF::RETURN_OK) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
         sif::error << std::hex << "EventManager::notifyListeners: MSG to 0x" << std::setfill('0')
-                   << std::setw(8) << listener.first << " failed with result 0x"
+                   << std::setw(8) << listener.first << " failed with result 0x" << std::setw(4)
-                   << std::setw(4) << result << std::setfill(' ') << std::endl;
+                   << result << std::setfill(' ') << std::endl;
 #else
         sif::printError("Sending message to listener 0x%08x failed with result %04x\n",
                         listener.first, result);

src/fsfw/ipc/QueueFactory.h

@@ -4,8 +4,8 @@
 #include <cstdint>
 
 #include "MessageQueueIF.h"
-#include "definitions.h"
 #include "MessageQueueMessage.h"
+#include "definitions.h"
 
 /**
  * Creates message queues.

src/fsfw/ipc/definitions.h

@@ -3,6 +3,8 @@
 #include <fsfw/objectmanager/SystemObjectIF.h>
 
 struct MqArgs {
+  MqArgs(){};
+  MqArgs(object_id_t objectId, void* args = nullptr) : objectId(objectId), args(args) {}
   object_id_t objectId = 0;
   void* args = nullptr;
 };

src/fsfw/osal/freertos/QueueFactory.cpp

@@ -22,7 +22,8 @@ QueueFactory::QueueFactory() {}
 
 QueueFactory::~QueueFactory() {}
 
-MessageQueueIF* QueueFactory::createMessageQueue(uint32_t messageDepth, size_t maxMessageSize, MqArgs* args) {
+MessageQueueIF* QueueFactory::createMessageQueue(uint32_t messageDepth, size_t maxMessageSize,
+                                                 MqArgs* args) {
   return new MessageQueue(messageDepth, maxMessageSize, args);
 }
 

src/fsfw/osal/host/MessageQueue.h

@@ -7,8 +7,8 @@
 #include "fsfw/internalerror/InternalErrorReporterIF.h"
 #include "fsfw/ipc/MessageQueueIF.h"
 #include "fsfw/ipc/MessageQueueMessage.h"
-#include "fsfw/ipc/definitions.h"
 #include "fsfw/ipc/MutexIF.h"
+#include "fsfw/ipc/definitions.h"
 #include "fsfw/timemanager/Clock.h"
 
 /**

src/fsfw/osal/host/QueueFactory.cpp

@@ -27,7 +27,8 @@ QueueFactory::QueueFactory() {}
 
 QueueFactory::~QueueFactory() {}
 
-MessageQueueIF* QueueFactory::createMessageQueue(uint32_t messageDepth, size_t maxMessageSize, MqArgs* args) {
+MessageQueueIF* QueueFactory::createMessageQueue(uint32_t messageDepth, size_t maxMessageSize,
+                                                 MqArgs* args) {
   // A thread-safe queue can be implemented  by using a combination
   // of std::queue and std::mutex. This uses dynamic memory allocation
   // which could be alleviated by using a custom allocator, external library

src/fsfw/osal/linux/MessageQueue.cpp

@@ -37,6 +37,9 @@ MessageQueue::MessageQueue(uint32_t messageDepth, size_t maxMessageSize, MqArgs*
     // Successful mq_open call
     this->id = tempId;
   }
+  if (args != nullptr) {
+    this->mqArgs = *args;
+  }
 }
 
 MessageQueue::~MessageQueue() {

src/fsfw/osal/linux/MessageQueue.h

@@ -5,8 +5,8 @@
 
 #include "fsfw/internalerror/InternalErrorReporterIF.h"
 #include "fsfw/ipc/MessageQueueIF.h"
-#include "fsfw/ipc/definitions.h"
 #include "fsfw/ipc/MessageQueueMessage.h"
+#include "fsfw/ipc/definitions.h"
 /**
  * @brief		This class manages sending and receiving of message queue messages.
  *
@@ -186,6 +186,8 @@ class MessageQueue : public MessageQueueIF {
    */
   char name[16];
 
+  MqArgs mqArgs = {};
+
   static uint16_t queueCounter;
   const size_t maxMessageSize;
 

src/fsfw/osal/linux/QueueFactory.cpp

@@ -28,7 +28,8 @@ QueueFactory::QueueFactory() {}
 
 QueueFactory::~QueueFactory() {}
 
-MessageQueueIF* QueueFactory::createMessageQueue(uint32_t messageDepth, size_t maxMessageSize, MqArgs* args) {
+MessageQueueIF* QueueFactory::createMessageQueue(uint32_t messageDepth, size_t maxMessageSize,
+                                                 MqArgs* args) {
   return new MessageQueue(messageDepth, maxMessageSize, args);
 }
 

src/fsfw/osal/rtems/MessageQueue.h

@@ -4,8 +4,8 @@
 #include "RtemsBasic.h"
 #include "fsfw/internalerror/InternalErrorReporterIF.h"
 #include "fsfw/ipc/MessageQueueIF.h"
-#include "fsfw/ipc/definitions.h"
 #include "fsfw/ipc/MessageQueueMessage.h"
+#include "fsfw/ipc/definitions.h"
 
 /**
  *	@brief		This class manages sending and receiving of message queue messages.

src/fsfw/osal/rtems/QueueFactory.cpp

@@ -49,7 +49,8 @@ QueueFactory::QueueFactory() {}
 
 QueueFactory::~QueueFactory() {}
 
-MessageQueueIF* QueueFactory::createMessageQueue(uint32_t messageDepth, size_t maxMessageSize, MqArgs* args) {
+MessageQueueIF* QueueFactory::createMessageQueue(uint32_t messageDepth, size_t maxMessageSize,
+                                                 MqArgs* args) {
   return new MessageQueue(messageDepth, maxMessageSize, args);
 }