From ab2adfb0a76e4e46a08f632cfb0525c40e7731f4 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 27 May 2019 09:46:54 -0400 Subject: [PATCH] Common/HttpRequest: Simplify cURL initialization std::call_once is guaranteed to execute the given callable object exactly once. This guarantee holds even if the function is called concurrently from several threads. Given that, we can replace the mutex and boolean flag with std::call_once and a std::once_flag to perform the same behavior. --- Source/Core/Common/HttpRequest.cpp | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/Source/Core/Common/HttpRequest.cpp b/Source/Core/Common/HttpRequest.cpp index 18ea402dc5..8929185a86 100644 --- a/Source/Core/Common/HttpRequest.cpp +++ b/Source/Core/Common/HttpRequest.cpp @@ -39,15 +39,11 @@ public: std::string EscapeComponent(const std::string& string); private: - static std::mutex s_curl_was_inited_mutex; - static bool s_curl_was_inited; + static inline std::once_flag s_curl_was_initialized; ProgressCallback m_callback; std::unique_ptr 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, ProgressCallback callback) : m_impl(std::make_unique(timeout_ms, std::move(callback))) { @@ -109,14 +105,7 @@ int HttpRequest::Impl::CurlProgressCallback(Impl* impl, double dlnow, double dlt HttpRequest::Impl::Impl(std::chrono::milliseconds timeout_ms, ProgressCallback callback) : m_callback(std::move(callback)) { - { - std::lock_guard lk(s_curl_was_inited_mutex); - if (!s_curl_was_inited) - { - curl_global_init(CURL_GLOBAL_DEFAULT); - s_curl_was_inited = true; - } - } + std::call_once(s_curl_was_initialized, [] { curl_global_init(CURL_GLOBAL_DEFAULT); }); m_curl.reset(curl_easy_init()); if (!m_curl)