瀏覽代碼

Z991239-6348 #comment feat: 调整进程信息上送触发时机,1分钟检查一次首页状态

陈纪林80310970 4 月之前
父節點
當前提交
a2e95bca86
共有 1 個文件被更改,包括 10 次插入19 次删除
  1. 10 19
      Module/mod_ResourceWatcher/ResourceWatcherFSM.h

+ 10 - 19
Module/mod_ResourceWatcher/ResourceWatcherFSM.h

@@ -545,26 +545,17 @@ struct UploadSysProcInfoTask : public ITaskSp
 	void Process()
 	{
 		CSimpleStringA t_terminalState;
-		m_pFSM->GetEntityBase()->GetFunction()->GetSysVar("TerminalStage", t_terminalState);
-		if (t_terminalState == "A") // A 准入成功后判断是否进首页
+		DWORD elapsed = 0;
+		DWORD dwStart = SP::Module::Comm::RVCGetTickCount();
+		DWORD dwEnd = SP::Module::Comm::RVCGetTickCount();
+		DWORD checkTimeOut = 5 * 60000; //五分钟超时
+		while (elapsed < checkTimeOut && m_pFSM->GetNeverMainPageFlag()) //到达终态,5分钟未进首页 or 成功进入首页跳出循环
 		{
-			DWORD elapsed = 0;
-			DWORD dwStart = SP::Module::Comm::RVCGetTickCount();
-			DWORD dwEnd = SP::Module::Comm::RVCGetTickCount();
-			DWORD checkTimeOut = 5 * 60000; //五分钟超时
-			while (elapsed < checkTimeOut && m_pFSM->GetNeverMainPageFlag()) //准入成功,5分钟未进首页 or 成功进入首页跳出循环
-			{
-				Sleep(1000);
-				dwEnd = SP::Module::Comm::RVCGetTickCount();
-				elapsed = dwEnd - dwStart;
-			}
-			m_pFSM->GetSystemCPUStatus();
-			m_pFSM->GetSystemProccess();
-		}
-		else // C, M, S  准入失败时触发
-		{
-			m_pFSM->GetSystemCPUStatus();
-			m_pFSM->GetSystemProccess();
+			Sleep(60000); //1分钟检测一次进首页状态
+			dwEnd = SP::Module::Comm::RVCGetTickCount();
+			elapsed = dwEnd - dwStart;
 		}
+		m_pFSM->GetSystemCPUStatus();
+		m_pFSM->GetSystemProccess();
 	}
 };