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

finish ledger update code

Browse Source
This commit is contained in:
lnk
2025-02-24 16:45:42 +08:00
parent 7009b1c7d6
commit d1fa47e3f1
6 changed files with 34 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
cfg_parse/cfg_parser.cpp
View File

@@ -11752,7 +11752,7 @@ void printLedgerinshell(const ied_usr_t& ied_usr, QIODevice* outputDevice) {
// <20><>ӡ<EFBFBD><D3A1><EFBFBD><EFBFBD><EFBFBD>豸<EFBFBD><E8B1B8>Ϣ<EFBFBD><CFA2><EFBFBD>ض<EFBFBD><D8B6>ն<EFBFBD><D5B6><EFBFBD>Ϣ
void ledger(const char* terminal_id, QIODevice* outputDevice) {
outputDevice->write("print ledger in shell");
pthread_mutex_lock(&mtx);
pthread_mutex_lock(&mtx); std::cout << "ledger()hold lock !!!!!!!!!!!" << std::endl;
bool found = false;
ied_t* ied;
ied_usr_t* ied_usr;
@@ -11774,14 +11774,14 @@ void ledger(const char* terminal_id, QIODevice* outputDevice) {
QByteArray msg = "<EFBFBD><EFBFBD><EFBFBD>ն˲<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: " + QByteArray(terminal_id ? terminal_id : "NULL") + "\n";
outputDevice->write(msg); // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> QIODevice
}
pthread_mutex_unlock(&mtx);
pthread_mutex_unlock(&mtx); std::cout << "ledger()free lock !!!!!!!!!!!" << std::endl;
}
//lnk20250210<31><30>ӡָ<D3A1><D6B8><EFBFBD>ı<EFBFBD><C4B1><EFBFBD><EFBFBD><EFBFBD>
void value_print(const char *variableName, QTcpSocket *clientSocket) {
char buffer[256]; // <20><><EFBFBD>ڴ洢<DAB4><E6B4A2><EFBFBD><EFBFBD>ֵ<EFBFBD>Ļ<EFBFBD><C4BB><EFBFBD><EFBFBD><EFBFBD>
pthread_mutex_lock(&mtx);
pthread_mutex_lock(&mtx); std::cout << "value_print hold lock !!!!!!!!!!!" << std::endl;
// <20><>ӡ<EFBFBD><D3A1><EFBFBD><EFBFBD>ֵ
if (strcmp(variableName, "frontindex") == 0) {
@@ -11801,7 +11801,7 @@ void value_print(const char *variableName, QTcpSocket *clientSocket) {
} else {
clientSocket->write("Unknown variable name\n> ");
}
pthread_mutex_unlock(&mtx);
pthread_mutex_unlock(&mtx); std::cout << "value_print free lock !!!!!!!!!!!" << std::endl;
clientSocket->flush();
}
@@ -13017,10 +13017,10 @@ void OnTimerThread::run()
int telnet_count = 0;
if (g_node_id == RECALL_HIS_DATA_BASE_NODE_ID) {
//<2F>ڲ<EFBFBD><DAB2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1>̨<EFBFBD>˼<EFBFBD><CBBC><EFBFBD>lnk20250114
pthread_mutex_lock(&mtx);
pthread_mutex_lock(&mtx); std::cout << "testping hold lock !!!!!!!!!!!" << std::endl;
init_ping_telnet(ip_count, telnet_count);
Cout_account_information();
pthread_mutex_unlock(&mtx);//<2F><><EFBFBD><EFBFBD>
pthread_mutex_unlock(&mtx); std::cout << "testping free lock !!!!!!!!!!!" << std::endl;
}
//<2F><><EFBFBD><EFBFBD>ģʽ
@@ -13073,12 +13073,9 @@ void OnTimerThread::run()
pgflag = 1;
}*/
//<2F><><EFBFBD><EFBFBD>
printf("check error10 !!!!!!!!!!!!!!\n");
//<2F><>־<EFBFBD><D6BE>¼
if (mp_num_hour != localTime.tm_hour) {
pthread_mutex_lock(&mtx);//lnk20250114
pthread_mutex_lock(&mtx); std::cout << "ontime hold lock !!!!!!!!!!!" << std::endl;
std::string mp_num_str = "";
mp_num_str.append("connected device count:");
mp_num_str.append(QString::number(FRONT_MP_NUM).toStdString());//<2F><>¼<EFBFBD><C2BC><EFBFBD>ӵļ<D3B5><C4BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@@ -13087,10 +13084,8 @@ void OnTimerThread::run()
add_comm_log(const_cast<char*>(mp_num_str.c_str()));
mp_num_hour = localTime.tm_hour;
pthread_mutex_unlock(&mtx);//<2F><><EFBFBD><EFBFBD>
pthread_mutex_unlock(&mtx); std::cout << "ontime free lock !!!!!!!!!!!" << std::endl;
}
//<2F><><EFBFBD><EFBFBD>
printf("check error11 !!!!!!!!!!!!!!\n");
}
//<2F><>ʹ<EFBFBD>õĴ<C3B5><C4B4><EFBFBD>lnk20241206
@@ -13852,9 +13847,9 @@ void WebhttpThread::run()
std::cout << "recall data cfg:" << data <<std::endl;
pthread_mutex_lock(&mtx);
pthread_mutex_lock(&mtx); std::cout << "recall http hold lock !!!!!!!!!!!" << std::endl;
ret = recall_json_handle(data);//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ָ<EFBFBD><D6B8>
pthread_mutex_unlock(&mtx);
pthread_mutex_unlock(&mtx); std::cout << "recall http free lock !!!!!!!!!!!" << std::endl;
threadmsgweb(1);//<2F><>ȡ<EFBFBD><C8A1><EFBFBD>ݺ<EFBFBD><DDBA><EFBFBD><EFBFBD><EFBFBD>http<74><70>Ϣ<EFBFBD><CFA2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD>Ϣ<EFBFBD><CFA2><EFBFBD>Żᴦ<C5BB><E1B4A6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬<D7B4><CCAC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><D2BB>ѭ<EFBFBD><D1AD>
@@ -15075,7 +15070,7 @@ void rocketmq_test_300(int mpnum,int front_index) {
ied_usr_t* ied_usr;
// ѭ<><D1AD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 300 <20><><EFBFBD><EFBFBD>Ϣ
for (int i = 0; total_messages != 0 && i < g_node->n_clients; ++i) {
for (int i = 0; (total_messages != 0 && g_front_seg_index == 1 && g_node_id == 100) && i < g_node->n_clients; ++i) {
ied = (ied_t*)g_node->clients[i];
if(ied != NULL){