Quellcode durchsuchen

add system analysis count

zhengwei vor 8 Jahren
Ursprung
Commit
114b47df79
2 geänderte Dateien mit 13 neuen und 4 gelöschten Zeilen
  1. 3 0
      SyncTime/SyncManager.cpp
  2. 10 4
      YAServerDlg.cpp

+ 3 - 0
SyncTime/SyncManager.cpp

@@ -5,6 +5,7 @@
 
 #include "../ProcessRemodule.h"
 #include "../log_process_module.h"
+#include "./../system_basic_info/SystemAnalysis.h"
 
 #pragma warning(disable: 4244)
 
@@ -25,6 +26,7 @@ void HostServer::SyncManager::init()
 
 void HostServer::SyncManager::analyzeSyncMsg(SyncTimeMsg &msg)
 {
+    LOCATION_SYSTEM_BRANCH(LOCATION_SYSTEM_BRANCH_10);
 	EnterCriticalSection(&m_csSyncTime);
 	int idx = FindSyncTimeMsg(msg.RootIdCode(), msg.SyncNum());
 
@@ -33,6 +35,7 @@ void HostServer::SyncManager::analyzeSyncMsg(SyncTimeMsg &msg)
 		if(_syncTimeMsgs[msg.RootIdCode()].size() >= MAX_SYNCTIME_NUM){ // ɾ³ýµÚÒ»¸ö
 			// ¿ÉÄÜÓÐй¶
 			_syncTimeMsgs[msg.RootIdCode()].pop_front();
+			LOCATION_SYSTEM_BRANCH(LOCATION_SYSTEM_BRANCH_12);
 		}
 		SyncTimeMsgItem it;
 		it.SyncNum = msg.SyncNum();

+ 10 - 4
YAServerDlg.cpp

@@ -2133,7 +2133,7 @@ void CYAServerDlg::parse_package_data(BYTE* DataBuffer, int nLen, DWORD dwConnID
 	switch (wChr){
 	case CHAR_LOCATEDATA: // 定位数据
 		{
-			
+			LOCATION_SYSTEM_BRANCH(LOCATION_SYSTEM_BRANCH_0);
 			parse_data_locate_reader(DataBuffer, nCurPos, nLen, dwConnID, reader_id);
 			ReaderMap::iterator it = mp_reader_list.find(reader_id);
 			if(it != mp_reader_list.end()){
@@ -2145,6 +2145,7 @@ void CYAServerDlg::parse_package_data(BYTE* DataBuffer, int nLen, DWORD dwConnID
 		}
 	case CHAR_LOCATEDATA_TDOA:
 		{
+			LOCATION_SYSTEM_BRANCH(LOCATION_SYSTEM_BRANCH_1);
 			parse_data_locate_reader(DataBuffer, nCurPos, nLen, dwConnID, reader_id);
 
 			ReaderMap::iterator it = mp_reader_list.find(reader_id);
@@ -2157,6 +2158,7 @@ void CYAServerDlg::parse_package_data(BYTE* DataBuffer, int nLen, DWORD dwConnID
 		}
 	case CHAR_LOCATEDATAHIS:
 		{
+			LOCATION_SYSTEM_BRANCH(LOCATION_SYSTEM_BRANCH_2);
 			g_is_rec_hist = true;
 			parse_data_locate_reader_his(DataBuffer, nLen, nCurPos, reader_id, nTick, strtime, wChr);
 			while(nCurPos < nLen - (int)sizeof(WORD)){ // 减去crc
@@ -2166,6 +2168,7 @@ void CYAServerDlg::parse_package_data(BYTE* DataBuffer, int nLen, DWORD dwConnID
 		}
 	case CHAR_LOCATEDATAHIS_TDOA:
 		{
+			LOCATION_SYSTEM_BRANCH(LOCATION_SYSTEM_BRANCH_3);
 			g_is_rec_hist = true;
 			parse_data_locate_reader_his(DataBuffer, nLen, nCurPos, reader_id, nTick, strtime, wChr);
 
@@ -2191,23 +2194,25 @@ void CYAServerDlg::parse_package_data(BYTE* DataBuffer, int nLen, DWORD dwConnID
 		}
 	case CHAR_HIST_DATA_FINISH:
 		{
+			LOCATION_SYSTEM_BRANCH(LOCATION_SYSTEM_BRANCH_4);
 			g_is_rec_hist = false;
 			// 完成历史数据上传,可点名下一分站
 		}
 	case CHAR_READER_SYNC_TIME:
 		{
-			LOCATION_SYSTEM_BRANCH(LOCATION_SYSTEM_BRANCH_0);
+			LOCATION_SYSTEM_BRANCH(LOCATION_SYSTEM_BRANCH_5);
 			parse_data_reader_synctime(DataBuffer, nLen, nCurPos, CHAR_READER_SYNC_TIME);
 			break;
 		}
 	case CHAR_READER_SYNC_TIME_ROOT:
 		{
-			LOCATION_SYSTEM_BRANCH(LOCATION_SYSTEM_BRANCH_1);
+			LOCATION_SYSTEM_BRANCH(LOCATION_SYSTEM_BRANCH_6);
 			parse_data_reader_synctime(DataBuffer, nLen, nCurPos, CHAR_READER_SYNC_TIME_ROOT);
 			break;
 		}
 	case CHAR_ADHOC:
 		{
+			LOCATION_SYSTEM_BRANCH(LOCATION_SYSTEM_BRANCH_7);
 			parse_data_locate_reader(DataBuffer, nCurPos, nLen, dwConnID, reader_id);
 			ReaderMap::iterator it = mp_reader_list.find(reader_id);
 			if(it != mp_reader_list.end()){
@@ -2218,6 +2223,7 @@ void CYAServerDlg::parse_package_data(BYTE* DataBuffer, int nLen, DWORD dwConnID
 			break;
 		}
 	default:
+		LOCATION_SYSTEM_BRANCH(LOCATION_SYSTEM_BRANCH_8);
 		//WriteInfoFile("未能解析的命令!");
 		break;
 	}
@@ -7894,7 +7900,7 @@ void CYAServerDlg::parse_data_locate_reader_his( BYTE * DataBuffer, int nLen, in
 void CYAServerDlg::parse_data_reader_synctime(BYTE *DataBuffer, int nLen, int& nCurPos, WORD wChr)
 {
 	while(nCurPos < nLen - sizeof(WORD)){
-		LOCATION_SYSTEM_BRANCH(LOCATION_SYSTEM_BRANCH_2);
+		LOCATION_SYSTEM_BRANCH(LOCATION_SYSTEM_BRANCH_9);
 		DWORD dwReaderID = 0; // 本机分站号
 		CFunctions::getDWord(DataBuffer, &dwReaderID, nCurPos);
 		nCurPos += sizeof(DWORD);