lnk/microser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

debug recall

Browse Source
This commit is contained in:
lnk
2025-03-07 18:27:03 +08:00
parent 8a5087f1b7
commit 2e50baee04
4 changed files with 96 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
cfg_parse/cfg_parser.cpp
View File

@@ -203,6 +203,7 @@ const int MAX_CPUNO = 10;
//lnk20250121<32>ն<EFBFBD>̨<EFBFBD><CCA8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
int IED_COUNT = 300; //Ĭ<><C4AC>300
extern int INITFLAG;
//WW 2-23-08-20 add start
@@ -217,9 +218,6 @@ std::string g_strOTLConnect = "postgres/bmdev@123@pgsql"; //OTL
//lnk2024-8-14<31><34><EFBFBD>ӽ<EFBFBD><D3BD>ͽ<EFBFBD><CDBD>߱<EFBFBD>־,0<><30><EFBFBD><EFBFBD><EFBFBD>ڽ<EFBFBD><DABD>ν<EFBFBD><CEBD>ߣ<EFBFBD>1<EFBFBD><31><EFBFBD>ڽ<EFBFBD><DABD>ν<EFBFBD><CEBD><EFBFBD>
int isdelta_flag = 0;
//<2F><><EFBFBD><EFBFBD><EFBFBD>ն<EFBFBD><D5B6><EFBFBD><EFBFBD><EFBFBD>
bool g_stopTelnetTest = false;
//////CZY 2023-09-06 config
//<2F><>ǰ<EFBFBD><C7B0>flag:1Ϊ<31><CEAA><EFBFBD><EFBFBD>,0Ϊ<30>ر<EFBFBD>
int MULTIPLE_NODE_FLAG = 1;
@@ -1180,17 +1178,22 @@ void pingPrint(QTcpSocket* clientSocket, const std::string &msg) {
clientSocket->flush();
}
}
int init_ping_telnet(QTcpSocket* clientSocket, int& ip_count, int& telnet_count) {
int Worker::init_ping_telnet(QTcpSocket* clientSocket, int& ip_count, int& telnet_count) {
pingPrint(clientSocket, "start test ping telnet");
ied_t* ied = NULL;
int iedno;
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>豸
for (iedno = 0; iedno < g_node->n_clients; iedno++) {
// <20><><EFBFBD><EFBFBD><EFBFBD>Ƿ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֹ
if (g_stopTelnetTest) {
pingPrint(clientSocket, "Telnet test stopped by user.");
break;
for (iedno = 0; iedno < g_node->n_clients && !g_stopTelnetTest; iedno++) {
// **1. <20><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>룬<EFBFBD>û<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ``` <20>˳<EFBFBD>**
if (clientSocket->waitForReadyRead(100)) { // ? <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
QByteArray input = clientSocket->readAll().trimmed();
if (input == "`") { // ? <20>û<EFBFBD><C3BB><EFBFBD><EFBFBD><EFBFBD> ```<60><><EFBFBD>˳<EFBFBD><CBB3><EFBFBD>־ģʽ
std::cout << "Received '`' from shell socket! Exiting viewlog...\n";
g_stopTelnetTest = true;
break;
}
}
ied = g_node->clients[iedno];
if (ied) {
if (g_onlyIP[0] != 0 && (strcmp(g_onlyIP, ied->channel[0].addr_str) != 0)) {
@@ -4981,7 +4984,7 @@ void process_recall_config(recall_xml_t* recall_xml)
//lnk20241030<33><30><EFBFBD>䲹<EFBFBD><E4B2B9><EFBFBD><EFBFBD>̬<EFBFBD><CCAC>̬<EFBFBD><CCAC>־<EFBFBD><D6BE>ÿ<EFBFBD><C3BF><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD><EFBFBD>кܶ<D0BA><DCB6><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD>¼
LD_info->autorecall[j]->need_steady = recall[j].need_steady;
LD_info->autorecall[j]->need_steady = recall[j].need_voltage;
LD_info->autorecall[j]->need_voltage = recall[j].need_voltage;
}
LD_info->autorecallflag = 0;
@@ -11740,6 +11743,16 @@ void printLedgerinshell(const ied_usr_t& ied_usr, QIODevice* outputDevice) {
outputDevice->write("\r\x1B[K");outputDevice->write(" |-- rptcount: " + QByteArray::number(ied_usr.LD_info[i].rptcount) + "\n");
outputDevice->write("\r\x1B[K");outputDevice->write(" |-- logcount: " + QByteArray::number(ied_usr.LD_info[i].logcount) + "\n");
//recall
outputDevice->write("\r\x1B[K");outputDevice->write(" |-- autorecallflag: " + QByteArray::number(ied_usr.LD_info[i].autorecallflag) + "\n");
outputDevice->write("\r\x1B[K");outputDevice->write(" |-- autorecallcount: " + QByteArray::number(ied_usr.LD_info[i].autorecallcount) + "\n");
for (int j = 0; j < ied_usr.LD_info[i].autorecallcount && ied_usr.LD_info->autorecall[j] != NULL; j++){
outputDevice->write("\r\x1B[K");outputDevice->write(" |-- autorecall_t[" + QByteArray::number(j) + "]:\n");
outputDevice->write("\r\x1B[K");outputDevice->write(" |-- start_time: " + QByteArray::number(ied_usr.LD_info->autorecall[j]->start) + "\n");
outputDevice->write("\r\x1B[K");outputDevice->write(" |-- end_time: " + QByteArray::number(ied_usr.LD_info->autorecall[j]->end) + "\n");
outputDevice->write("\r\x1B[K");outputDevice->write(" |-- need_steady: " + QByteArray::number(ied_usr.LD_info->autorecall[j]->need_steady) + "\n");
outputDevice->write("\r\x1B[K");outputDevice->write(" |-- need_voltage: " + QByteArray::number(ied_usr.LD_info->autorecall[j]->need_voltage) + "\n");
}
// rpt
outputDevice->write("\r\x1B[K");outputDevice->write(" |-- rptRecvFlag: " + QByteArray::number(ied_usr.LD_info[i].rptRecvFlag) + "\n");
outputDevice->write("\r\x1B[K");outputDevice->write(" |-- rptRecvCheckFlag: " + QByteArray::number(ied_usr.LD_info[i].rptRecvCheckFlag) + "\n");
@@ -15645,13 +15658,12 @@ void echo_msg_debugexy(const char *file_name, int line_no, const char *fmt, ...)
}
}
///////////////////////////////////////////////////////////////////////////////
void telnetetst(QTcpSocket* clientSocket) {
void Worker::telnetetst(QTcpSocket* clientSocket) {
int ip_count = 0;
int telnet_count = 0;
g_stopTelnetTest = false;
//<2F>ڲ<EFBFBD><DAB2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1>̨<EFBFBD>˼<EFBFBD><CBBC><EFBFBD>lnk20250114
pthread_mutex_lock(&mtx); std::cout << "testping hold lock !!!!!!!!!!!" << std::endl;
init_ping_telnet(clientSocket,ip_count, telnet_count);
Worker::init_ping_telnet(clientSocket,ip_count, telnet_count);
Cout_account_information();
pthread_mutex_unlock(&mtx); std::cout << "testping free lock !!!!!!!!!!!" << std::endl;
}