random stuff

Wiebe Cazemier
1 parent 54f45b27
Showing 5 changed files with 40 additions and 5 deletions
main.cpp
mainapp.cpp
mainapp.h
utils.cpp
utils.h
@@ -5,7 +5,7 @@
 #include "mainapp.h"
-static MainApp mainApp;
+MainApp *mainApp = MainApp::getMainApp();
 static void signal_handler(int signal)
 {
@@ -19,7 +19,7 @@ static void signal_handler(int signal)
     }
     else if (signal == SIGTERM || signal == SIGINT)
     {
-        mainApp.quit();
+        mainApp->quit();
     }
     else
     {
@@ -59,7 +59,7 @@ int main()
     try
     {
         check<std::runtime_error>(register_signal_handers());
-        mainApp.start();
+        mainApp->start();
     }
     catch (std::exception &ex)
     {
@@ -4,6 +4,8 @@
 #define MAX_EVENTS 1024
 #define NR_OF_THREADS 4
+MainApp *MainApp::instance = nullptr;
+
 void do_thread_work(ThreadData *threadData)
 {
     int epoll_fd = threadData->epollfd;
@@ -86,6 +88,14 @@ MainApp::MainApp() :
 }
+MainApp *MainApp::getMainApp()
+{
+    if (instance == nullptr)
+        instance = new MainApp();
+
+    return instance;
+}
+
 void MainApp::start()
 {
     int listen_fd = check<std::runtime_error>(socket(AF_INET, SOCK_STREAM, 0));
@@ -17,15 +17,19 @@
 #include "mqttpacket.h"
 #include "subscriptionstore.h"
-
 class MainApp
 {
+    static MainApp *instance;
+
     bool running = true;
     std::vector<std::shared_ptr<ThreadData>> threads;
     std::shared_ptr<SubscriptionStore> subscriptionStore;
-public:
     MainApp();
+public:
+    MainApp(const MainApp &rhs) = delete;
+    MainApp(MainApp &&rhs) = delete;
+    static MainApp *getMainApp();
     void start();
     void quit();
 };
 #include "utils.h"
+
+std::list<std::__cxx11::string> split(const std::string &input, const char sep, size_t max, bool keep_empty_parts)
+{
+    std::list<std::string> list;
+    size_t start = 0;
+    size_t end;
+
+    while (list.size() < max && (end = input.find(sep, start)) != std::string::npos)
+    {
+        if (start != end || keep_empty_parts)
+            list.push_back(input.substr(start, end - start));
+        start = end + 1; // increase by length of seperator.
+    }
+    if (start != input.size() || keep_empty_parts)
+        list.push_back(input.substr(start, std::string::npos));
+    return list;
+}
@@ -4,6 +4,8 @@
 #include <string.h>
 #include <errno.h>
 #include <string>
+#include <list>
+#include <limits>
 template<typename T> int check(int rc)
 {
@@ -17,4 +19,6 @@ template&lt;typename T&gt; int check(int rc)
     return rc;
 }
+std::list<std::string> split(const std::string &input, const char sep, size_t max = std::numeric_limits<int>::max(), bool keep_empty_parts = true);
+
 #endif // UTILS_H