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

ledgerupdate testing

Browse Source
This commit is contained in:
lnk
2025-02-11 18:23:19 +08:00
parent faaef4f166
commit 898d5e043d
10 changed files with 201 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
cfg_parse/cfg_parser.cpp
View File

@@ -4086,7 +4086,7 @@ void add_terminal_to_trigger_update(trigger_update_xml_t* trigger_update_xml, co
std::cout << "new ledger!!!!"<<std::endl;
if (trigger_update_xml->new_update_num < MAX_UPDATEA_NUM) {
trigger_update_xml->new_updates[trigger_update_xml->new_update_num] = work_terminal;
trigger_update_xml->new_update_num++; // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ն˵<D5B6><CBB5><EFBFBD><EFBFBD><EFBFBD>
trigger_update_xml->new_update_num+= 1; // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ն˵<D5B6><CBB5><EFBFBD><EFBFBD><EFBFBD>
} else {
std::cerr << "Exceeded MAX_UPDATEA_NUM limit for new updates!" << std::endl;
}
@@ -4095,7 +4095,7 @@ void add_terminal_to_trigger_update(trigger_update_xml_t* trigger_update_xml, co
std::cout << "modify ledger!!!"<<std::endl;
if (trigger_update_xml->modify_update_num < MAX_UPDATEA_NUM) {
trigger_update_xml->modify_updates[trigger_update_xml->modify_update_num] = work_terminal;
trigger_update_xml->modify_update_num++; // <20><><EFBFBD><EFBFBD><EFBFBD>޸<EFBFBD><DEB8>ն˵<D5B6><CBB5><EFBFBD><EFBFBD><EFBFBD>
trigger_update_xml->modify_update_num+= 1; // <20><><EFBFBD><EFBFBD><EFBFBD>޸<EFBFBD><DEB8>ն˵<D5B6><CBB5><EFBFBD><EFBFBD><EFBFBD>
} else {
std::cerr << "Exceeded MAX_UPDATEA_NUM limit for modify updates!" << std::endl;
}
@@ -4189,7 +4189,7 @@ void parse_ledger_update(trigger_update_xml_t* trigger_update_xml, const std::st
std::cout << "delete ledger!!!!!"<<std::endl;
if (trigger_update_xml->delete_update_num < MAX_UPDATEA_NUM) {
trigger_update_xml->delete_updates[trigger_update_xml->delete_update_num] = delete_terminal;
trigger_update_xml->delete_update_num++; // <20><><EFBFBD>Ӽ<EFBFBD><D3BC><EFBFBD>
trigger_update_xml->delete_update_num += 1; // <20><><EFBFBD>Ӽ<EFBFBD><D3BC><EFBFBD>
}
}
@@ -4316,7 +4316,7 @@ int parse_ledger_update_xml(trigger_update_xml_t* trigger_update_xml)
}
}
else {
//std::cout << "No matching XML files found." << std::endl;
std::cout << "No matching XML files found." << std::endl;
return APR_EGENERAL;
}
@@ -12210,8 +12210,13 @@ int parse_device_cfg_web()
//<2F><><EFBFBD>￪<EFBFBD>ٵ<EFBFBD>ied<65>Ŀռ<C4BF><D5BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC>е<EFBFBD><D0B5>ն<EFBFBD>̨<EFBFBD><CCA8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>lnk20250121
g_node->clients = (ied_t**)apr_pcalloc(g_cfg_pool, IED_COUNT * sizeof(ied_t*));//g_node->clients <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڴ<EFBFBD><DAB4>ռ<EFBFBD><D5BC>洢<EFBFBD><E6B4A2> count_cfg <20><> ied_t* <20><><EFBFBD>͵<EFBFBD>ָ<EFBFBD>루<EFBFBD><EBA3A8>һ<EFBFBD><D2BB>ָ<EFBFBD><D6B8><EFBFBD><EFBFBD><EFBFBD>飩<EFBFBD><E9A3A9><EFBFBD>ǣ<EFBFBD>ָ<EFBFBD><D6B8><EFBFBD>ڴ<EFBFBD><DAB4><EFBFBD><EFBFBD><EFBFBD>ָ<EFBFBD>룩<EFBFBD><EBA3A9>ָ<EFBFBD><D6B8><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
//<2F><>ied<65><64><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
for (int k = 0; k < count_cfg; k++)
g_node->clients[k] = (ied_t*)apr_pcalloc(g_cfg_pool, sizeof(ied_t));//ÿ<><C3BF> g_node->clients[k] ָ<><D6B8><EFBFBD><EFBFBD><EFBFBD>ڴ<EFBFBD><DAB4><EFBFBD><EFBFBD>Ƕ<EFBFBD><C7B6><EFBFBD><EFBFBD>ģ<EFBFBD>ÿ<EFBFBD><C3BF> ied_t <20>ṹ<EFBFBD><E1B9B9>ռ<EFBFBD>õ<EFBFBD><C3B5>ڴ<EFBFBD><DAB4>飩<EFBFBD><E9A3A9><EFBFBD><EFBFBD>ָ<EFBFBD><D6B8><EFBFBD>ڴ<EFBFBD><DAB4><EFBFBD><EFBFBD><EFBFBD>ָ<EFBFBD><D6B8>
for (int k = 0; k < count_cfg; k++){
//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
std::cout << "!!!!!!!!!!gnodeindex:" << k << std::endl;
g_node->clients[k] = (ied_t*)apr_pcalloc(g_cfg_pool, sizeof(ied_t));}//ÿ<><C3BF> g_node->clients[k] ָ<><D6B8><EFBFBD><EFBFBD><EFBFBD>ڴ<EFBFBD><DAB4><EFBFBD><EFBFBD>Ƕ<EFBFBD><C7B6><EFBFBD><EFBFBD>ģ<EFBFBD>ÿ<EFBFBD><C3BF> ied_t <20>ṹ<EFBFBD><E1B9B9>ռ<EFBFBD>õ<EFBFBD><C3B5>ڴ<EFBFBD><DAB4>飩<EFBFBD><E9A3A9><EFBFBD><EFBFBD>ָ<EFBFBD><D6B8><EFBFBD>ڴ<EFBFBD><DAB4><EFBFBD><EFBFBD><EFBFBD>ָ<EFBFBD><D6B8>
//<2F><>ȡ<EFBFBD>ն<EFBFBD>̨<EFBFBD>˱<EFBFBD><CBB1>滻Ϊweb<65>ӿ<EFBFBD>
//////////////////////////////////////////////////////////////////////////////////////////////////
@@ -13013,6 +13018,9 @@ void OnTimerThread::run()
pgmin = localTime.tm_min;
pgflag = 1;
}*/
//<2F><><EFBFBD><EFBFBD>
printf("check error10 !!!!!!!!!!!!!!\n");
//<2F><>־<EFBFBD><D6BE>¼
if (mp_num_hour != localTime.tm_hour) {
@@ -13027,6 +13035,8 @@ void OnTimerThread::run()
mp_num_hour = localTime.tm_hour;
pthread_mutex_unlock(&mtx);//<2F><><EFBFBD><EFBFBD>
}
//<2F><><EFBFBD><EFBFBD>
printf("check error11 !!!!!!!!!!!!!!\n");
}
//<2F><>ʹ<EFBFBD>õĴ<C3B5><C4B4><EFBFBD>lnk20241206
@@ -14091,6 +14101,10 @@ int update_one_terminal_ledger(terminal* update, int i,ied_t* ied,int terminal_i
apr_snprintf(ied_usr->dev_type, sizeof(ied_usr->dev_type), "%s", update[i].dev_type);
printf("ied_usr->dev_type: %s\n", ied_usr->dev_type);
}
if (update[i].processNo != NULL) {
apr_snprintf(ied_usr->processNo, sizeof(ied_usr->processNo), "%s", update[i].processNo);
printf("ied_usr->processNo: %s\n", ied_usr->processNo);
}
if (update[i].dev_series != NULL) {
apr_snprintf(ied_usr->dev_series, sizeof(ied_usr->dev_series), "%s", update[i].dev_series);
printf("ied_usr->dev_series: %s\n", ied_usr->dev_series);
@@ -14278,7 +14292,7 @@ int update_one_terminal_ledger(terminal* update, int i,ied_t* ied,int terminal_i
//lnk20250208<30><38><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
std::cout << "old space for LD_name" << std::endl;
apr_cpystrn(ied_usr->LD_info[cpuno - 1].LD_name, str, 256);
apr_cpystrn(ied_usr->LD_info[cpuno - 1].LD_name, str, sizeof(str));
}
ldname = ied_usr->LD_info[cpuno - 1].LD_name;
@@ -14350,6 +14364,9 @@ void write_log_entry(std::ofstream &log_file, const std::string &action, const s
// <20><><EFBFBD><EFBFBD>̨<EFBFBD>˸<EFBFBD><CBB8><EFBFBD><EFBFBD><EFBFBD>־
void create_ledger_log(trigger_update_xml_t* ledger_update_xml) {
std::cout << "create_ledger_log." << std::endl;
std::string log_filename = "../etc/" + std::string(LEDGER_UPDATE_FN);
std::ofstream log_file(log_filename.c_str(), std::ios::app); // <20><>׷<EFBFBD><D7B7>ģʽ<C4A3><CABD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD>
@@ -14512,7 +14529,7 @@ int parse_rpt_log_ini_one(ied_t* ied)
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
std::cout << "strlen(str):" << strlen(str) << "strlen(ied_usr->LD_info[cpuno].LD_name)" << strlen(ied_usr->LD_info[cpuno].LD_name) <<std::endl;
apr_cpystrn(ied_usr->LD_info[cpuno].LD_name, str, 256);//apr_palloc ֻ<>Ƿ<EFBFBD><C7B7><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><D2BB><EFBFBD>̶<EFBFBD><CCB6><EFBFBD>С<EFBFBD><D0A1><EFBFBD>ڴ<EFBFBD><DAB4>飬<EFBFBD><E9A3AC>û<EFBFBD><C3BB><EFBFBD>ṩֱ<E1B9A9>ӵĻ<D3B5><C4BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ٻ<EFBFBD><D9BB><EFBFBD>֤<EFBFBD><D6A4><EFBFBD>Ŀռ<C4BF><D5BC>Ƿ<EFBFBD><C7B7>ѱ<EFBFBD>ʹ<EFBFBD>û<EFBFBD><C3BB><EFBFBD><EFBFBD>䵽<EFBFBD><E4B5BD><EFBFBD><EFBFBD>ֵ<EFBFBD><D6B5>ֱ<EFBFBD>Ӹ<EFBFBD><D3B8>Ǽ<EFBFBD><C7BC><EFBFBD>
apr_cpystrn(ied_usr->LD_info[cpuno].LD_name, str, sizeof(str));//apr_palloc ֻ<>Ƿ<EFBFBD><C7B7><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><D2BB><EFBFBD>̶<EFBFBD><CCB6><EFBFBD>С<EFBFBD><D0A1><EFBFBD>ڴ<EFBFBD><DAB4>飬<EFBFBD><E9A3AC>û<EFBFBD><C3BB><EFBFBD>ṩֱ<E1B9A9>ӵĻ<D3B5><C4BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ٻ<EFBFBD><D9BB><EFBFBD>֤<EFBFBD><D6A4><EFBFBD>Ŀռ<C4BF><D5BC>Ƿ<EFBFBD><C7B7>ѱ<EFBFBD>ʹ<EFBFBD>û<EFBFBD><C3BB><EFBFBD><EFBFBD>䵽<EFBFBD><E4B5BD><EFBFBD><EFBFBD>ֵ<EFBFBD><D6B5>ֱ<EFBFBD>Ӹ<EFBFBD><D3B8>Ǽ<EFBFBD><C7BC><EFBFBD>
}
@@ -14563,11 +14580,16 @@ apr_status_t init_rem_dib_table_one(ied_t *ied)
//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>λ<EFBFBD>ú<EFBFBD>g_nodeһ<65><D2BB>
ied_usr = (ied_usr_t*)ied->usr_ext;
pos = ied_usr->dev_idx;
pos = ied_usr->dev_idx - 1;
std::cout << "!!!!!!!!!rem_dib_table pos is " << pos << std::endl;
for(chnl_no=0 ; chnl_no<ied->chncount; chnl_no++) {
chnl_usr = (chnl_usr_t*)ied->channel[chnl_no].connect;//<2F><>ʼ<EFBFBD><CABC>ʱ<EFBFBD>Ѹ<EFBFBD><D1B8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ռ<EFBFBD>
g_pt61850app->chnl_usr[pos] = chnl_usr;
std::cout << "!!!!!!!!!g_pt61850app pos " << pos << "is " << ied_usr->terminal_id << "is" << (chnl_usr == NULL?"NULL":"NOTNULL") << std::endl;
ip.s_addr = htonl(ied->channel[chnl_no].addr);
strcpy(chnl_usr->ip_str,inet_ntoa(ip));
printf( " add_rem_dib_table %s:%d \n",chnl_usr->ip_str ,ied->channel[chnl_no].port );