Command input interface

mhtvsSFrpHdE · Aug 7, 2022 · 1a1c9eb · 1a1c9eb
1 parent 1326e24
commit 1a1c9eb
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 10 deletions.
diff --git a/qpp/prefetch/Source/Global/global.cpp b/qpp/prefetch/Source/Global/global.cpp
@@ -8,6 +8,7 @@
 #include "..\Setting\setting.h"
 
 QCoreApplication *Global::qCoreApplication = NULL;
+LoopThread *Global::inputLoopThreadAddress = NULL;
 
 void Global::init(int argc, char *argv[])
 {

diff --git a/qpp/prefetch/Source/Global/global.h b/qpp/prefetch/Source/Global/global.h
@@ -1,11 +1,15 @@
 #include <QCoreApplication>
 
+#include "..\Input\Thread\loop_thread.h"
+
 // Static class
 class Global
 {
 public:
     static QCoreApplication *qCoreApplication;
 
+    static LoopThread *inputLoopThreadAddress;
+
     // Any init code
     static void init(int argc, char *argv[]);
 

diff --git a/qpp/prefetch/Source/Input/Thread/loop_thread.cpp b/qpp/prefetch/Source/Input/Thread/loop_thread.cpp
@@ -1,4 +1,7 @@
+#include <QTextStream>
+
 #include "loop_thread.h"
+#include "..\..\Input\stdin.h"
 #include "..\..\Output\stdout.h"
 
 LoopThread::LoopThread() {}
@@ -7,10 +10,37 @@ void LoopThread::run()
 {
     while (true)
     {
-        *StdOut::consoleOutput << "Std in loop thread test"
-                               << endl;
-        StdOut::consoleOutput->flush();
+        // Get input
+        auto input = StdIn::consoleInput->readLine();
 
-        sleep(3);
+        // Find command and run command
+        if (commandMap.contains(input))
+        {
+            auto target = commandMap[input];
+            (*target)();
+        }
+        // Command not found
+        else
+        {
+            *StdOut::consoleOutput << "Invalid command"
+                                   << endl;
+            StdOut::consoleOutput->flush();
+        }
     }
 }
+
+namespace ConsoleCommandFunction
+{
+    void pause()
+    {
+        *StdOut::consoleOutput << "Trying to pause prefetch"
+                               << endl;
+        StdOut::consoleOutput->flush();
+    };
+}
+
+// Cool stuff: https://stackoverflow.com/questions/8157625/how-do-i-populate-values-of-a-static-qmap-in-c-qt
+// Use initializer list and one of the QMap constructor
+QMap<QString, void (*)()> LoopThread::commandMap(
+    std::map<QString, void (*)()>{
+        {"pause", &ConsoleCommandFunction::pause}});
diff --git a/qpp/prefetch/Source/Input/Thread/loop_thread.h b/qpp/prefetch/Source/Input/Thread/loop_thread.h
@@ -1,4 +1,5 @@
 #include <QThread>
+#include <QMap>
 
 class LoopThread : public QThread
 {
@@ -7,4 +8,8 @@ class LoopThread : public QThread
     LoopThread();
 
     void run();
-};
+
+private:
+    // Convert stdin command to function pointer
+    static QMap<QString, void (*)()> commandMap;
+};
diff --git a/qpp/prefetch/Source/Input/stdin.cpp b/qpp/prefetch/Source/Input/stdin.cpp
@@ -1,13 +1,16 @@
 #include "stdin.h"
 
-LoopThread *StdIn::loopThreadAddress = NULL;
+#include "..\Global\global.h"
+
+QTextStream *StdIn::consoleInput;
 
 void StdIn::init()
 {
-    loopThreadAddress = new LoopThread();
+    consoleInput = new QTextStream(stdin);
+    Global::inputLoopThreadAddress = new LoopThread();
 }
 
 void StdIn::start()
 {
-    loopThreadAddress->start();
+    Global::inputLoopThreadAddress->start();
 }
diff --git a/qpp/prefetch/Source/Input/stdin.h b/qpp/prefetch/Source/Input/stdin.h
@@ -1,10 +1,10 @@
-#include "Thread\loop_thread.h"
+#include <QTextStream>
 
 // Static class
 class StdIn
 {
 public:
-    static LoopThread *loopThreadAddress;
+    static QTextStream *consoleInput;
 
     // Any init code
     static void init();