重构协程

module/Local_Server/Data_Source/Data_Source.h

@@ -7,7 +7,7 @@
 namespace Psc {
 class SM_RingBuffer;
 }
-// 统一封装数据输出的模式
+
 class Data_Source;
 std::shared_ptr<Data_Source> create_from_json(const Psc::JSON *that_json);
 
@@ -68,17 +68,17 @@ protected:
 class Data_Source : public std::enable_shared_from_this<Data_Source>, public Data_Source_Handler {
 public:
     ~Data_Source() override = default;
-    std::unique_ptr<psco::awaitable<void>> loop_task;
+    std::unique_ptr<concurrencpp::result<void>> loop_task;
     std::shared_ptr<Data_Source> that();
-    virtual psco::awaitable<std::string> read_coro() {co_return "";};
+    virtual concurrencpp::result<std::string> read_coro() {co_return "";};
     bool registered() const;
     virtual Psc::JSON get_custom_state_json() = 0;
     Psc::JSON get_state();
-    std::string last_char; // 用于处理奇数字节的情况
+    std::string last_char; // 用于处理奇数字节的情�?
     // std::shared_ptr<Input_Format> parse_format;
     Data_Source();
     std::shared_ptr<SSR::Mode_Msg> last_prase_msg = nullptr;
-    virtual psco::awaitable<void> handle_in_loop_coro(){co_return;}
+    virtual concurrencpp::result<void> handle_in_loop_coro(){co_return;}
     std::atomic<bool>      enable{};
     std::string            type;
     std::atomic<bool>      base_station_show{};
@@ -99,8 +99,8 @@ public:
         Psc::JSON ret = Psc::JSON::object();
         Ret_J(enable);
         Ret_J(type);
-        ret.append({"飞机总数", get_aircraft_num()});
-        ret.append({"解出位置的数量", have_pos_aircraft_num});
+        ret.append({"aircraft_total", get_aircraft_num()});
+        ret.append({"aircraft_with_position", have_pos_aircraft_num});
         ret.append({"mode_ac_statistic", mode_ac_statistic.to_json()});
         ret.append({"mode_s_statistic", mode_s_statistic.to_json()});
         ret.append({"all_connect_feed", get_all_connect_feed_status()});
@@ -167,7 +167,7 @@ protected:
 
 
 struct TCP_Client_Data_Source : Data_Source {
-    psco::awaitable<void> handle_in_loop_coro() override {
+    concurrencpp::result<void> handle_in_loop_coro() override {
         co_await cli.tick_coro();
         co_return;
     }
@@ -190,7 +190,7 @@ struct TCP_Client_Data_Source : Data_Source {
 
         cli.set_dest_address(addr);
         cli.create();
-        psco::sync_await(cli.connect_coro());
+        (cli.connect_coro()).get();
         return true;
     }
     void     _close() override { cli.close(); }
@@ -208,7 +208,7 @@ struct TCP_Client_Data_Source : Data_Source {
     }
 
 
-    psco::awaitable<std::string> read_coro() override {
+    concurrencpp::result<std::string> read_coro() override {
         co_return co_await cli.read_coro();
     }
 };
@@ -238,13 +238,13 @@ struct Serial_Data_Source : Data_Source {
     }
     void        _close() override { if (serial) serial->close(); }
 
-    psco::awaitable<void> handle_in_loop_coro() override {
+    concurrencpp::result<void> handle_in_loop_coro() override {
         if (serial) {
             co_await serial->tick_coro();
         }
         co_return;
     }
-    psco::awaitable<std::string> read_coro() override {
+    concurrencpp::result<std::string> read_coro() override {
         if (!serial) {
             co_return "";
         }
@@ -270,7 +270,7 @@ struct Serial_Data_Source : Data_Source {
 
 
 enum class File_Data_Type {
-    SIMPLE_BIN_Blank, // 没有1a转义的
+    SIMPLE_BIN_Blank, // 没有1a转义�?
     BIN_Blank_Text,
     AVR,
     BIN_Text,
@@ -452,7 +452,7 @@ inline std::shared_ptr<Data_Source> create_data_source_from_type(const std::stri
     else if (t == "Shared_Memory_Data_Source")
         ret = std::make_shared<Shared_Memory_Data_Source>();
     else {
-        std::cout << "未知的 Data_Source type类型!" << std::endl;
+        std::cout << "未知�?Data_Source type类型!" << std::endl;
         throw std::invalid_argument("unknown Data_Source type: " + t);
     }
     return ret;