Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-26 23:10:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Reporting: Use g_DownloadManager instead of using a custom thread solution

Browse Source
This commit is contained in:
Henrik Rydgård 2024-10-28 16:42:17 +01:00
parent 56a164a14e
commit fb4c1fb63f
2 changed files with 14 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Common/Net/HTTPRequest.cpp
View File

@ -9,7 +9,8 @@
namespace http {
Request::Request(RequestMethod method, const std::string &url, std::string_view name, bool *cancelled, ProgressBarMode mode) : method_(method), url_(url), name_(name), progress_(cancelled), progressBarMode_(mode) {
Request::Request(RequestMethod method, const std::string &url, std::string_view name, bool *cancelled, ProgressBarMode mode)
: method_(method), url_(url), name_(name), progress_(cancelled), progressBarMode_(mode) {
INFO_LOG(Log::HTTP, "HTTP %s request: %s (%.*s)", RequestMethodToString(method), url.c_str(), (int)name.size(), name.data());
progress_.callback = [=](int64_t bytes, int64_t contentLength, bool done) {

44
Core/Reporting.cpp
View File

@ -308,30 +308,14 @@ namespace Reporting
bool SendReportRequest(const char *uri, const std::string &data, const std::string &mimeType, Buffer *output = NULL)
{
http::Client http;
net::RequestProgress progress(&pendingMessagesDone);
Buffer theVoid = Buffer::Void();
http.SetUserAgent(StringFromFormat("PPSSPP/%s", PPSSPP_GIT_VERSION));
if (output == nullptr)
output = &theVoid;
const char *serverHost = ServerHostname();
if (!serverHost)
return false;
if (http.Resolve(serverHost, ServerPort())) {
int result = -1;
if (http.Connect()) {
result = http.POST(http::RequestParams(uri), data, mimeType, output, &progress);
http.Disconnect();
}
return result >= 200 && result < 300;
} else {
return false;
}
char url[1024];
const char *hostname = ServerHostname();
int port = ServerPort();
snprintf(url, sizeof(url), "http://%s:%d%s", hostname, port, uri);
g_DownloadManager.AsyncPostWithCallback(url, data, mimeType, http::ProgressBarMode::NONE, [=](http::Request &req) {
serverWorking = !req.Failed();
});
return true;
}
std::string StripTrailingNull(const std::string &str)
@ -514,12 +498,8 @@ namespace Reporting
}
}
int Process(int pos)
{
SetCurrentThreadName("Report");
AndroidJNIThreadContext jniContext; // destructor detaches
// Not the thread func, but called from it.
int Process(int pos) {
Payload &payload = payloadBuffer[pos];
Buffer output;
@ -671,7 +651,7 @@ namespace Reporting
return -1;
}
int ProcessPending() {
int SendPendingReportsThread() {
SetCurrentThreadName("Report");
std::unique_lock<std::mutex> guard(pendingMessageLock);
@ -714,7 +694,7 @@ namespace Reporting
pendingMessageCond.notify_one();
if (!messageThread.joinable()) {
messageThread = std::thread(ProcessPending);
messageThread = std::thread(SendPendingReportsThread);
}
}