pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-02-10 18:05:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Network] changed checking for 'aborted' thread's flag

Browse Source
This commit is contained in:
Maxim Kadushkin
2022-01-24 19:30:55 +03:00
parent e28e8b56b1
commit 26fbe3babf
4 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Common/Network/FileTransporter/src/FileTransporter_private.h
View File

@ -56,8 +56,7 @@ namespace NSNetwork
m_cData = NULL;
m_nSize = 0;
m_bIsExit = nullptr;
// m_bIsExit = nullptr;
}
CFileTransporterBase(const std::wstring &sUploadUrl, const unsigned char* cData, const int nSize)
@ -74,8 +73,7 @@ namespace NSNetwork
m_cData = cData;
m_nSize = nSize;
m_bIsExit = nullptr;
// m_bIsExit = nullptr;
}
CFileTransporterBase(const std::wstring &sUploadUrl, const std::wstring &sUploadFilePath)
@ -92,8 +90,7 @@ namespace NSNetwork
m_cData = NULL;
m_nSize = 0;
m_bIsExit = nullptr;
// m_bIsExit = nullptr;
}
virtual ~CFileTransporterBase ()
@ -103,7 +100,7 @@ namespace NSNetwork
NSFile::CFileBinary::Remove(m_sDownloadFilePath);
m_sDownloadFilePath = L"";
}
m_bIsExit = nullptr;
// m_bIsExit = nullptr;
}
virtual int DownloadFile() = 0;
@ -135,8 +132,9 @@ namespace NSNetwork
std::function<void(int)> m_func_onComplete = nullptr;
std::function<void(int)> m_func_onProgress = nullptr;
std::function<bool(void)> m_check_aborted = nullptr;
std::atomic<bool>* m_bIsExit; // Для остановки и выхода потока
// std::atomic<bool>* m_bIsExit; // Для остановки и выхода потока
};
class CFileTransporter_private : public NSThreads::CBaseThread
@ -228,7 +226,6 @@ namespace NSNetwork
virtual DWORD ThreadProc ()
{
m_pInternal->m_bComplete = false;
m_pInternal->m_bIsExit = NSThreads::CBaseThread::m_bIsExit;
int hrResultAll = 0;
if(m_pInternal->m_eLoadType == m_pInternal->DOWNLOADFILE)

14
Common/Network/FileTransporter/src/FileTransporter_win.cpp
View File

@ -89,7 +89,7 @@ namespace NSNetwork
DeleteUrlCacheEntry(m_sDownloadFileUrl.c_str());
HRESULT hrResultAll = DownloadFileAll(m_sDownloadFileUrl, m_sDownloadFilePath);
if(E_ABORT == hrResultAll && m_bIsExit->load())
if(E_ABORT == hrResultAll /*&& m_bIsExit->load()*/)
{
//DeleteUrlCacheEntry(m_sDownloadFileUrl.c_str());
CoUninitialize ();
@ -373,7 +373,7 @@ namespace NSNetwork
}
DownloadProgress progress;
progress.func_getAborted = std::bind(&CFileTransporterBaseWin::getAborted, this);
progress.func_checkAborted = m_check_aborted;
progress.func_onProgress = m_func_onProgress;
// Скачиваем файл с возвратом процентов состояния
return URLDownloadToFileW (NULL, sFileURL.c_str(), strFileOutput.c_str(), NULL, static_cast<IBindStatusCallback*>(&progress));
@ -414,7 +414,7 @@ namespace NSNetwork
virtual HRESULT __stdcall OnProgress(ULONG ulProgress, ULONG ulProgressMax, ULONG ulStatusCode, LPCWSTR szStatusText)
{
if(func_getAborted && func_getAborted())
if(func_checkAborted && func_checkAborted())
{
return E_ABORT;
}
@ -427,13 +427,10 @@ namespace NSNetwork
return S_OK;
}
std::function<bool(void)> func_getAborted = nullptr;
std::function<bool(void)> func_checkAborted = nullptr;
std::function<void(int)> func_onProgress = nullptr;
};
bool getAborted() const {
return m_bIsExit && m_bIsExit->load();
}
bool DownloadFilePS(const std::wstring& sFileURL, const std::wstring& strFileOutput)
{
@ -489,16 +486,19 @@ namespace NSNetwork
CFileTransporter_private::CFileTransporter_private(const std::wstring &sDownloadFileUrl, bool bDelete)
: m_pInternal(new CFileTransporterBaseWin(sDownloadFileUrl, bDelete))
{
m_pInternal->m_check_aborted = std::bind(&CBaseThread::isAborted, this);;
}
CFileTransporter_private::CFileTransporter_private(const std::wstring &sUploadUrl, const unsigned char* cData, const int nSize)
: m_pInternal(new CFileTransporterBaseWin(sUploadUrl, cData, nSize))
{
m_pInternal->m_check_aborted = std::bind(&CBaseThread::isAborted, this);;
}
CFileTransporter_private::CFileTransporter_private(const std::wstring &sUploadUrl, const std::wstring &sUploadFilePath)
: m_pInternal(new CFileTransporterBaseWin(sUploadUrl, sUploadFilePath))
{
m_pInternal->m_check_aborted = std::bind(&CBaseThread::isAborted, this);;
}
}
}