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

finish log realdata send funtion

Browse Source
This commit is contained in:
lnk
2025-02-27 16:28:04 +08:00
parent f167d705a9
commit c843247d68
7 changed files with 439 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
mms/mms_process.c
View File

@@ -368,7 +368,7 @@ void ChannelCheckIECReports(chnl_usr_t *chnl_usr)
ied_usr = GET_IEDEXT_ADDR(ied);
channel = chnl_usr->chnl;
printf("check error %s !!!!!!!!!!!!!!cpucount:%d\n",((ied_usr_t*)chnl_usr->chnl->ied->usr_ext)->terminal_id,(int)ied->cpucount);
//printf("check error %s !!!!!!!!!!!!!!cpucount:%d\n",((ied_usr_t*)chnl_usr->chnl->ied->usr_ext)->terminal_id,(int)ied->cpucount);
//printf("1 chnl_usr->ip_str = %s \n",chnl_usr->ip_str);
for(cpuno=0 ; cpuno<ied->cpucount; cpuno++)
@@ -1260,7 +1260,7 @@ void check_ledger_update()//lnk20250113
printf("check ledger update...trigger_ledger_update_xml:%d\n",trigger_ledger_update_xml->modify_update_num);
//printf("check ledger update...trigger_ledger_update_xml:%d\n",trigger_ledger_update_xml->modify_update_num);//<2F><><EFBFBD>ٲ<EFBFBD><D9B2><EFBFBD>Ҫ<EFBFBD>Ĵ<EFBFBD>ӡ
last_check_3s_config_time = now; //<2F><>¼<EFBFBD><C2BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1>
@@ -1546,7 +1546,7 @@ void CheckNextNotConnectedChannel()
chnl_total_no = (chnl_total_no+1) % g_pt61850app->chnl_counts;
} while ( (g_onlyIP[0]!=0) && (strcmp(g_onlyIP,chnl_usr->ip_str)!=0) );
printf("check error chnl_total_no !!!!!!!!!!!!!! %d\n",chnl_total_no);
//printf("check error chnl_total_no !!!!!!!!!!!!!! %d\n",chnl_total_no);
//10-11-01 22:03 beijing
if( ( (chnl_total_no+1)==g_pt61850app->chnl_counts) || (g_onlyIP[0]!=0) ){
@@ -1571,19 +1571,19 @@ void CheckNextNotConnectedChannel()
//}
}
printf("check error %s !!!!!!!!!!!!!!\n",((ied_usr_t*)chnl_usr->chnl->ied->usr_ext)->terminal_id);
//printf("check error %s !!!!!!!!!!!!!!\n",((ied_usr_t*)chnl_usr->chnl->ied->usr_ext)->terminal_id);
if(chnl_usr->m_state == CHANNEL_CONNECTING)//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
{
printf("check error93 !!!!!!!!!!!!!!\n");
//printf("check error93 !!!!!!!!!!!!!!\n");
MVL_REQ_PEND* reqCtrl= chnl_usr->m_reqCtrl ;
printf("check error60 !!!!!!!!!!!!!!\n");
//printf("check error60 !!!!!!!!!!!!!!\n");
if( reqCtrl->done == SD_TRUE)
{
printf("check error92 !!!!!!!!!!!!!!\n");
//printf("check error92 !!!!!!!!!!!!!!\n");
if(reqCtrl->result == SD_SUCCESS)
{
printf("check error91 !!!!!!!!!!!!!!\n");
//printf("check error91 !!!!!!!!!!!!!!\n");
ALL_RCB_INFO *all_rcb_info;
// cout<<endl<<endl<<pChannel->GetIP()<<" CHANNEL_CONNECTED netInfo "<<chnl_usr->net_info<<endl;
echo_warn4("\nCHANNEL_CONNECTED %s:%d ,NetInfo= %x chnl_usr= %x \n",
@@ -1621,16 +1621,16 @@ void CheckNextNotConnectedChannel()
}
else
{// solaris 9 <20><> 224<32><34>
printf("check error90 !!!!!!!!!!!!!!\n");
//printf("check error90 !!!!!!!!!!!!!!\n");
int secsSince = (int)(sGetMsTime() - chnl_usr->m_StartConnectingTime)/1000 ;
//cout<<"reqCtrl->result == FAIL, Since StartConnecting "<<secsSince<<"<22><> "<<pChannel->GetIP()<<" !!! "<<endl;
ied_usr_t* ied_usr = (ied_usr_t*)chnl_usr->chnl->ied->usr_ext;
if (g_node_id == STAT_DATA_BASE_NODE_ID || g_node_id == NEW_HIS_DATA_BASE_NODE_ID) {
//lnk202411-4
//connectlog_pgsql(ied_usr->terminal_code);//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʧ<EFBFBD><CAA7>
printf("check error89 !!!!!!!!!!!!!!\n");
//printf("check error89 !!!!!!!!!!!!!!\n");
connectlog_pgsql(ied_usr->terminal_code,convertMsToDateTimeString((int)sGetMsTime()),0);//0ʧ<30><CAA7>
printf("check error88 !!!!!!!!!!!!!!\n");
//printf("check error88 !!!!!!!!!!!!!!\n");
}
printf( "reqCtrl->result == FAIL, Since StartConnecting %i <20><> ,channel IP %s:%d \n",secsSince,chnl_usr->ip_str,chnl_usr->chnl->port);
mvl_free_req_ctrl(chnl_usr->m_reqCtrl);
@@ -1642,7 +1642,7 @@ void CheckNextNotConnectedChannel()
}
else
{//
printf("check error61 !!!!!!!!!!!!!!\n");
//printf("check error61 !!!!!!!!!!!!!!\n");
if ( (sGetMsTime() - chnl_usr->m_StartConnectingTime) > 300*1000 ) //300*1000 ) //wait 300 secs ?????
{
ied_usr_t* ied_usr = (ied_usr_t*)chnl_usr->chnl->ied->usr_ext;
@@ -1677,13 +1677,13 @@ void CheckNextNotConnectedChannel()
else if(chnl_usr->m_state == CHANNEL_DISCONNECTED)
{
//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
printf("check error99 !!!!!!!!!!!!!!\n");
//printf("check error99 !!!!!!!!!!!!!!\n");
if ( (sGetMsTime() - chnl_usr->m_ClosedMsTime) > NEXT_CONNECT_TIME ) //wait 10 secs
{
//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
printf("check error98 !!!!!!!!!!!!!!\n");
//printf("check error98 !!!!!!!!!!!!!!\n");
ST_RET ret;
ST_CHAR serverARName[32];
@@ -1691,10 +1691,10 @@ void CheckNextNotConnectedChannel()
apr_snprintf(serverARName,sizeof(serverARName),"%s:%d",chnl_usr->ip_str,chnl_usr->chnl->port);
if (chnl_usr->chnl->ied->cpucount != NULL && chnl_usr->chnl->ied->cpucount > 0 && ied_usr->dev_flag == ENABLE) {//2023-09-26 czy <20><><EFBFBD><EFBFBD>line count<0 <20><><EFBFBD><EFBFBD>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD>//lnk20250121<32><31><EFBFBD><EFBFBD><EFBFBD>ն<EFBFBD><D5B6><EFBFBD>Ч<EFBFBD><D0A7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
ret = mms_connectToServer(ied_usr->dev_key, ied_usr->dev_series, serverARName, &(chnl_usr->net_info), &(chnl_usr->m_reqCtrl));
printf("check error73 !!!!!!!!!!!!!!\n");
//printf("check error73 !!!!!!!!!!!!!!\n");
if (ret == SD_SUCCESS)
{
printf("check error74 !!!!!!!!!!!!!!\n");
//printf("check error74 !!!!!!!!!!!!!!\n");
//if(chnl_usr->chnl->ied->id==virtual_ied){
// chnl_usr->m_state = CHANNEL_CONNECTED;
// chnl_usr->chnl->ied->status = STATUS_NORMAL;
@@ -1717,15 +1717,15 @@ void CheckNextNotConnectedChannel()
else
{
//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
printf("check error97 !!!!!!!!!!!!!!\n");
//printf("check error97 !!!!!!!!!!!!!!\n");
chnl_usr->m_ClosedMsTime = sGetMsTime();
if (g_node_id == STAT_DATA_BASE_NODE_ID || g_node_id == NEW_HIS_DATA_BASE_NODE_ID) {
//lnk202411-4
//connectlog_pgsql(ied_usr->terminal_code);//<2F><><EFBFBD><EFBFBD>ʧ<EFBFBD><CAA7>
//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
printf("check error96 !!!!!!!!!!!!!!\n");
//printf("check error96 !!!!!!!!!!!!!!\n");
connectlog_pgsql(ied_usr->terminal_code,convertMsToDateTimeString((int)sGetMsTime()),0);//0ʧ<30><CAA7>
printf("check error95 !!!!!!!!!!!!!!\n");
//printf("check error95 !!!!!!!!!!!!!!\n");
}
echo_warn3("FAILED: mms_connectToServer IP %s:%d ,NetInfo= %x \n", chnl_usr->ip_str, chnl_usr->chnl->port, chnl_usr->net_info);
}
@@ -1735,11 +1735,11 @@ void CheckNextNotConnectedChannel()
}//if(pChannel->m_state == CHANNEL_DISCONNECTED)
else if(chnl_usr->m_state == CHANNEL_DISCONNECTING) //need check timeout?<3F>᲻<EFBFBD><E1B2BB><EFBFBD><EFBFBD>Զͣ<D4B6><CDA3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>???
{
printf("check error92 !!!!!!!!!!!!!!\n");
//printf("check error92 !!!!!!!!!!!!!!\n");
MVL_REQ_PEND* reqCtrl= chnl_usr->m_reqCtrl ;
if( reqCtrl->done == SD_TRUE)
{
printf("check error72 !!!!!!!!!!!!!!\n");
//printf("check error72 !!!!!!!!!!!!!!\n");
//cout<<endl<<endl<<pChannel->GetIP()<<" CHANNEL_DISCONNECTING done"<<endl;
echo_warn3( "CHANNEL_DISCONNECTING done %s:%d,NetInfo= %x ",chnl_usr->ip_str,chnl_usr->chnl->port,chnl_usr->net_info);
mvl_free_req_ctrl(chnl_usr->m_reqCtrl);
@@ -1754,7 +1754,7 @@ void CheckNextNotConnectedChannel()
}
else
{//
printf("check error70 !!!!!!!!!!!!!!\n");
//printf("check error70 !!!!!!!!!!!!!!\n");
// cout<<endl<<endl<<pChannel->GetIP()<<" CHANNEL_DISCONNECTING waiting ..."<<endl;
echo_warn2( "CHANNEL_DISCONNECTING waiting ... %s,NetInfo= %x ",chnl_usr->ip_str,chnl_usr->net_info);
@@ -1775,7 +1775,7 @@ void CheckNextNotConnectedChannel()
}
}//if(pChannel->m_state == CHANNEL_DISCONNECTING)
//////////////////
printf("check error77 !!!!!!!!!!!!!!\n");
//printf("check error77 !!!!!!!!!!!!!!\n");
}
////////////////////////////////////////////////////////////////////////////////////////////////////

6
mms/rdb_client.c
View File

@@ -404,7 +404,7 @@ static void* APR_THREAD_FUNC rtdb_worker(apr_thread_t* thd, void* data)
//pthread_mutex_lock(&mtx); printf("work hold lock !!!!!!!!!!!");
//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
printf("check error4 !!!!!!!!!!!!!!\n");
//printf("check error4 !!!!!!!!!!!!!!\n");
doCommService();//<2F><><EFBFBD><EFBFBD>61850<35><30>Ϣ
@@ -421,11 +421,11 @@ static void* APR_THREAD_FUNC rtdb_worker(apr_thread_t* thd, void* data)
//check_recall_config();//<2F><><EFBFBD>ٽ<EFBFBD><D9BD>̶<EFBFBD>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ
create_recall_xml();//<2F><><EFBFBD>ɴ<EFBFBD><C9B4><EFBFBD><EFBFBD><EFBFBD>xml<6D>ļ<EFBFBD>
pthread_mutex_lock(&mtx); printf("work hold lock !!!!!!!!!!!");
pthread_mutex_lock(&mtx); //printf("work hold lock !!!!!!!!!!!");
check_ledger_update();//lnk20250113<31><33>ȡ̨<C8A1>˸<EFBFBD><CBB8>£<EFBFBD><C2A3><EFBFBD><EFBFBD><EFBFBD>̨<EFBFBD>˸<EFBFBD><CBB8><EFBFBD>
pthread_mutex_unlock(&mtx); printf("work free lock !!!!!!!!!!!");
pthread_mutex_unlock(&mtx); //printf("work free lock !!!!!!!!!!!");
//Check_Recall_Config();
/*if ((g_protect_file) && (g_pt61850app->initNum>=MIN_INIT_NUM) ) {