Z991239-5615 #comment feat:框架GetPath增加对Run目录的支持；增加准入过程耗时的记录；

Framework/spbase/SpEntity.cpp

@@ -1389,7 +1389,7 @@ ErrorCodeEnum SpEntity::GetPath(const char *pszKey,CSimpleStringA &strPath)
 	if (!pszKey)
 		return Error_Null;
 
-	if (_stricmp(pszKey, "Root") == 0) {
+	if (_stricmp(pszKey, "Root") == 0 || _stricmp(pszKey, "Run") == 0) {
 		strPath = env->dir->root_path;
 	} else if (_stricmp(pszKey, "RootVer") == 0) {
 		strPath = env->dir->root_ver_path;

Module/mod_healthmanager/HealthManagerFSM.cpp

@@ -436,6 +436,7 @@ int CHealthManagerFSM::AccessAuthDoWork()
 		{
 			//存在循环刷数据的情况，暂时不记这个，只记失败
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode("QLR0402501Z10301")("to call AccessAuth's Regist");
+			m_ullAuthStart = SP::Module::Comm::RVCGetTickCount();
 			eErrCode = (*m_pACClient)(EntityResource::getLink().upgradeLink())->Regist();
 			m_bHasAuthEver = true;
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("accessauth regist %d", eErrCode);
@@ -477,10 +478,12 @@ void CHealthManagerFSM::SetVtmLoadResult(int bResult)
 	if (bResult == VtmLoad_AccessAuth_Suc)
 	{
 		eErrCode = GetEntityBase()->GetFunction()->SetSysVar("TerminalStage", "A");
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("AccessAuthSuc")("%d", SP::Module::Comm::RVCGetTickCount() - m_ullAuthStart);
 	}
 	else if (bResult == VtmLoad_AccessAuth_servFail) //准入服务端返回失败
 	{
 		eErrCode = GetEntityBase()->GetFunction()->SetSysVar("TerminalStage", "S");
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("AccessAuthFailServ")("%d", SP::Module::Comm::RVCGetTickCount() - m_ullAuthStart);
 	}
 	else if (bResult == VtmLoad_MediaLoadFail) //音视频校验不通过
 	{
@@ -489,11 +492,12 @@ void CHealthManagerFSM::SetVtmLoadResult(int bResult)
 	else //其他失败
 	{
 		eErrCode = GetEntityBase()->GetFunction()->SetSysVar("TerminalStage", "C");
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("AccessAuthFailOther")("%d", SP::Module::Comm::RVCGetTickCount() - m_ullAuthStart);
 	}
 	if (eErrCode != Error_Succeed)
-		DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("set TerminalStage %d,failed:%s", bResult, SpStrError(eErrCode));
+		DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_SYSTEM)("set TerminalStage %d,failed:%s", bResult, SpStrError(eErrCode));
 	else
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("set TerminalStage %d", bResult);
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("set TerminalStage %d", bResult);
 
 }
 

Module/mod_healthmanager/HealthManagerFSM.h

@@ -249,7 +249,7 @@ private:
 	bool m_bHasAuthEver, m_bFirstAccessAuth
 		, m_bIEBeforeHealth, m_bInAccessAuthDoWork, m_bEntityNewStart, m_bPinPadOpenSuc;
 	DWORD m_elapseTimeFromOSStart;
-	ULONGLONG m_ullElapseFromOSStart;
+	ULONGLONG m_ullElapseFromOSStart, m_ullAuthStart;
 	DeviceControlService_ClientBase *m_pDevCtrlClient;
 	CSystemStaticInfo m_sysInfo;
 	std::map<string, string> m_computerInfo;

Module/mod_vtmloader/VtmLoaderFSM.cpp

@@ -2896,7 +2896,8 @@ bool CVtmLoaderFSM::CheckConfigInfoInTestRoom()
 				return false;
 			}
 		}
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("check machine model ok");
 	}
-	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_USER)("check machine model ok");
+	
 	return true;
 }

Module/mod_vtmloader/mod_vtmloader.cpp

@@ -166,7 +166,7 @@ void CVtmLoaderEntity::EntityLostProc(CSimpleStringA entityName)
 
 
 		auto dealOldEventThread = [&] {
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("DealWithOldEvent called eventId, %d", s_ctx->Req.eventId);
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setLogCode(VtmLoaderService_LogCode_DealWithOldEvent)("DealWithOldEvent called eventId, %d", s_ctx->Req.eventId);
 			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("DealWithOldEvent called reqStrRev1, %s", s_ctx->Req.reqStrRev1);
 			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("DealWithOldEvent called reqStrRev2, %s", s_ctx->Req.reqStrRev2);
 			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("DealWithOldEvent called reqIntRev1, %d", s_ctx->Req.reqIntRev1);