Feat/add task name (#64)

* add task name * set max size to valid size * fix posix build * format
SwarmUS · Nov 20, 2021 · 1d516c1 · 1d516c1
1 parent 026accd
commit 1d516c1
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 5 deletions.
diff --git a/src/os/freertos/include/AbstractTask.h b/src/os/freertos/include/AbstractTask.h
@@ -19,6 +19,8 @@ class AbstractTask : public IAbstractTask {
 
     bool start() override;
 
+    const char* getTaskName() override;
+
     bool isRunning() override;
 
     TaskHandle_t getTaskHandle() override;

diff --git a/src/os/freertos/include/AbstractTask.tpp b/src/os/freertos/include/AbstractTask.tpp
@@ -25,6 +25,11 @@ bool AbstractTask<stackSize>::start() {
     return false;
 }
 
+template <unsigned int stackSize>
+const char* AbstractTask<stackSize>::getTaskName() {
+    return m_taskName;
+}
+
 template <unsigned int stackSize>
 bool AbstractTask<stackSize>::isRunning() {
     return m_taskRunning;

diff --git a/src/os/include/IAbstractTask.h b/src/os/include/IAbstractTask.h
@@ -20,6 +20,12 @@ class IAbstractTask {
      **/
     virtual bool start() = 0;
 
+    /**
+     *@brief Gets the name of the task
+     *@return returns a pointer to the name of the task
+     **/
+    virtual const char* getTaskName() = 0;
+
     /**
      *@brief check if the task is currently running
      *

diff --git a/src/os/posix/include/AbstractTask.h b/src/os/posix/include/AbstractTask.h
@@ -4,6 +4,7 @@
 #include "IAbstractTask.h"
 #include "OSMacros.h"
 #include <stdint.h>
+#include <string>
 #include <thread>
 
 template <unsigned int stackSize>
@@ -15,6 +16,8 @@ class AbstractTask : public IAbstractTask {
 
     bool start() override;
 
+    const char* getTaskName() override;
+
     bool isRunning() override;
 
     TaskHandle_t getTaskHandle() override;
@@ -24,6 +27,7 @@ class AbstractTask : public IAbstractTask {
 
     static void wrapper(void* params);
 
+    const char* m_taskName;
     bool m_taskRunning = false;
     std::thread m_thread;
 };

diff --git a/src/os/posix/include/AbstractTask.tpp b/src/os/posix/include/AbstractTask.tpp
@@ -2,8 +2,8 @@
 #define ABSTRACTTASK_TPP
 
 template <unsigned int stackSize>
-AbstractTask<stackSize>::AbstractTask(const char* taskName, UBaseType_t priority) {
-    (void)taskName;
+AbstractTask<stackSize>::AbstractTask(const char* taskName, UBaseType_t priority) :
+    m_taskName(taskName) {
     (void)priority;
 }
 
@@ -28,6 +28,11 @@ bool AbstractTask<stackSize>::start() {
     return false;
 }
 
+template <unsigned int stackSize>
+const char* AbstractTask<stackSize>::getTaskName() {
+    return m_taskName;
+}
+
 template <unsigned int stackSize>
 bool AbstractTask<stackSize>::isRunning() {
     return m_taskRunning;

diff --git a/src/pheromones/src/HiveMindHostAccumulatorSerializer.cpp b/src/pheromones/src/HiveMindHostAccumulatorSerializer.cpp
@@ -10,8 +10,8 @@ bool HiveMindHostAccumulatorSerializer::serializeToStream(const MessageDTO& mess
     Message msgSend;
     message.serialize(msgSend);
 
-    pb_ostream_t outputStream{HiveMindHostAccumulatorSerializer::streamCallback, this, SIZE_MAX, 0,
-                              0};
+    pb_ostream_t outputStream{HiveMindHostAccumulatorSerializer::streamCallback, this,
+                              2 * Message_size, 0, 0};
 
     if (pb_encode_ex(&outputStream, Message_fields, &msgSend, PB_ENCODE_DELIMITED)) {
         bool ret = m_stream.send(m_data.data(), m_messageLength);

diff --git a/src/pheromones/src/HiveMindHostSerializer.cpp b/src/pheromones/src/HiveMindHostSerializer.cpp
@@ -8,7 +8,7 @@ bool HiveMindHostSerializer::serializeToStream(const MessageDTO& message) {
     Message msgSend;
     message.serialize(msgSend);
 
-    pb_ostream_t outputStream{HiveMindHostSerializer::streamCallback, this, SIZE_MAX, 0, 0};
+    pb_ostream_t outputStream{HiveMindHostSerializer::streamCallback, this, 2 * Message_size, 0, 0};
 
     return pb_encode_ex(&outputStream, Message_fields, &msgSend, PB_ENCODE_DELIMITED);
 }