mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-27 03:39:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5642 from lioncash/chrono

Browse Source 
HttpRequest: Use std::chrono for indicating time periods
This commit is contained in:
Leo Lam 2017-06-18 23:13:52 +02:00 committed by GitHub
commit 9a1503a75c
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,7 @@
#include "Common/HttpRequest.h" #include "Common/HttpRequest.h"
#include <chrono>
#include <cstddef> #include <cstddef>
#include <curl/curl.h> #include <curl/curl.h>
@ -22,7 +23,7 @@ public:
POST, POST,
}; };
Impl(int timeout_ms); explicit Impl(std::chrono::milliseconds timeout_ms);
bool IsValid() const; bool IsValid() const;
Response Fetch(const std::string& url, Method method, const Headers& headers, const u8* payload, Response Fetch(const std::string& url, Method method, const Headers& headers, const u8* payload,
@ -32,7 +33,8 @@ private:
std::unique_ptr<CURL, decltype(&curl_easy_cleanup)> m_curl{curl_easy_init(), curl_easy_cleanup}; std::unique_ptr<CURL, decltype(&curl_easy_cleanup)> m_curl{curl_easy_init(), curl_easy_cleanup};
}; };
HttpRequest::HttpRequest(int timeout_ms) : m_impl(std::make_unique<Impl>(timeout_ms)) HttpRequest::HttpRequest(std::chrono::milliseconds timeout_ms)
: m_impl(std::make_unique<Impl>(timeout_ms))
{ {
} }
@ -61,7 +63,7 @@ HttpRequest::Response HttpRequest::Post(const std::string& url, const std::strin
reinterpret_cast<const u8*>(payload.data()), payload.size()); reinterpret_cast<const u8*>(payload.data()), payload.size());
} }
HttpRequest::Impl::Impl(int timeout_ms) HttpRequest::Impl::Impl(std::chrono::milliseconds timeout_ms)
{ {
if (!m_curl) if (!m_curl)
return; return;
@ -69,7 +71,7 @@ HttpRequest::Impl::Impl(int timeout_ms)
// libcurl may not have been built with async DNS support, so we disable // libcurl may not have been built with async DNS support, so we disable
// signal handlers to avoid a possible and likely crash if a resolve times out. // signal handlers to avoid a possible and likely crash if a resolve times out.
curl_easy_setopt(m_curl.get(), CURLOPT_NOSIGNAL, true); curl_easy_setopt(m_curl.get(), CURLOPT_NOSIGNAL, true);
curl_easy_setopt(m_curl.get(), CURLOPT_TIMEOUT_MS, timeout_ms); curl_easy_setopt(m_curl.get(), CURLOPT_TIMEOUT_MS, static_cast<long>(timeout_ms.count()));
#ifdef _WIN32 #ifdef _WIN32
// ALPN support is enabled by default but requires Windows >= 8.1. // ALPN support is enabled by default but requires Windows >= 8.1.
curl_easy_setopt(m_curl.get(), CURLOPT_SSL_ENABLE_ALPN, false); curl_easy_setopt(m_curl.get(), CURLOPT_SSL_ENABLE_ALPN, false);

3
Source/Core/Common/HttpRequest.h
View File

@ -4,6 +4,7 @@
#pragma once #pragma once
#include <chrono>
#include <map> #include <map>
#include <memory> #include <memory>
#include <optional> #include <optional>
@ -17,7 +18,7 @@ namespace Common
class HttpRequest final class HttpRequest final
{ {
public: public:
HttpRequest(int timeout_ms = 3000); explicit HttpRequest(std::chrono::milliseconds timeout_ms = std::chrono::milliseconds{3000});
~HttpRequest(); ~HttpRequest();
bool IsValid() const; bool IsValid() const;