edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-18 14:08:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7981 from Robyt3/Http-Cancel-New-Jobs-On-Shutdown

Browse source 
Abort new HTTP requests immediately when shutting down `CHttp`
This commit is contained in:
Dennis Felsing 2024-02-16 18:07:02 +00:00 committed by GitHub
parent aae674897a c729ccad32
commit 1bc11c517d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/engine/shared/http.cpp
View file

@ -560,9 +560,16 @@ void CHttp::RunLoop()
void CHttp::Run(std::shared_ptr<IHttpRequest> pRequest) void CHttp::Run(std::shared_ptr<IHttpRequest> pRequest)
{ {
std::shared_ptr<CHttpRequest> pRequestImpl = std::static_pointer_cast<CHttpRequest>(pRequest);
std::unique_lock Lock(m_Lock); std::unique_lock Lock(m_Lock);
if(m_Shutdown)
{
str_copy(pRequestImpl->m_aErr, "Shutting down");
pRequestImpl->OnCompletionInternal(CURLE_ABORTED_BY_CALLBACK);
return;
}
m_Cv.wait(Lock, [this]() { return m_State != CHttp::UNINITIALIZED; }); m_Cv.wait(Lock, [this]() { return m_State != CHttp::UNINITIALIZED; });
m_PendingRequests.emplace_back(std::static_pointer_cast<CHttpRequest>(pRequest)); m_PendingRequests.emplace_back(pRequestImpl);
curl_multi_wakeup(m_pMultiH); curl_multi_wakeup(m_pMultiH);
} }