ae/ECAP_Server
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修完bug

Browse Source
This commit is contained in:
种太阳的热带美短
2026-08-10 16:36:12 +08:00
parent 18e92d3631
commit d28edab2d7
12 changed files with 389 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/Local_Server/Data_Source/Data_Source.h
+51 -14
View File
@@ -221,8 +221,10 @@ public:
co_return;
}
Psc::JSON get_custom_state_json() override {
auto& state = cli.state;
return VAR_JSON_1(state);
Psc::JSON ret = Psc::JSON::object();
ret.append({"transport_state", Psc::to_string(cli.state.load())});
ret.append({"transport", cli.statistics.to_json()});
return ret;
}
Psc::asio_socket::TCP_Client_Coro cli;
~TCP_Client_Data_Source() override = default;
@@ -277,7 +279,11 @@ class Serial_Data_Source : public Data_Source {
public:
adminive::Managed_Value<Serial_Data_Source_Data> specific;
Psc::JSON get_custom_state_json() override {
return Psc::JSON::object();
Psc::JSON ret = Psc::JSON::object();
ret.append({"serial_open", serial_open.load()});
if (serial)
ret.append({"transport", serial->statistics.to_json()});
return ret;
}
Serial_Data_Source() {
type = "Serial_Data_Source";
@@ -292,13 +298,15 @@ public:
serial->set_stop_bits(Psc::serial::StopBits::OneStop);
serial->set_flow_control(Psc::serial::FlowControl::HardwareControl);
serial->set_buffer_byte_size(10 * 1024);
if (!serial->open())
serial_open = serial->open();
if (!serial_open)
std::cerr << "createSerial " + value.port_name + ":" + std::to_string(value.baud_rate) + " 打开串口失败！\n";
co_return;
}
asio::awaitable<void> _close() override {
if (serial)
serial->close();
serial_open = false;
co_return;
}
asio::awaitable<void> handle_in_loop_coro() override {
@@ -321,6 +329,7 @@ public:
});
}
std::unique_ptr<Psc::serial::Serial_Coro> serial{};
std::atomic_bool serial_open{};
~Serial_Data_Source() override {
if (serial)
serial->close();
@@ -363,9 +372,23 @@ public:
bool have_report_play_back_all_success = false;
std::string state = "null";
Psc::JSON get_custom_state_json() override {
auto cur_virtual_time = player_clock.get_cur_time_point();
auto playback_speed_rate = player_clock.playback_speed_rate;
return VAR_JSON_5(cur_virtual_time, playback_speed_rate, state, index, part_infos.size());
std::lock_guard lock(mtx);
const auto total_records = part_infos.size();
const auto current_index = static_cast<std::size_t>(std::max<long long>(index, 0));
Psc::JSON playback = Psc::JSON::object();
playback.append({"state", state});
playback.append({"virtual_time", player_clock.get_cur_time_point().to_string()});
playback.append({"speed_rate", player_clock.playback_speed_rate});
playback.append({"current_index", current_index});
playback.append({"total_records", total_records});
playback.append({"remaining_records", total_records > current_index ? total_records - current_index : 0});
playback.append({"progress_percent", total_records == 0 ? 0.0 : static_cast<double>(current_index) * 100.0 / static_cast<double>(total_records)});
playback.append({"loop_total", loop_total.load()});
playback.append({"raw_read", raw_read_statistics.to_json()});
playback.append({"conversion_dropped", conversion_dropped_statistics.to_json()});
Psc::JSON ret = Psc::JSON::object();
ret.append({"playback", playback});
return ret;
}
File_Data_Source() {
type = "File_Data_Source";
@@ -382,6 +405,9 @@ public:
std::shared_ptr<SSR::Mode_S_Msg> msg;
};
Player_Clock player_clock;
Psc::Throughput_Statistics raw_read_statistics;
Psc::Throughput_Statistics conversion_dropped_statistics;
std::atomic<std::uint64_t> loop_total{};
std::shared_ptr<Cache_Msg> pre_cache = nullptr;
std::deque<std::shared_ptr<Cache_Msg>> cache_list;
std::string get_true_file_path() const {
@@ -432,11 +458,13 @@ class Dll_Data_Source : public Data_Source {
public:
adminive::Managed_Value<Dll_Data_Source_Data> specific;
Psc::JSON get_custom_state_json() override {
auto ret = VAR_JSON_1(state);
ret.append({"read_vaild_len", vs.to_string()});
std::lock_guard lock(state_mtx);
Psc::JSON ret = Psc::JSON::object();
ret.append({"state", state});
ret.append({"library_read", read_statistics.to_json()});
return ret;
}
Psc::Value_Statistics vs;
Psc::Throughput_Statistics read_statistics;
Dll_Data_Source() {
type = "Dll_Data_Source";
}
@@ -459,6 +487,7 @@ public:
using Call_Back = void (*)(char* buf, std::size_t len);
using set_Call_back = void (*)(Call_Back);
std::string state;
mutable std::mutex state_mtx;
asio::awaitable<void> _close() override {
Psc::free_library(lib);
co_return;
@@ -468,7 +497,8 @@ public:
{
auto r = Psc::try_load_library(Psc::get_abs_path(value.library_path));
if (!r) {
state = r.error().message();
std::lock_guard lock(state_mtx);
state = Psc::platform_2_utf8(r.error().message());
co_return;
}
lib = r.value();
@@ -476,13 +506,17 @@ public:
{
auto r = Psc::try_load_function(lib, value.function_name);
if (!r) {
state = r.error().message();
std::lock_guard lock(state_mtx);
state = Psc::platform_2_utf8(r.error().message());
std::cout << LOG_POS << " [" << value.function_name << "] 函数指针加载失败!" << std::endl;
co_return;
}
read_func_ptr = (Func_Type)r.value();
}
state = "加载成功";
{
std::lock_guard lock(state_mtx);
state = "加载成功";
}
co_return;
}
void origin_data_transform_mode_data(std::string& data) override;
@@ -510,7 +544,9 @@ class Shared_Memory_Data_Source : public Data_Source {
public:
adminive::Managed_Value<Shared_Memory_Data_Source_Data> specific;
Psc::JSON get_custom_state_json() override {
return Psc::JSON::object();
Psc::JSON ret = Psc::JSON::object();
ret.append({"shared_memory_open", shared_memory_open.load()});
return ret;
}
void from_json(const Psc::JSON* that_json, bool not_exist_use_default_value) override {
Data_Source::from_json(that_json, not_exist_use_default_value);
@@ -526,6 +562,7 @@ public:
void origin_data_transform_mode_data(std::string& data) override;
protected:
std::unique_ptr<Psc::SM_RingBuffer> sm;
std::atomic_bool shared_memory_open{};
};
inline std::shared_ptr<Data_Source> create_data_source_from_type(std::string_view t) {
std::shared_ptr<Data_Source> ret{};