piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 00:59:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

HttpRequest: make curl initialization thread-safe

Browse Source
This commit is contained in:
Pierre Bourdon
2018-03-18 21:09:11 +01:00
parent 5498f9b7ef
commit bc9deb7be3
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Core/Common/HttpRequest.cpp
View File

@ -7,6 +7,7 @@
#include <chrono> #include <chrono>
#include <cstddef> #include <cstddef>
#include <curl/curl.h> #include <curl/curl.h>
#include <mutex>
#include "Common/Logging/Log.h" #include "Common/Logging/Log.h"
#include "Common/ScopeGuard.h" #include "Common/ScopeGuard.h"
@ -30,9 +31,14 @@ public:
size_t size); size_t size);
private: private:
std::unique_ptr<CURL, decltype(&curl_easy_cleanup)> m_curl{curl_easy_init(), curl_easy_cleanup}; static std::mutex s_curl_was_inited_mutex;
static bool s_curl_was_inited;
std::unique_ptr<CURL, decltype(&curl_easy_cleanup)> m_curl{nullptr, curl_easy_cleanup};
}; };
std::mutex HttpRequest::Impl::s_curl_was_inited_mutex;
bool HttpRequest::Impl::s_curl_was_inited = false;
HttpRequest::HttpRequest(std::chrono::milliseconds timeout_ms) HttpRequest::HttpRequest(std::chrono::milliseconds timeout_ms)
: m_impl(std::make_unique<Impl>(timeout_ms)) : m_impl(std::make_unique<Impl>(timeout_ms))
{ {
@ -65,6 +71,16 @@ HttpRequest::Response HttpRequest::Post(const std::string& url, const std::strin
HttpRequest::Impl::Impl(std::chrono::milliseconds timeout_ms) HttpRequest::Impl::Impl(std::chrono::milliseconds timeout_ms)
{ {
{
std::lock_guard<std::mutex> lk(s_curl_was_inited_mutex);
if (!s_curl_was_inited)
{
curl_global_init(CURL_GLOBAL_DEFAULT);
s_curl_was_inited = true;
}
}
m_curl.reset(curl_easy_init());
if (!m_curl) if (!m_curl)
return; return;