完善插件信息

andrewbytecoder · andrewbytecoder · commit bb4c129005d2 · 2022-06-30T00:05:47.000+08:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -19,6 +19,7 @@ message(STATUS　${CPACK_PACKAGE_VERSION})
 
 add_subdirectory(3rd/glog)
 #add_subdirectory(3rd/civetweb)
+add_subdirectory(plugins)
 
 
 
diff --git a/inc/dlms_bash.h b/inc/dlms_bash.h
@@ -6,11 +6,12 @@
 #define DLMS_DLMS_BASH_H
 #include <iostream>
 #include <functional>
+#include "thread_manager.h"
 
 class Plugin;
 class IDlms {
 public:
-    typedef typename std::function<int32_t ()> Func;
+
 
 public:
     virtual ~IDlms() = default;
@@ -51,9 +52,7 @@ class IDlms {
     virtual Plugin *GetPlugin(std::string &pluginName) = 0;
 
     // 将需要工作的线程放到Push里面
-    virtual uint32_t PushWorker(Func workFunction) = 0;
-    // 如果某些函数不需要再执行了就Pop掉，之后主框架就不在执行该函数了
-    virtual int32_t PopWorker(uint32_t Index) = 0;
+    virtual uint32_t Dispatch(Func workFunction) = 0;
 };
 
 
diff --git a/inc/plugin.h b/inc/plugin.h
@@ -36,7 +36,7 @@ class Plugin {
         PLUGIN_INIT                = 1,
         PLUGIN_RUNNING             = 2,
         PLUGIN_STOP                = 3,
-        PLUGIN_Reset                = 4,
+        PLUGIN_Reset               = 4,
     };
     //
 
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
@@ -0,0 +1,24 @@
+
+
+# 设置静态库文件目录
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/lib)
+# 动态库文件目录
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin/plugins)
+# 可执行文件目录
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin)
+
+
+
+add_library(websocket SHARED
+        websocket/websocket_plugin.cpp
+        websocket/websocket_server.cpp
+        websocket/websocket_client.cpp)
+target_link_libraries(websocket
+        PUBLIC pthread)
+target_include_directories(websocket
+        PUBLIC ${PROJECT_SOURCE_DIR}/inc
+        PUBLIC ${PROJECT_SOURCE_DIR}/3rd/civetweb)
+
+
+
+
diff --git a/src/dlms/dlms.cpp b/src/dlms/dlms.cpp
@@ -7,6 +7,7 @@
 #include "dlms.h"
 #include "json.hpp"
 #include "dlms_macro.h"
+#include "dlms_error.h"
 
 using json=nlohmann::json;
 
@@ -23,6 +24,10 @@ int main(int argc, char* argv[]) {
     // 1. 解析命令行参数
     dlms.ParseCommandLine(argc, argv);
 
+    dlms.Init();
+    dlms.Start();
+    dlms.Stop();
+    dlms.Reset();
 
 
 
@@ -42,6 +47,12 @@ int main(int argc, char* argv[]) {
 
 int32_t CDlms::Init() {
 
+    // 具体的线程个数从配置文件中获取
+    lpThreadManager = new (std::nothrow) ThreadManager(10);
+    if (nullptr == lpThreadManager) {
+
+        return ERROR;
+    }
 
 
     return 0;
@@ -56,6 +67,9 @@ int32_t CDlms::Stop() {
 }
 
 int32_t CDlms::Reset() {
+
+    delete lpThreadManager;
+
     return 0;
 }
 
@@ -74,11 +88,7 @@ int32_t CDlms::ParseCommandLine(int32_t argc, char **argv) {
     return config.ParseCommandLine(argc, argv);
 }
 
-uint32_t CDlms::PushWorker(IDlms::Func workFunction) {
-    return 0;
-}
-
-int32_t CDlms::PopWorker(uint32_t Index) {
+uint32_t CDlms::Dispatch(Func workFunction) {
     return 0;
 }
 
diff --git a/src/dlms/dlms.h b/src/dlms/dlms.h
@@ -12,6 +12,7 @@
 #include <dlms_bash.h>
 #include "plugin_manager.h"
 #include "json_proxy.h"
+#include "thread_manager.h"
 
 
 
@@ -44,14 +45,14 @@ class CDlms : public IDlms {
     int32_t ParseCommandLine(int32_t argc, char* argv[]);
 
     // 将需要工作的线程放到Push里面
-    uint32_t PushWorker(Func workFunction) override;
+    uint32_t Dispatch(Func workFunction) override;
     // 如果某些函数不需要再执行了就Pop掉，之后主框架就不在执行该函数了
-    int32_t PopWorker(uint32_t Index) override;
 
 
 private:
     PluginManager pluginManager;
     CConfig        config;
+    ThreadManager *lpThreadManager{nullptr};
 };
 
 
diff --git a/utils/status.h b/utils/status.h
@@ -146,7 +146,7 @@ class Status {
         state_ = result;
     }
 
-    static const char *CopyState(const char *s) {
+    static const char *CopyState(const char *state) {
         uint32_t size;
         std::memcpy(&size, state, sizeof(size));
         char *result = new char[size + 5];
diff --git a/utils/thread_manager.h b/utils/thread_manager.h
@@ -0,0 +1,86 @@
+//
+// Created by andrew on 2022/6/29.
+//
+
+#ifndef DLMS_THREAD_MANAGER_H
+#define DLMS_THREAD_MANAGER_H
+#include <thread>
+#include <mutex>
+#include <queue>
+#include <atomic>
+#include <condition_variable>
+
+typedef typename std::function<int32_t ()> Func;
+
+class ThreadManager {
+public:
+    enum ThreadStatus {
+        Initializing = 0,
+        Running = 1,
+        Stopping = 2,
+    };
+
+public:
+    explicit ThreadManager(uint32_t threadNumber) {
+        threadStatus = Initializing;
+        this->Start(threadNumber);
+    }
+    ~ThreadManager() {
+        Stop();
+    }
+
+    void Start(uint32_t threadNumber) {
+        threadStatus = Running;
+        for (uint32_t i = 0; i < threadNumber; i++) {
+            this->threadPool.emplace_back(&ThreadManager::Run, this);
+        }
+    }
+
+    void Dispatch(const Func& func) {
+        std::unique_lock<std::mutex> lock(mux);
+        queueFunc.push(func);
+        lock.unlock();
+        cv.notify_one();
+    }
+
+    void Stop() {
+        std::unique_lock<std::mutex> lock(mux);
+        threadStatus = Stopping;
+        lock.unlock();
+        cv.notify_all();
+        for (auto& dispatchThread : threadPool) {
+            dispatchThread.join();
+        }
+    }
+
+private:
+    void Run() {
+
+        std::unique_lock<std::mutex> lock(mux);
+        while (Running == threadStatus) {
+            cv.wait(lock, [&]{return (!queueFunc.empty() || Quit());});
+            if (!Quit() && !queueFunc.empty()) {
+                auto op = std::move(queueFunc.front());
+                queueFunc.pop();
+                lock.unlock();
+                op();
+                lock.lock();
+            }
+        }
+    }
+    bool Quit() {
+        return threadStatus != Running;
+    }
+
+private:
+    std::vector<std::thread> threadPool{}; // 线程池
+    ThreadStatus threadStatus{Initializing}; //
+    std::mutex mux;
+    std::queue<Func> queueFunc;
+    std::condition_variable cv;
+    std::atomic<bool> shouldContinue{};
+};
+
+
+
+#endif //DLMS_THREAD_MANAGER_H

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ message(STATUS　${CPACK_PACKAGE_VERSION})`
`19`	`19`
`20`	`20`	`add_subdirectory(3rd/glog)`
`21`	`21`	`#add_subdirectory(3rd/civetweb)`
	`22`	`+add_subdirectory(plugins)`
`22`	`23`
`23`	`24`
`24`	`25`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ class Status {`
`146`	`146`	`state_ = result;`
`147`	`147`	`}`
`148`	`148`
`149`		`- static const char CopyState(const char s) {`
	`149`	`+ static const char CopyState(const char state) {`
`150`	`150`	`uint32_t size;`
`151`	`151`	`std::memcpy(&size, state, sizeof(size));`
`152`	`152`	`char *result = new char[size + 5];`