Germany/hunting
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Improve main thread.

Browse Source
This commit is contained in:
fancy 2023-11-20 06:22:35 -08:00
parent dd1cfab956
commit a9cc7abe6b
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/main/src/MainThread.cpp
View File

@ -33,6 +33,9 @@ std::shared_ptr<MainThread> &MainThread::GetInstance(std::shared_ptr<MainThread>
} }
StatusCode MainThread::Init(void) StatusCode MainThread::Init(void)
{ {
CreateLogModule();
ILogInit(LOG_EASYLOGGING);
CustomizationInit();
mMainThreadRuning = true; mMainThreadRuning = true;
CreateAllModules(); CreateAllModules();
IHalInit(); IHalInit();
@ -41,11 +44,12 @@ StatusCode MainThread::Init(void)
StatusCode MainThread::UnInit(void) StatusCode MainThread::UnInit(void)
{ {
DestoryAllModules(); DestoryAllModules();
ILogUnInit();
return CreateStatusCode(STATUS_CODE_OK); return CreateStatusCode(STATUS_CODE_OK);
} }
StatusCode MainThread::CreateAllModules(void) StatusCode MainThread::CreateAllModules(void)
{ {
CreateLogModule(); // CreateLogModule();
CreateHalModule(); CreateHalModule();
return CreateStatusCode(STATUS_CODE_OK); return CreateStatusCode(STATUS_CODE_OK);
} }

1
hal/CMakeLists.txt
View File

@ -52,7 +52,6 @@ add_custom_target(
) )
add_custom_command( add_custom_command(
TARGET ${IMPL_TARGET} TARGET ${IMPL_TARGET}
TARGET ${ABSTRACT_TARGET}
PRE_BUILD PRE_BUILD
COMMAND make Hal_code_check COMMAND make Hal_code_check
COMMAND make Hal_code_format COMMAND make Hal_code_format

11
hal/src/HalMakePtr.cpp
View File

@ -20,11 +20,12 @@ StatusCode CreateHalModule(void)
{ {
IHal *hal = NULL; IHal *hal = NULL;
StatusCode code = HalMakePtr::GetInstance()->CreateHalPtr(&hal); StatusCode code = HalMakePtr::GetInstance()->CreateHalPtr(&hal);
if (IsCodeOK(code)) { if (IsCodeOK(code) && NULL != hal) {
LogInfo("Create Hal instance ok.\n"); LogInfo("Create Hal instance ok.\n");
ResetHalImpl((IHal *)hal); ResetHalImpl((IHal *)hal);
} }
else { else {
LogError("Create Hal failed.\n");
return CreateStatusCode(STATUS_CODE_NOT_OK); return CreateStatusCode(STATUS_CODE_NOT_OK);
} }
auto instance = std::make_shared<IHalCpp>(); auto instance = std::make_shared<IHalCpp>();
@ -48,10 +49,14 @@ std::shared_ptr<HalMakePtr> &HalMakePtr::GetInstance(std::shared_ptr<HalMakePtr>
} }
return instance; return instance;
} }
StatusCode HalMakePtr::CreateHalPtr(IHal **hal) { return NewHal((Hal **)hal); } StatusCode HalMakePtr::CreateHalPtr(IHal **hal)
{
LogWarning("Hal is default hal.\n");
return NewHal((Hal **)hal);
}
StatusCode HalMakePtr::CreateHalSharePtr(std::shared_ptr<IHalCpp> &impl) StatusCode HalMakePtr::CreateHalSharePtr(std::shared_ptr<IHalCpp> &impl)
{ {
LogInfo("HalMakePtr make ptr.\n"); LogWarning("IHalCpp is default.\n");
impl = std::make_shared<HalCpp>(); impl = std::make_shared<HalCpp>();
return CreateStatusCode(STATUS_CODE_OK); return CreateStatusCode(STATUS_CODE_OK);
} }