微调

module/Local_Server/Data_Feed/data_feed_thread.cpp

@@ -39,7 +39,33 @@ ucoro::awaitable<void> data_feed_thread_coro(std::atomic<bool>& running) {
         for (auto& source : mode_acs.data_source_config.map.list()) {
             if (!source->enable) continue;
             if (!source->is_open() && !source->open()) continue;
-            co_await source->source_step_coro();
+
+
+            co_await source->handle_in_loop_coro();
+            auto mode_data = co_await source->read_coro();
+
+            struct Process_Result {
+                std::exception_ptr exception;
+            };
+
+            auto result = co_await ucoro::callback_awaitable<Process_Result>(
+                [source, mode_data = std::move(mode_data)](auto done) mutable {
+                    asio::post(
+                        data_source_process_pool(),
+                        [source, mode_data = std::move(mode_data), done = std::move(done)]() mutable {
+                            try {
+                                source->process_mode_acs_data(mode_data);
+                                done(Process_Result{});
+                            } catch (...) {
+                                done(Process_Result{std::current_exception()});
+                            }
+                    });
+                });
+
+            if (result.exception) {
+                std::rethrow_exception(result.exception);
+            }
+
         }
 
         // 这两个每次循环都要重新计算 保证实时性

module/Local_Server/Data_Source/Data_Source.cpp

@@ -9,15 +9,12 @@
 #include "../server/Global.h"
 #include "Database.h"
 
-namespace {
 asio::thread_pool& data_source_process_pool() {
     const auto hardware_threads = std::thread::hardware_concurrency();
     const auto worker_count = std::max(2u, hardware_threads > 2 ? hardware_threads - 2 : hardware_threads);
     static asio::thread_pool pool(worker_count);
     return pool;
 }
-}
-
 Psc::serial::Serial* create_serial(const std::string& serial_name, Baud_Rate_Type baud_rate) {
     auto serial = new Psc::serial::Serial;
     serial->set_serial_name(serial_name);
@@ -107,33 +104,6 @@ void File_Data_Source::before_handle_msg(std::shared_ptr<SSR::Mode_Msg>& msg) {
 
 
 
-ucoro::awaitable<void> Data_Source::source_step_coro() {
-    co_await handle_in_loop_coro();
-    auto mode_data = co_await read_coro();
-
-    struct Process_Result {
-        std::exception_ptr exception;
-    };
-    auto self = that();
-    auto result = co_await ucoro::callback_awaitable<Process_Result>(
-        [this, self = std::move(self), mode_data = std::move(mode_data)](auto done) mutable {
-            asio::post(
-                data_source_process_pool(),
-                [this, self = std::move(self), mode_data = std::move(mode_data), done = std::move(done)]() mutable {
-                    try {
-                        process_mode_acs_data(mode_data);
-                        done(Process_Result{});
-                    } catch (...) {
-                        done(Process_Result{std::current_exception()});
-                    }
-                });
-        });
-
-    if (result.exception) {
-        std::rethrow_exception(result.exception);
-    }
-    co_return;
-}
 
 
 

module/Local_Server/Data_Source/Data_Source.h

@@ -10,7 +10,7 @@ class SM_RingBuffer;
 // 统一封装数据输出的模式
 class Data_Source;
 std::shared_ptr<Data_Source> create_from_json(const Psc::JSON *that_json);
-
+asio::thread_pool& data_source_process_pool();
 
 class Input_Format {
 public:
@@ -79,7 +79,7 @@ public:
     Data_Source();
     std::shared_ptr<SSR::Mode_Msg> last_prase_msg = nullptr;
     virtual ucoro::awaitable<void> handle_in_loop_coro(){co_return;}
-    virtual ucoro::awaitable<void> source_step_coro();
+
     std::atomic<bool>      enable{};
     std::string            type;
     std::atomic<bool>      base_station_show{};