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

12
mms/mms_process.c
View File

@@ -824,9 +824,9 @@ void check_3s_config()
last_check_3s_config_time = now; //<2F><>¼<EFBFBD><C2BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1>
while (APR_SUCCESS==parse_3s_xml(&trigger_3s_xml)){ //<2F><><EFBFBD><EFBFBD>3<EFBFBD><33><EFBFBD>ļ<EFBFBD>
//<2F><><EFBFBD><EFBFBD>ʵʱ<CAB5><CAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̨<EFBFBD><CCA8><EFBFBD><EFBFBD>lnk20250114
pthread_mutex_lock(&mtx);
//pthread_mutex_lock(&mtx); printf("3s hold lock !!!!!!!!!!!");
process_3s_config(&trigger_3s_xml); //<2F><><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
pthread_mutex_unlock(&mtx);
pthread_mutex_unlock(&mtx); printf("3s free lock !!!!!!!!!!!");
}
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1270,9 +1270,9 @@ void check_ledger_update()//lnk20250113
print_trigger_update_xml(trigger_ledger_update_xml);
//<2F><><EFBFBD><EFBFBD>̨<EFBFBD>˸<EFBFBD><CBB8>¼<EFBFBD>̨<EFBFBD><CCA8><EFBFBD><EFBFBD>lnk20250114
pthread_mutex_lock(&mtx);
//pthread_mutex_lock(&mtx); printf("ledgerupdate hold lock !!!!!!!!!!!");
process_ledger_update(trigger_ledger_update_xml); //̨<>˸<EFBFBD><CBB8><EFBFBD>
pthread_mutex_unlock(&mtx);
//pthread_mutex_unlock(&mtx); printf("ledgerupdate free lock !!!!!!!!!!!");
}
@@ -1571,8 +1571,6 @@ void CheckNextNotConnectedChannel()
//}
}
printf("check error94 !!!!!!!!!!!!!!\n");
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>
@@ -1761,7 +1759,7 @@ void CheckNextNotConnectedChannel()
echo_warn2( "CHANNEL_DISCONNECTING waiting ... %s,NetInfo= %x ",chnl_usr->ip_str,chnl_usr->net_info);
if ( (sGetMsTime() - chnl_usr->m_StartDisconnectingTime) > 30*1000 ) // //wait 30 secs ?????
{ printf("check error71 !!!!!!!!!!!!!!\n");
{
//cout<<pChannel->GetIP()<<"CHANNEL_DISCONNECTING reqCtrl->done == SD_false but time over 180 secs, close channel !!!"<<endl;
echo_warn2( "CHANNEL_DISCONNECTING reqCtrl->doneδ<65><CEB4><EFBFBD><EFBFBD>,but time over 180 secs, close channel IP %s,NetInfo= %x ",chnl_usr->ip_str,chnl_usr->net_info);
mvl_free_req_ctrl(chnl_usr->m_reqCtrl);