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

Improve some variable names in CHttp

Browse source
This commit is contained in:
Robert Müller 2024-02-04 16:39:55 +01:00
parent 987acfbba7
commit d6a20f271b
1 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -443,9 +443,9 @@ void CHttp::RunLoop()
while(m_State == CHttp::RUNNING) while(m_State == CHttp::RUNNING)
{ {
static int NextTimeout = std::numeric_limits<int>::max(); static int s_NextTimeout = std::numeric_limits<int>::max();
int Events = 0; int Events = 0;
CURLMcode mc = curl_multi_poll(m_pMultiH, NULL, 0, NextTimeout, &Events); const CURLMcode PollCode = curl_multi_poll(m_pMultiH, nullptr, 0, s_NextTimeout, &Events);
// We may have been woken up for a shutdown // We may have been woken up for a shutdown
if(m_Shutdown) if(m_Shutdown)
@ -454,7 +454,7 @@ void CHttp::RunLoop()
if(!m_ShutdownTime.has_value()) if(!m_ShutdownTime.has_value())
{ {
m_ShutdownTime = Now + m_ShutdownDelay; m_ShutdownTime = Now + m_ShutdownDelay;
NextTimeout = m_ShutdownDelay.count(); s_NextTimeout = m_ShutdownDelay.count();
} }
else if(m_ShutdownTime < Now || m_RunningRequests.empty()) else if(m_ShutdownTime < Now || m_RunningRequests.empty())
{ {
@ -462,36 +462,36 @@ void CHttp::RunLoop()
} }
} }
if(mc != CURLM_OK) if(PollCode != CURLM_OK)
{ {
Lock.lock(); Lock.lock();
log_error("http", "Failed multi wait: %s", curl_multi_strerror(mc)); log_error("http", "Failed multi wait: %s", curl_multi_strerror(PollCode));
m_State = CHttp::ERROR; m_State = CHttp::ERROR;
break; break;
} }
mc = curl_multi_perform(m_pMultiH, &Events); const CURLMcode PerformCode = curl_multi_perform(m_pMultiH, &Events);
if(mc != CURLM_OK) if(PerformCode != CURLM_OK)
{ {
Lock.lock(); Lock.lock();
log_error("http", "Failed multi perform: %s", curl_multi_strerror(mc)); log_error("http", "Failed multi perform: %s", curl_multi_strerror(PerformCode));
m_State = CHttp::ERROR; m_State = CHttp::ERROR;
break; break;
} }
struct CURLMsg *m; struct CURLMsg *pMsg;
while((m = curl_multi_info_read(m_pMultiH, &Events))) while((pMsg = curl_multi_info_read(m_pMultiH, &Events)))
{ {
if(m->msg == CURLMSG_DONE) if(pMsg->msg == CURLMSG_DONE)
{ {
auto RequestIt = m_RunningRequests.find(m->easy_handle); auto RequestIt = m_RunningRequests.find(pMsg->easy_handle);
dbg_assert(RequestIt != m_RunningRequests.end(), "Running handle not added to map"); dbg_assert(RequestIt != m_RunningRequests.end(), "Running handle not added to map");
auto pRequest = std::move(RequestIt->second); auto pRequest = std::move(RequestIt->second);
m_RunningRequests.erase(RequestIt); m_RunningRequests.erase(RequestIt);
pRequest->OnCompletionInternal(m->data.result); pRequest->OnCompletionInternal(pMsg->data.result);
curl_multi_remove_handle(m_pMultiH, m->easy_handle); curl_multi_remove_handle(m_pMultiH, pMsg->easy_handle);
curl_easy_cleanup(m->easy_handle); curl_easy_cleanup(pMsg->easy_handle);
} }
} }
@ -513,8 +513,7 @@ void CHttp::RunLoop()
if(!pRequest->ConfigureHandle(pEH)) if(!pRequest->ConfigureHandle(pEH))
goto error_configure; goto error_configure;
mc = curl_multi_add_handle(m_pMultiH, pEH); if(curl_multi_add_handle(m_pMultiH, pEH) != CURLM_OK)
if(mc != CURLM_OK)
goto error_configure; goto error_configure;
m_RunningRequests.emplace(pEH, std::move(pRequest)); m_RunningRequests.emplace(pEH, std::move(pRequest));