H3cJP/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-11 01:37:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "RetroAchievements: Fix potential deadlock on shutdown."

Browse Source 
This reverts commit 826f04d06c.
This commit is contained in:
LillyJadeKatrin 2025-05-17 08:27:22 -04:00
parent 137e50dc25
commit b6803d00fe
4 changed files with 24 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Source/Core/Core/AchievementManager.cpp
View File

@ -58,14 +58,13 @@ AchievementManager& AchievementManager::GetInstance()
return s_instance;
}
void AchievementManager::Init(void* hwnd, AsyncCallbackHandler async_callback_handler)
void AchievementManager::Init(void* hwnd)
{
LoadDefaultBadges();
if (!m_client && Config::Get(Config::RA_ENABLED))
{
{
std::lock_guard lg{m_lock};
m_async_callback_handler = std::move(async_callback_handler);
m_client = rc_client_create(MemoryVerifier, Request);
}
std::string host_url = Config::Get(Config::RA_HOST_URL);
@ -1270,7 +1269,8 @@ void AchievementManager::Request(const rc_api_request_t* request,
std::string url = request->url;
std::string post_data = request->post_data;
AchievementManager::GetInstance().m_queue.Push(
[url = std::move(url), post_data = std::move(post_data), callback, callback_data] {
[url = std::move(url), post_data = std::move(post_data), callback = std::move(callback),
callback_data = std::move(callback_data)] {
Common::HttpRequest http_request;
Common::HttpRequest::Response http_response;
if (!post_data.empty())
@ -1284,28 +1284,22 @@ void AchievementManager::Request(const rc_api_request_t* request,
Common::HttpRequest::AllowedReturnCodes::All);
}
const auto response_code = http_request.GetLastResponseCode();
rc_api_server_response_t server_response;
if (http_response.has_value() && http_response->size() > 0)
{
server_response.body = reinterpret_cast<const char*>(http_response->data());
server_response.body_length = http_response->size();
server_response.http_status_code = http_request.GetLastResponseCode();
}
else
{
static constexpr char error_message[] = "Failed HTTP request.";
server_response.body = error_message;
server_response.body_length = sizeof(error_message);
server_response.http_status_code = RC_API_SERVER_RESPONSE_RETRYABLE_CLIENT_ERROR;
}
// The callback needs to be invoked inside our async callback handler
// as it may trigger a shutdown which will wait on this very job to complete.
AchievementManager::GetInstance().m_async_callback_handler(
[callback, callback_data, http_response = std::move(http_response), response_code] {
rc_api_server_response_t server_response;
if (http_response.has_value() && http_response->size() > 0)
{
server_response.body = reinterpret_cast<const char*>(http_response->data());
server_response.body_length = http_response->size();
server_response.http_status_code = response_code;
}
else
{
static constexpr char error_message[] = "Failed HTTP request.";
server_response.body = error_message;
server_response.body_length = sizeof(error_message);
server_response.http_status_code = RC_API_SERVER_RESPONSE_RETRYABLE_CLIENT_ERROR;
}
callback(&server_response, callback_data);
});
callback(&server_response, callback_data);
});
}

9
Source/Core/Core/AchievementManager.h
View File

@ -29,7 +29,6 @@
#include "Common/CommonTypes.h"
#include "Common/Config/Config.h"
#include "Common/Event.h"
#include "Common/Functional.h"
#include "Common/HttpRequest.h"
#include "Common/JsonUtil.h"
#include "Common/Lazy.h"
@ -122,12 +121,8 @@ public:
};
using UpdateCallback = std::function<void(const UpdatedItems&)>;
using AsyncCallback = Common::MoveOnlyFunction<void()>;
using AsyncCallbackHandler = Common::MoveOnlyFunction<void(AsyncCallback)>;
static AchievementManager& GetInstance();
void Init(void* hwnd, AsyncCallbackHandler async_callback_handler);
void Init(void* hwnd);
void SetUpdateCallback(UpdateCallback callback);
void Login(const std::string& password);
bool HasAPIToken() const;
@ -313,8 +308,6 @@ private:
Common::AsyncWorkThread m_image_queue;
mutable std::recursive_mutex m_lock;
std::recursive_mutex m_filereader_lock;
AsyncCallbackHandler m_async_callback_handler;
}; // class AchievementManager
#else // USE_RETRO_ACHIEVEMENTS

12
Source/Core/DolphinQt/Achievements/AchievementSettingsWidget.cpp
View File

@ -6,12 +6,13 @@
#include <QLabel>
#include <QLineEdit>
#include <QPushButton>
#include <QString>
#include <QVBoxLayout>
#include "Core/AchievementManager.h"
#include "Core/Config/AchievementSettings.h"
#include "Core/Config/FreeLookSettings.h"
#include "Core/Config/MainSettings.h"
#include "Core/Config/UISettings.h"
#include "Core/Core.h"
#include "Core/Movie.h"
@ -21,7 +22,7 @@
#include "DolphinQt/Config/ControllerInterface/ControllerInterfaceWindow.h"
#include "DolphinQt/Config/ToolTipControls/ToolTipCheckBox.h"
#include "DolphinQt/QtUtils/ModalMessageBox.h"
#include "DolphinQt/QtUtils/QueueOnObject.h"
#include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
#include "DolphinQt/QtUtils/SignalBlocking.h"
#include "DolphinQt/Settings.h"
@ -251,14 +252,9 @@ void AchievementSettingsWidget::ToggleRAIntegration()
auto& instance = AchievementManager::GetInstance();
if (Config::Get(Config::RA_ENABLED))
{
instance.Init(reinterpret_cast<void*>(winId()),
[this](auto func) { QueueOnObject(this, std::move(func)); });
}
instance.Init(reinterpret_cast<void*>(winId()));
else
{
instance.Shutdown();
}
}
void AchievementSettingsWidget::Login()

4
Source/Core/DolphinQt/MainWindow.cpp
View File

@ -274,9 +274,7 @@ MainWindow::MainWindow(Core::System& system, std::unique_ptr<BootParameters> boo
NetPlayInit();
#ifdef USE_RETRO_ACHIEVEMENTS
AchievementManager::GetInstance().Init(reinterpret_cast<void*>(winId()), [this](auto func) {
QueueOnObject(this, std::move(func));
});
AchievementManager::GetInstance().Init(reinterpret_cast<void*>(winId()));
if (AchievementManager::GetInstance().IsHardcoreModeActive())
Settings::Instance().SetDebugModeEnabled(false);
// This needs to trigger on both RA_HARDCORE_ENABLED and RA_ENABLED