Various services improved (#110)

TactilityCore/Source/Dispatcher.cpp

@@ -1,39 +1,50 @@
 #include "Dispatcher.h"
+#include "Check.h"
 
 namespace tt {
 
-Dispatcher::Dispatcher(size_t queueLimit) :
-    queue(queueLimit, sizeof(DispatcherMessage)),
-    mutex(MutexTypeNormal),
-    buffer({ .callback = nullptr, .context = nullptr }) { }
+#define TAG "Dispatcher"
+#define BACKPRESSURE_WARNING_COUNT 100
+
+Dispatcher::Dispatcher() :
+    mutex(MutexTypeNormal)
+{}
 
 Dispatcher::~Dispatcher() {
-    queue.reset();
     // Wait for Mutex usage
     mutex.acquire(TtWaitForever);
     mutex.release();
 }
 
-void Dispatcher::dispatch(Callback callback, void* context) {
-    DispatcherMessage message = {
-        .callback = callback,
-        .context = context
-    };
+void Dispatcher::dispatch(Callback callback, std::shared_ptr<void> context) {
+    auto message = std::make_shared<DispatcherMessage>(callback, std::move(context));
+    // Mutate
     mutex.acquire(TtWaitForever);
-    queue.put(&message, TtWaitForever);
+    queue.push(std::move(message));
+    if (queue.size() == BACKPRESSURE_WARNING_COUNT) {
+        TT_LOG_W(TAG, "Backpressure: You're not consuming fast enough (100 queued)");
+    }
     mutex.release();
+    // Signal
+    eventFlag.set(1);
 }
 
-bool Dispatcher::consume(uint32_t timeout_ticks) {
-    mutex.acquire(TtWaitForever);
-    if (queue.get(&buffer, timeout_ticks) == TtStatusOk) {
-        buffer.callback(buffer.context);
-        mutex.release();
-        return true;
-    } else {
-        mutex.release();
-        return false;
+uint32_t Dispatcher::consume(uint32_t timeout_ticks) {
+    // Wait for signal and clear
+    eventFlag.wait(1, TtFlagWaitAny, timeout_ticks);
+    eventFlag.clear(1);
+
+    // Mutate
+    if (mutex.acquire(1 / portTICK_PERIOD_MS) == TtStatusOk) {
+        auto item = queue.front();
+        queue.pop();
+        // Don't keep lock as callback might be slow
+        tt_check(mutex.release() == TtStatusOk);
+
+        item->callback(item->context);
     }
+
+    return true;
 }
 
 } // namespace