Make Supervisor inherit from Debugger

Author: tolauwae

src/Debug/debugger.h

@@ -12,7 +12,6 @@
 #include <vector>
 
 #include "../Edward/proxy.h"
-#include "../Edward/proxy_supervisor.h"
 #include "../Threading/warduino-thread.h"
 #include "../Utils/sockets.h"
 
@@ -109,6 +108,8 @@ enum class SnapshotPolicy : int {
                          // points where primitives are used.
 };
 
+class ProxySupervisor;
+
 class Debugger {
    private:
     std::deque<uint8_t *> debugMessages = {};

src/Edward/proxy_supervisor.cpp

@@ -53,9 +53,8 @@ Event *parseJSON(char *buff) {
     return new Event(*parsed.find("topic"), payload);
 }
 
-ProxySupervisor::ProxySupervisor(Channel *duplex, warduino::mutex *mutex) {
+ProxySupervisor::ProxySupervisor(Channel *duplex, warduino::mutex *mutex) : Debugger(duplex) {
     debug("Starting supervisor.\n");
-    this->channel = duplex;
     this->mutex = mutex;
     this->thread = warduino::thread(runSupervisor, this);
     this->proxyResult = nullptr;
@@ -70,39 +69,21 @@ bool isReply(nlohmann::basic_json<> parsed) {
 }
 
 void ProxySupervisor::listenToSocket() {
-    char _char;
-    uint32_t buf_idx = 0;
-    const uint32_t start_size = 1024;
-    uint32_t current_size = start_size;
-    char *buffer = (char *)malloc(start_size);
+    uint8_t message[1024] = {0};
     ssize_t readAmount;
 
     this->channel->open();
 
     dbg_info("Proxy supervisor listening to remote device...\n");
     while (continuing(this->mutex)) {
-        readAmount = this->channel->read(&_char, 1);
+        readAmount = this->channel->read(message, 1024);
         if (readAmount == -1) {
             printf("Proxy supervisor shutting down.\n");
             exit(-1);
         }
         if (readAmount > 0) {
-            // increase buffer size if needed
-            if (current_size <= (buf_idx + 1)) {
-                char *new_buff = (char *)malloc(current_size + start_size);
-                memcpy((void *)new_buff, (void *)buffer, current_size);
-                free(buffer);
-                buffer = new_buff;
-                current_size += start_size;
-                printf("increasing PushClient's buffer size to %" PRId32 "\n",
-                       current_size);
-            }
-            buffer[buf_idx++] = _char;
-            // manual null-termination is needed because parseJSON does not use
-            // first len argument
-            buffer[buf_idx] = '\0';
             try {
-                nlohmann::basic_json<> parsed = nlohmann::json::parse(buffer);
+                nlohmann::basic_json<> parsed = nlohmann::json::parse(message);
                 debug("parseJSON: %s\n", parsed.dump().c_str());
 
                 if (isEvent(parsed)) {
@@ -115,13 +96,9 @@ void ProxySupervisor::listenToSocket() {
                     this->hasReplied = true;
                     this->proxyResult = parsed;
                 }
-
-                buf_idx = 0;
             } catch (const nlohmann::detail::parse_error &e) {
-                if (_char == '\n') {
-                    // discard buffer
-                    buf_idx = 0;
-                }
+                printf("Non RFC call: %s", message);
+                WARDuino::instance()->handleInterrupt(readAmount, message);
             }
         }
     }
@@ -276,7 +253,7 @@ bool ProxySupervisor::call(RFC *callee) {
     char cmdBuffer[10] = "";
     int cmdBufferLen = 0;
     sprintf(cmdBuffer, "%x\n%n", interruptDUMPCallbackmapping, &cmdBufferLen);
-    WARDuino::instance()->debugger->supervisor->send(cmdBuffer, cmdBufferLen);
+    this->send(cmdBuffer, cmdBufferLen);
     this->deserializeRFCResult(callee);
     return true;
 }

src/Edward/proxy_supervisor.h

@@ -6,6 +6,7 @@
 #include <set>
 #include <thread>
 
+#include "../Debug/debugger.h"
 #include "../Threading/warduino-thread.h"
 #include "../Utils/sockets.h"
 #include "RFC.h"
@@ -16,9 +17,8 @@
 #endif
 #include "sys/types.h"
 
-class ProxySupervisor {
+class ProxySupervisor : public Debugger {
    private:
-    Channel *channel;
     warduino::mutex *mutex;
     std::set<uint32_t> *proxied = new std::set<uint32_t>();