pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-07-11 06:22:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Network] and [Kernel] add Cancel for downloader (windows)

Browse Source
This commit is contained in:
Vladimir Gorshenkov
2022-01-22 20:04:48 +03:00
parent 920adde65f
commit d997dae36c
11 changed files with 261 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
DesktopEditor/graphics/BaseThread.cpp
View File

@ -155,7 +155,7 @@ namespace NSThreads
m_lThreadPriority = 0;
m_bIsNeedDestroy = false;
m_bIsExit = new std::atomic<bool>(false);
m_bIsExit = nullptr;
}
CBaseThread::~CBaseThread()
{
@ -172,7 +172,7 @@ namespace NSThreads
m_bRunThread = TRUE;
m_bIsExit->exchange(false);
m_bIsExit = new std::atomic<bool>(false);
#if defined(_WIN32) || defined(_WIN64) || defined(_WIN32_WCE)
DWORD dwTemp;
((__native_thread*)m_hThread)->m_thread = CreateThread(NULL, 0, &__ThreadProc, (void*)this, 0, &dwTemp);
@ -197,11 +197,13 @@ namespace NSThreads
m_bRunThread = FALSE;
Join();
RELEASEOBJECT(m_bIsExit);
RELEASEOBJECT(m_hThread);
}
void CBaseThread::StopNoJoin()
{
m_bRunThread = FALSE;
RELEASEOBJECT(m_bIsExit);
RELEASEOBJECT(m_hThread);
}
void CBaseThread::DestroyOnFinish()
@ -241,12 +243,10 @@ namespace NSThreads
m_bIsExit->exchange(true);
#if defined(_WIN32) || defined(_WIN64) || defined(_WIN32_WCE)
//WaitForSingleObject(((__native_thread*)m_hThread)->m_thread, INFINITE);
#else
//pthread_cancel(((__native_thread*)m_hThread)->m_thread);
//pthread_kill(((__native_thread*)m_hThread)->m_thread, SIGUSR1);
pthread_join(((__native_thread*)m_hThread)->m_thread, 0);
#endif
m_bRunThread = FALSE;
Join();
RELEASEOBJECT(m_bIsExit);
RELEASEOBJECT(m_hThread);
}
}