diff --git a/TSCP/src/MSCP/PFM/PFM_Log.c b/TSCP/src/MSCP/PFM/PFM_Log.c index 124f091..caf1e77 100644 --- a/TSCP/src/MSCP/PFM/PFM_Log.c +++ b/TSCP/src/MSCP/PFM/PFM_Log.c @@ -456,7 +456,7 @@ void MSCP_REBOOT_ASSERT(unsigned int x, unsigned int MaintenanceFlag,unsigned sh if(AutoReboot_Flag == 0x55u) { (void)printf("See You Later!!!\n"); - (void)system("shutdown"); + //(void)system("shutdown"); /*- 休眠等待重启 */ CM_Sleep(CM_UINT32_MAX); } diff --git a/TSCP/src/MSCP/SFM/SFM_Prtcl.c b/TSCP/src/MSCP/SFM/SFM_Prtcl.c index bb32bbc..4a35629 100644 --- a/TSCP/src/MSCP/SFM/SFM_Prtcl.c +++ b/TSCP/src/MSCP/SFM/SFM_Prtcl.c @@ -1695,6 +1695,8 @@ void SFM_TxOutnetSafe(IN CM_UINT8 buf[], IN CM_UINT32 Len) CM_UINT32 tx_sn = 0u; CM_RE_ASSERT((allLen + 4u) == Len, PRTCL_MODE, DARK_FAULT_CODE_FUN_ORDER_13, TSCP_DARK_ASSERT_1); i = 4u; + CM_UINT32 cnt1 = 0u, cnt2 = 1u, len1 = 0u, len2 = 0u; + CM_UINT64 tmpStartTick = 0, UsedTime1 = 0, UsedTime2 = 0; /*- 循环遍历输出队列 */ while ((i + 7u) < Len) { @@ -1784,16 +1786,24 @@ void SFM_TxOutnetSafe(IN CM_UINT8 buf[], IN CM_UINT32 Len) if (ENUM_CM_SEB == isSendExtendBoard) { /*- 向红网SE发送SE外网帧 */ + cnt1++; + len1 += ccLen; + tmpStartTick = CM_GetTick(); (void)CFM_OutnetSafe_Send(s_Prtcl_UDP_Cache, ccLen, ENUM_OUTNET_EXTEND_RED); /*- 向红网SE发送SE外网帧 */ (void)CFM_OutnetSafe_Send(s_Prtcl_UDP_Cache, ccLen, ENUM_OUTNET_EXTEND_BLUE); + UsedTime1 = UsedTime1 + (CM_GetTick() - tmpStartTick); } else if((ENUM_CM_CC == isSendExtendBoard) || (ENUM_CM_CCSEB == isSendExtendBoard)) { /*- 向红网CC发送CC外网帧 */ + cnt2++; + len2 += ccLen; + tmpStartTick = CM_GetTick(); (void)CFM_OutnetSafe_Send(s_Prtcl_UDP_Cache, ccLen, ENUM_OUTNET_RED); /*- 向蓝网CC发送CC外网帧 */ (void)CFM_OutnetSafe_Send(s_Prtcl_UDP_Cache, ccLen, ENUM_OUTNET_BLUE); + UsedTime2 = UsedTime2 + (CM_GetTick() - tmpStartTick); } else { @@ -1845,6 +1855,7 @@ void SFM_TxOutnetSafe(IN CM_UINT8 buf[], IN CM_UINT32 Len) /*- 索引偏移至下一输出报文 */ i += (CM_UINT32)CM_UNSIGNED_SHORT_EXP(msgLen + 2u); } + printf("test:send all len=%d(%d), cnt1=%d, len1=%d, time1=%lluus-----cnt2=%d, len2=%d, time2=%lluus\n", len1+len2, Len, cnt1, len1, UsedTime1 / 1000u, cnt2, len2, UsedTime2 / 1000u); } void SFM_PrtclBufSwitch(void)