Z991239-5171 #comment （信创）去掉GetEntityCfgInfo、实体加载相关代码、不再使用的终端退出、休眠等状态

Module/mod_healthmanager/HealthManagerFSM.cpp

@@ -140,9 +140,6 @@ ErrorCodeEnum CHealthManagerFSM::Initial()
     }
 #endif //RVC_OS_LINUX
 
-	spConfigCen->ReadConfigValueInt(GetEntityBase()->GetEntityName(), "SleepEnterOpMS", m_sleepEnterOpMS);
-	if (m_sleepEnterOpMS <= 0 || m_sleepEnterOpMS > 20000)
-		m_sleepEnterOpMS = 8000;//default
 	spConfigCen->ReadConfigValueInt(GetEntityBase()->GetEntityName(), "WKUpdatePeriod", m_wkUpdatePeriod);
 	if (m_wkUpdatePeriod <= 0 || m_wkUpdatePeriod > 365)
 		m_wkUpdatePeriod = 30;//default
@@ -158,11 +155,6 @@ ErrorCodeEnum CHealthManagerFSM::Initial()
 }
 ErrorCodeEnum CHealthManagerFSM::OnInit(void)
 {
-	m_hMD5OKEvt = CreateEventA(NULL, FALSE, FALSE, NULL);
-	if (m_hMD5OKEvt == NULL)
-	{
-		DbgWithLink(LOG_LEVEL_WARN,LOG_TYPE_SYSTEM)("CreateEvent failed(%d).", GetLastErrorRVC());
-	}
 	return Initial();
 }
 ErrorCodeEnum CHealthManagerFSM::OnExit(void)
@@ -476,146 +468,6 @@ unsigned int CHealthManagerFSM::s6_on_event(FSMEvent* pEvt)
 	}
 	return ret;
 }
-//PrepareOff
-void CHealthManagerFSM::s7_on_entry()
-{
-	LOG_FUNCTION();
-	m_fsmState = HM_FSM_STATE_PREPAREOFF;
-	ErrorCodeEnum eErrCode;
-	eErrCode = GetEntityBase()->GetFunction()->SetSysVar("RunState","P");
-	if (eErrCode != Error_Succeed)
-	{
-		DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("set RunState P failed (%d).",eErrCode);
-	}
-}
-void CHealthManagerFSM::s7_on_exit()
-{
-	LOG_FUNCTION();
-}
-unsigned int CHealthManagerFSM::s7_on_event(FSMEvent* pEvt)
-{
-	LOG_FUNCTION();
-	DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("s7(PrepareOff) event %d",pEvt->iEvt);
-	switch(pEvt->iEvt)
-	{
-	case USER_EVT_MAITAIN:
-		DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("to maintain...");
-		m_stateBeforeMaintain = m_fsmState;
-		pEvt->SetHandled();
-		break;
-	case USER_EVT_ENTER_CUSTOMER_MANAGER:
-		pEvt->SetHandled();
-		break;
-	default:
-		break;
-	}
-	return 0;
-}
-//Terminating
-void CHealthManagerFSM::s8_on_entry()
-{
-	LOG_FUNCTION();
-	m_fsmState = HM_FSM_STATE_TERMINATING;
-	ErrorCodeEnum eErrCode;
-	eErrCode = GetEntityBase()->GetFunction()->SetSysVar("RunState","T");
-	if (eErrCode != Error_Succeed)
-	{
-		DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("set RunState T failed (%d).",eErrCode);
-	}
-}
-void CHealthManagerFSM::s8_on_exit()
-{
-	LOG_FUNCTION();
-}
-unsigned int CHealthManagerFSM::s8_on_event(FSMEvent* pEvt)
-{
-	LOG_FUNCTION();
-	DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("s8(Terminating) event %d",pEvt->iEvt);
-	switch(pEvt->iEvt)
-	{
-	case USER_EVT_MAITAIN:
-		DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("to maintain...");
-		m_stateBeforeMaintain = m_fsmState;
-		pEvt->SetHandled();
-		break;
-	case USER_EVT_ENTER_CUSTOMER_MANAGER:
-		pEvt->SetHandled();
-		break;
-	default:
-		break;
-	}
-	return 0;
-}
-//Exitting
-void CHealthManagerFSM::s9_on_entry()
-{
-	LOG_FUNCTION();
-	m_fsmState = HM_FSM_STATE_EXITTING;
-	ErrorCodeEnum eErrCode;
-	eErrCode = GetEntityBase()->GetFunction()->SetSysVar("RunState","E");
-	if (eErrCode != Error_Succeed)
-	{
-		DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("set RunState E failed (%d).",eErrCode);
-	}
-}
-void CHealthManagerFSM::s9_on_exit()
-{
-	LOG_FUNCTION();
-}
-unsigned int CHealthManagerFSM::s9_on_event(FSMEvent* pEvt)
-{
-	LOG_FUNCTION();
-	DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("s9(Exitting) event %d",pEvt->iEvt);
-	switch(pEvt->iEvt)
-	{
-	case USER_EVT_MAITAIN:
-		DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("to maintain...");
-		m_stateBeforeMaintain = m_fsmState;
-		pEvt->SetHandled();
-		break;
-	case USER_EVT_ENTER_CUSTOMER_MANAGER:
-		pEvt->SetHandled();
-		break;
-	default:
-		break;
-	}
-	return 0;
-}
-//Sleep(L)
-void CHealthManagerFSM::s10_on_entry()
-{
-	LOG_FUNCTION();
-	m_fsmState = HM_FSM_STATE_SLEEP;
-	ErrorCodeEnum eErrCode;
-	eErrCode = GetEntityBase()->GetFunction()->SetSysVar("RunState","L");
-	if (eErrCode != Error_Succeed)
-	{
-		DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("set RunState L failed (%d).",eErrCode);
-	}
-}
-void CHealthManagerFSM::s10_on_exit()
-{
-	LOG_FUNCTION();
-}
-unsigned int CHealthManagerFSM::s10_on_event(FSMEvent* pEvt)
-{
-	LOG_FUNCTION();
-	DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("s10(Sleep) event %d",pEvt->iEvt);
-	switch(pEvt->iEvt)
-	{
-	case USER_EVT_MAITAIN:
-		DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM)("to maintain...");
-		m_stateBeforeMaintain = m_fsmState;
-		pEvt->SetHandled();
-		break;
-	case USER_EVT_ENTER_CUSTOMER_MANAGER:
-		pEvt->SetHandled();
-		break;
-	default:
-		break;
-	}
-	return 0;
-}
 //In Customer Manager System
 void CHealthManagerFSM::s11_on_entry()
 {
@@ -953,54 +805,6 @@ ErrorCodeEnum CHealthManagerFSM::AsyncTerminateEntity(const char *entity_name, v
 void CHealthManagerFSM::OnAnswer(CSmartPointer<IAsynWaitSp> pAsynWaitSp)
 {
 }
-CSimpleStringA CHealthManagerFSM::GetEntityCfgInfo(CSimpleStringA name,int &loadOpt)
-{
-	CSimpleStringA entityList(""),csBrowserName("IEBrowser");
-
-	if (!name.IsNullOrEmpty() && name.Compare("AllConfiguredEntity") == 0)
-	{
-		for (auto itor = m_vAllCfgEntity.cbegin(); itor != m_vAllCfgEntity.cend(); itor++)
-		{
-			entityList += (*itor) + ",";
-		}
-		return entityList;
-	}
-	csBrowserName = "Chromium";
-	if (!name.IsNullOrEmpty() && name.Compare(csBrowserName.GetData()) == 0)
-	{
-
-		DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI("GetEntityCfgInfo")("IE/Chromium just return 2");
-		loadOpt = 2;
-		return "";
-	}
-	map<CSimpleStringA,EntityLoadInfo>::iterator it;
-	for (it = m_coreBootOpt.begin(); it != m_coreBootOpt.end(); ++it)
-	{
-		if (_strnicmp(name,it->first,name.GetLength()) == 0)
-		{
-			loadOpt = it->second.loadOpt;
-			return "";
-		}
-	}
-	for (it = m_safeLoadOpt.begin(); it != m_safeLoadOpt.end(); ++it)
-	{
-		if (_strnicmp(name,it->first,name.GetLength()) == 0)
-		{
-			loadOpt = it->second.loadOpt;
-			return "";
-		}
-	}
-	for (it = m_operatingOpt.begin(); it != m_operatingOpt.end(); ++it)
-	{
-		if (_strnicmp(name,it->first,name.GetLength()) == 0)
-		{
-			loadOpt = it->second.loadOpt;
-			return "";
-		}
-	}
-	loadOpt = 99;
-	return "";
-}
 ErrorCodeEnum CHealthManagerFSM::QueryCheckCode(CSimpleStringA& csCkCode, bool bMaster)
 {
 	ErrorCodeEnum eErr = Error_Unexpect;
@@ -1600,7 +1404,7 @@ void CHealthManagerFSM::FWBDoInit()
 	}
 	else
 	{
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("FWBDoInit")("curr:[%s],ckCode:[%s]", currCheckCode.GetData(), csCkCode.GetData());
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("curr:[%s],ckCode:[%s]", currCheckCode.GetData(), csCkCode.GetData());
 	}
 	ErrorCodeEnum eErr;
 	if (m_pACClient == NULL || m_pACClient->QuerySessionClosed())
@@ -1624,6 +1428,7 @@ void CHealthManagerFSM::FWBDoInit()
 	{
 		GetEntityBase()->GetFunction()->SetSysVar("InitFWBFromStart", "Y");
 		QueryCheckCode(currCheckCode, true);
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("to set ckCode:[%s]", currCheckCode.GetData());
 		GetEntityBase()->GetFunction()->SetSysVar("ckCode", currCheckCode, true);
 		LogWarn(Severity_Low, Error_Unexpect, HealthManager_UserErrorCode_InitForFWB_Init_Suc, "Init for fwb suc.");
 	}

Module/mod_healthmanager/HealthManagerFSM.h

@@ -68,29 +68,6 @@ enum EvtType
 	USER_EVT_VTMLOADER_FINISHED,
 };
 
-enum EntityLoadFaultStage
-{
-	ENTITYLOAD_SAFELOADFAULT,
-	ENTITYLOAD_OPERATINGFAULT,
-};
-enum EntityOption
-{
-	HEARTBEAT,
-	SELFCHECKER
-};
-enum LoadingOpt
-{
-	LOADOPT_IGNORE,
-	LOADOPT_ASYNC_VERIFY,
-	LOADOPT_SYNC_VERIFY
-};
-enum LoadingResult
-{
-	LOADING_SUCCEED,
-	LOADING_INIT,
-	LOADING_FAILED,
-	LOADING_TIMEOUT,
-};
 enum CustomerManagerState
 {
 	CM_INIT,
@@ -100,16 +77,9 @@ enum CustomerManagerState
 enum HealthManagerFSMState
 {
 	HM_FSM_INIT,
-	HM_FSM_STATE_COREBOOT,
-	HM_FSM_STATE_SAFELOAD,
-	HM_FSM_STATE_OP,
 	HM_FSM_STATE_IDLE,
 	HM_FSM_STATE_FAULT,
 	HM_FSM_STATE_MAINTAINING,
-	HM_FSM_STATE_PREPAREOFF,
-	HM_FSM_STATE_TERMINATING,
-	HM_FSM_STATE_EXITTING,
-	HM_FSM_STATE_SLEEP,
 	HM_FSM_STATE_CMS,
 };
 
@@ -128,17 +98,6 @@ struct callback_entry : public IReleasable
 	int op;
 	ErrorCodeEnum ErrorResult;
 };
-struct EntityLoadInfo
-{
-	int initSn;
-	int loadOpt;
-	LoadingResult eResult;
-};
-struct EntityLoadFault
-{
-	CSimpleStringA name;
-	int count;
-};
 
 typedef struct _dmi_header
 {
@@ -164,16 +123,12 @@ class	CHealthManagerEntity;
 class CHealthManagerFSM : public FSMImpl<CHealthManagerFSM>, public ICallbackListener
 {
 public:
-	enum {s0,s4,s5,s6,s7,s8,s9,s10,s11};
+	enum {s0,s4,s5,s6,s11};
 	BEGIN_FSM_STATE(CHealthManagerFSM)
 		FSM_STATE_ENTRY(s0,"Init",s0_on_entry,s0_on_exit,s0_on_event)
 		FSM_STATE_ENTRY(s4,"Operating",s4_on_entry,s4_on_exit,s4_on_event)
 		FSM_STATE_ENTRY(s5,"Fault",s5_on_entry,s5_on_exit,s5_on_event)
 		FSM_STATE_ENTRY(s6,"Maintaining",s6_on_entry,s6_on_exit,s6_on_event)
-		FSM_STATE_ENTRY(s7,"PrepareOff",s7_on_entry,s7_on_exit,s7_on_event)
-		FSM_STATE_ENTRY(s8,"Terminating",s8_on_entry,s8_on_exit,s8_on_event)
-		FSM_STATE_ENTRY(s9,"Exitting",s9_on_entry,s9_on_exit,s9_on_event)
-		FSM_STATE_ENTRY(s10,"Sleep",s10_on_entry,s10_on_exit,s10_on_event)
 		FSM_STATE_ENTRY(s11,"CustomerManager",s11_on_entry,s11_on_exit,s11_on_event)
 	END_FSM_STATE()
 
@@ -185,28 +140,12 @@ public:
 		FSM_RULE_ENTRY(s5,s6,USER_EVT_MAITAIN,0)
 		FSM_RULE_ENTRY(s5,s11,USER_EVT_ENTER_CUSTOMER_MANAGER,0)
 		FSM_RULE_ENTRY(s5,s4, USER_EVT_ACCESSAUTH_FINISHED, 0)
-		FSM_RULE_ENTRY(s7,s6,USER_EVT_MAITAIN,0)
-		FSM_RULE_ENTRY(s7,s11,USER_EVT_ENTER_CUSTOMER_MANAGER,0)
-		FSM_RULE_ENTRY(s8,s6,USER_EVT_MAITAIN,0)
-		FSM_RULE_ENTRY(s8,s11,USER_EVT_ENTER_CUSTOMER_MANAGER,0)
-		FSM_RULE_ENTRY(s9,s6,USER_EVT_MAITAIN,0)
-		FSM_RULE_ENTRY(s9,s11,USER_EVT_ENTER_CUSTOMER_MANAGER,0)
-		FSM_RULE_ENTRY(s10,s6,USER_EVT_MAITAIN,0)
-		FSM_RULE_ENTRY(s10,s11,USER_EVT_ENTER_CUSTOMER_MANAGER,0)
 		FSM_RULE_ENTRY(s6,s4,USER_EVT_MAITAIN_FINISHED,4)
 		FSM_RULE_ENTRY(s6,s5,USER_EVT_MAITAIN_FINISHED,5)
-		FSM_RULE_ENTRY(s6,s7,USER_EVT_MAITAIN_FINISHED,7)
-		FSM_RULE_ENTRY(s6,s8,USER_EVT_MAITAIN_FINISHED,8)
-		FSM_RULE_ENTRY(s6,s9,USER_EVT_MAITAIN_FINISHED,9)
-		FSM_RULE_ENTRY(s6,s10,USER_EVT_MAITAIN_FINISHED,10)
 		FSM_RULE_ENTRY(s11, s6, USER_EVT_MAITAIN, 0)
 		FSM_RULE_ENTRY(s11,s4,USER_EVT_SWITCH_BACK_TO_RVC,4)
 		FSM_RULE_ENTRY(s11,s5,USER_EVT_SWITCH_BACK_TO_RVC,5)
 		FSM_RULE_ENTRY(s11,s6,USER_EVT_SWITCH_BACK_TO_RVC,6)
-		FSM_RULE_ENTRY(s11,s7,USER_EVT_SWITCH_BACK_TO_RVC,7)
-		FSM_RULE_ENTRY(s11,s8,USER_EVT_SWITCH_BACK_TO_RVC,8)
-		FSM_RULE_ENTRY(s11,s9,USER_EVT_SWITCH_BACK_TO_RVC,9)
-		FSM_RULE_ENTRY(s11,s10,USER_EVT_SWITCH_BACK_TO_RVC,10)
 	END_FSM_RULE()
 
 	CHealthManagerFSM():m_SysState("I"),m_pACClient(NULL)
@@ -232,18 +171,6 @@ public:
 	void s6_on_entry();
 	void s6_on_exit();
 	unsigned int s6_on_event(FSMEvent* pEvt);
-	void s7_on_entry();
-	void s7_on_exit();
-	unsigned int s7_on_event(FSMEvent* pEvt);
-	void s8_on_entry();
-	void s8_on_exit();
-	unsigned int s8_on_event(FSMEvent* pEvt);
-	void s9_on_entry();
-	void s9_on_exit();
-	unsigned int s9_on_event(FSMEvent* pEvt);
-	void s10_on_entry();
-	void s10_on_exit();
-	unsigned int s10_on_event(FSMEvent* pEvt);
 	void s11_on_entry();
 	void s11_on_exit();
 	unsigned int s11_on_event(FSMEvent* pEvt);
@@ -265,8 +192,6 @@ public:
 	void ToReAccessAuth(bool bEver=false);
 	void SetCustomerMngerState(int iValue){m_custMngerState = iValue;}
 	int GetCustomerMngerState(){return m_custMngerState;}
-	CSimpleStringA GetEntityCfgInfo(CSimpleStringA name,int &loadOpt);
-	void SetMD5OK(const int value){ m_havReceiveMD5OK = value; SetEvent(m_hMD5OKEvt); }
 	int QueryAccessAuthStatus()
 	{
 		if (m_iAccessAuth == AccessAuth_Suc)
@@ -321,15 +246,8 @@ private:
 
 private:
 	CSimpleStringA m_SysState,m_checkCode,m_csErrEntity,m_NewStartPage;
-	map<int,int> m_enOpt;//entity option
-	vector<CSimpleStringA> m_vCoreBoot,m_vSafeLoad,m_vOperating,m_vAllCfgEntity;
-	map<CSimpleStringA,EntityLoadInfo> m_coreBootOpt;
-	map<CSimpleStringA,EntityLoadInfo> m_safeLoadOpt;
-	map<CSimpleStringA,EntityLoadInfo> m_operatingOpt;
-	map<CSimpleStringA,EntityLoadFault> m_safeLoadFault;
-	map<CSimpleStringA,EntityLoadFault> m_operatingFault;
 	int m_devCfgNum, m_AccessAuthTries, m_InitTries, m_fsmState, m_stateBeforeMaintain, m_custMngerState, m_preFsmState, m_accessAuthCheckMD5
-		,m_havReceiveMD5OK,m_autoDoInitCount, m_sleepEnterOpMS/*启动第三阶段等待时间，单位毫秒*/
+		,m_havReceiveMD5OK,m_autoDoInitCount
 		,m_iAccessAuth/*-1 未准入; 0 准入失败；1 准入成功*/, m_iDoNotUpdateWKDaily, m_wkUpdatePeriod/*if exceed the period time,we should update key*/;
 	AccessAuthService_ClientBase *m_pACClient;
 	bool m_bIdleToMaintain, m_bHasAuthEver, m_bFirstAccessAuth
@@ -337,7 +255,6 @@ private:
 	DWORD m_AccessAuthTimeout,m_InitializationTimeout,m_elapseTimeFromOSStart;
 	ULONGLONG m_ullElapseFromOSStart;
 	DeviceControlService_ClientBase *m_pDevCtrlClient;
-	HANDLE m_hMD5OKEvt;
 	CSystemStaticInfo m_sysInfo;
 	std::map<string, string> m_computerInfo;
 	bool mCofigMode;

Module/mod_healthmanager/mod_healthmanager.cpp

@@ -144,8 +144,7 @@ void HealthManagerSession::Handle_DoEvent(SpReqAnsContext<HealthManagerService_D
 }
 void HealthManagerSession::Handle_GetEntityCfgInfo(SpReqAnsContext<HealthManagerService_GetEntityCfgInfo_Req, HealthManagerService_GetEntityCfgInfo_Ans>::Pointer ctx)
 {
-	DbgToBeidou(ctx->link, __FUNCTION__)();
-	m_pEntity->GetEntityCfgInfo(ctx);
+	ctx->Answer(Error_NotImpl);
 }
 void HealthManagerSession::Handle_GetNetworkState(SpReqAnsContext<HealthManagerService_GetNetworkState_Req, HealthManagerService_GetNetworkState_Ans>::Pointer ctx)
 {

Module/mod_healthmanager/mod_healthmanager.h

@@ -219,11 +219,6 @@ public:
 		ctx->Answer(Error_Succeed);
 	}
 
-	void GetEntityCfgInfo(SpReqAnsContext<HealthManagerService_GetEntityCfgInfo_Req, HealthManagerService_GetEntityCfgInfo_Ans>::Pointer ctx)
-	{
-		ctx->Ans.reserved2 = m_fsm.GetEntityCfgInfo(ctx->Req.name,ctx->Ans.loadOpt);
-		ctx->Answer(Error_Succeed);
-	}
 
 	void GetNetworkState(SpReqAnsContext<HealthManagerService_GetNetworkState_Req, HealthManagerService_GetNetworkState_Ans>::Pointer ctx)
 	{