zhangwen/front_linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '测试2' of http://192.168.1.22:3000/zw/Linux_Front1056 into 测试2

Browse Source
This commit is contained in:
lnk
2025-08-11 08:53:35 +08:00
parent 13e0bc18b3 e0b2c6d356
commit 077c3f45a2
1 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
LFtid1056/main_thread.cpp
View File

@@ -154,35 +154,23 @@ void* client_manager_thread(void* arg) {
printf("Started client connections\n"); printf("Started client connections\n");
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
/*std::vector<PointInfo> points1 = { std::vector<PointInfo> points1 = {
{"P001", "Main Voltage", "D001",1 ,1, 1, 1, 1,"0.38k",0}, {"P001", "Main Voltage", "D001",1 ,1, 1, 1, 1,"0.38k",0},
{"P002", "Backup Voltage", "D001",2 ,1, 1, 1, 1,"0.38k",0} {"P002", "Backup Voltage", "D001",2 ,1, 1, 1, 1,"0.38k",0}
}; };
std::vector<PointInfo> points2 = {
{"P101", "Generator Output", "D002",1 ,1, 1, 1, 1,"0.38k",0}
};*/
//00B78DA800D6 00-B7-8D-01-79-06 //00B78DA800D6 00-B7-8D-01-79-06
// <20><><EFBFBD><EFBFBD>װ<EFBFBD><D7B0><EFBFBD>б<EFBFBD> // <20><><EFBFBD><EFBFBD>װ<EFBFBD><D7B0><EFBFBD>б<EFBFBD>
/*std::vector<DeviceInfo> devices = { std::vector<DeviceInfo> devices = {
{ {
"D001", "Primary Device", "Model-X", "00-B7-8D-01-79-06", "D001", "Primary Device", "Model-X", "00-B7-8D-01-79-06",
1, points1 1, points1
},
{
"D002", "Backup Device", "Model-Y", "00-B7-8D-A8-00-D6",
1, points2
} }
};*/ };
// <20><><EFBFBD><EFBFBD>100<30><30><EFBFBD><EFBFBD><EFBFBD><EFBFBD>װ<EFBFBD><D7B0> // <20><><EFBFBD><EFBFBD>100<30><30><EFBFBD><EFBFBD><EFBFBD><EFBFBD>װ<EFBFBD><D7B0>
//std::vector<DeviceInfo> test_devices = generate_test_devices(100); std::vector<DeviceInfo> test_devices = generate_test_devices(100);
//lnk<EFBFBD><EFBFBD>̨<EFBFBD>˶<EFBFBD>ȡ<EFBFBD>豸 //std::vector<DeviceInfo> devices = GenerateDeviceInfoFromLedger(terminal_devlist);//lnk<6E><6B><EFBFBD><EFBFBD>
std::vector<DeviceInfo> devices = GenerateDeviceInfoFromLedger(terminal_devlist);//lnk<6E><6B><EFBFBD><EFBFBD>
//̨<>˴<EFBFBD>ӡ
PrintDevices(devices);
// <20><><EFBFBD><EFBFBD><EFBFBD>ͻ<EFBFBD><CDBB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> // <20><><EFBFBD><EFBFBD><EFBFBD>ͻ<EFBFBD><CDBB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
start_client_connect(devices); start_client_connect(devices);
@@ -395,18 +383,33 @@ int main(int argc ,char** argv) {//
} }
} }
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
std::vector<PointInfo> points2 = {
{"P101", "Generator Output", "D002",1 ,1, 1, 1, 1,"0.38k",0}
};
//00B78DA800D6 00-B7-8D-01-79-06
// <20><><EFBFBD><EFBFBD>װ<EFBFBD><D7B0><EFBFBD>б<EFBFBD>
std::vector<DeviceInfo> devices = {
{
"D002", "Backup Device", "Model-Y", "00-B7-8D-A8-00-D6",
1, points2
}
};
// <20><><EFBFBD><EFBFBD>socket<65><74><EFBFBD><EFBFBD>״̬ // <20><><EFBFBD><EFBFBD>socket<65><74><EFBFBD><EFBFBD>״̬
static int queue_monitor = 0; static int queue_monitor = 0;
//static int count = 3; //static int count = 3;
if (++queue_monitor >= 10) { // ÿ10<EFBFBD>뱨<EFBFBD><EFBFBD>һ<EFBFBD><EFBFBD> if (++queue_monitor >= 20) { // <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><EFBFBD><EFBFBD>豸
printf("Message queue size: %zu\n", message_queue.size()); printf("Message queue size: %zu\n", message_queue.size());
queue_monitor = 0; //queue_monitor = 0;
for (const auto& device : devices) {
ClientManager::instance().add_device(device);
}
/*std::vector<DeviceInfo> test_devices = generate_test_devices(count); /*std::vector<DeviceInfo> test_devices = generate_test_devices(count);
count++; count++;
for (const auto& device : test_devices) {
ClientManager::instance().add_device(device);
}
for (const auto& device : test_devices) { for (const auto& device : test_devices) {
ClientManager::instance().remove_device("D001"); ClientManager::instance().remove_device("D001");
}*/ }*/