Destroy thread created and exit app safely

Author: AlanoSong

Main.cpp

@@ -117,6 +117,7 @@ int main(int argc, char *argv[])
 
     pMiniThingCore->StopMonitorThread();
     pMiniThingCore->StopQueryThread();
+    pMiniThingCore->SQLiteClose();
 
     return 0;
 #endif

MiniThing.vcxproj

@@ -188,6 +188,7 @@
     <ClInclude Include="MiniThing\Utility\Utility.h" />
   </ItemGroup>
   <ItemGroup>
+    <None Include=".github\workflows\msbuild.yml" />
     <None Include=".gitignore" />
     <None Include="LICENSE" />
     <None Include="README-CN.md" />

MiniThing.vcxproj.filters

@@ -64,6 +64,12 @@
     <Filter Include="MiniThing\ThirdParty\EasyLogger\demo\os\windows\easylogger\port">
       <UniqueIdentifier>{d92dc947-8176-4b4b-91ac-a675cdbd7335}</UniqueIdentifier>
     </Filter>
+    <Filter Include=".github">
+      <UniqueIdentifier>{65a01b04-f0eb-4eb4-9620-e5e8dfccac45}</UniqueIdentifier>
+    </Filter>
+    <Filter Include=".github\workflows">
+      <UniqueIdentifier>{e7177173-df38-4607-8632-68e5ad8df407}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="MiniThing\Core\MiniThingCore.cpp">
@@ -151,6 +157,9 @@
     <None Include="LICENSE" />
     <None Include="README.md" />
     <None Include="README-CN.md" />
+    <None Include=".github\workflows\msbuild.yml">
+      <Filter>.github\workflows</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Image Include="Docs\Pictures\Architecture.png">

MiniThing/Core/MiniThingCore.cpp

@@ -23,10 +23,6 @@ MiniThingCore::MiniThingCore(void)
 
 MiniThingCore::~MiniThingCore(void)
 {
-    if (FAILED(SQLiteClose()))
-    {
-        assert(0);
-    }
 }
 
 void MiniThingCore::SetDataBasePath(std::wstring dbName)
@@ -727,18 +723,28 @@ void MiniThingCore::StopMonitorThread(void)
 {
     for (auto it = m_volumeSet.begin(); it != m_volumeSet.end(); it++)
     {
-        SetEvent(it->hMonitorExitEvent);
-        DWORD dwWaitCode = WaitForSingleObject(it->hMonitor, INFINITE);
-        assert(dwWaitCode == WAIT_OBJECT_0);
+        //SetEvent(it->hMonitorExitEvent);
+        //DWORD dwWaitCode = WaitForSingleObject(it->hMonitor, INFINITE);
+        //assert(dwWaitCode == WAIT_OBJECT_0);
+
+        // Normally we shoud send exit event, and wait thread exit itself
+        // But it seems that the thread enter dead lock when exit
+        // So terminate the thread by hand
+        TerminateThread(it->hMonitor, 0);
 
         CloseHandle(it->hMonitor);
 
         delete it->pMonitorTaskInfo;
     }
 
-    SetEvent(m_hUpdateSqlDataBaseExitEvent);
-    DWORD dwWaitCode = WaitForSingleObject(m_hUpdateSqlDataBaseThread, INFINITE);
-    assert(dwWaitCode == WAIT_OBJECT_0);
+    //SetEvent(m_hUpdateSqlDataBaseExitEvent);
+    //DWORD dwWaitCode = WaitForSingleObject(m_hUpdateSqlDataBaseThread, INFINITE);
+    //assert(dwWaitCode == WAIT_OBJECT_0);
+
+    // Normally we shoud send exit event, and wait thread exit itself
+    // But it seems that the thread enter dead lock when exit
+    // So terminate the thread by hand
+    TerminateThread(m_hUpdateSqlDataBaseThread, 0);
 }
 
 HRESULT MiniThingCore::CreateQueryThread(void)

MiniThing/Qt/MiniThingQt.cpp

@@ -114,8 +114,11 @@ MiniThingQt::MiniThingQt(QWidget* parent) : QMainWindow(parent)
 
 MiniThingQt::~MiniThingQt()
 {
-    delete m_pMiniThingCore;
+    // Destroy qt work thread firstly, cause there are some data strcture
+    //  we need use to terminate thread and so on
+    //  after we destroy qt work thread, we can destroy core safely
     delete m_pMiniThingQtWorkThread;
+    delete m_pMiniThingCore;
 
     delete m_rightKeyMenu;
     delete m_rightKeyActionOpen;

MiniThing/Qt/MiniThingQtBackgroud.cpp

@@ -8,6 +8,11 @@ MiniThingQtWorkThread::MiniThingQtWorkThread()
 
 MiniThingQtWorkThread::~MiniThingQtWorkThread()
 {
+    // Terminate monitor thread, and update sql base thread within it
+    m_pMiniThingCore->StopMonitorThread();
+
+    // Close sqlite database before return
+    m_pMiniThingCore->SQLiteClose();
 }