preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-14 15:00:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Savedata iothread: Don't alloc the std::thread

Browse Source
This commit is contained in:
Henrik Rydgård committed 2025-04-30 15:53:55 +02:00
1 parent cdc3a19284
commit 2fe004eb90
2 files changed
+46 -29
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Core/Dialog/PSPSaveDialog.cpp
+45 -27
View File
@@ -97,7 +97,9 @@ PSPSaveDialog::PSPSaveDialog(UtilityDialogType type) : PSPDialog(type) {
}
PSPSaveDialog::~PSPSaveDialog() {
JoinIOThread();
if (ioThread.joinable()) {
ioThread.join();
}
}
int PSPSaveDialog::Init(int paramAddr) {
@@ -107,7 +109,11 @@ int PSPSaveDialog::Init(int paramAddr) {
return SCE_ERROR_UTILITY_INVALID_STATUS;
}
JoinIOThread();
if (ioThread.joinable()) {
// Normally shouldn't be the case here.
ioThread.join();
}
ioThreadStatus = SAVEIO_NONE;
requestAddr = paramAddr;
@@ -741,7 +747,9 @@ int PSPSaveDialog::Update(int animSpeed)
break;
case DS_SAVE_SAVING:
if (ioThreadStatus != SAVEIO_PENDING) {
JoinIOThread();
if (ioThread.joinable()) {
ioThread.join();
}
}
StartDraw();
@@ -756,7 +764,9 @@ int PSPSaveDialog::Update(int animSpeed)
EndDraw();
break;
case DS_SAVE_FAILED:
JoinIOThread();
if (ioThread.joinable()) {
ioThread.join();
}
StartDraw();
DisplaySaveIcon(true);
@@ -780,8 +790,8 @@ int PSPSaveDialog::Update(int animSpeed)
EndDraw();
break;
case DS_SAVE_DONE:
if (ioThread) {
JoinIOThread();
if (ioThread.joinable()) {
ioThread.join();
param.SetPspParam(param.GetPspParam());
}
StartDraw();
@@ -846,7 +856,9 @@ int PSPSaveDialog::Update(int animSpeed)
break;
case DS_LOAD_LOADING:
if (ioThreadStatus != SAVEIO_PENDING) {
JoinIOThread();
if (ioThread.joinable()) {
ioThread.join();
}
}
StartDraw();
@@ -861,7 +873,9 @@ int PSPSaveDialog::Update(int animSpeed)
EndDraw();
break;
case DS_LOAD_FAILED:
JoinIOThread();
if (ioThread.joinable()) {
ioThread.join();
}
StartDraw();
DisplaySaveIcon(true);
@@ -884,7 +898,9 @@ int PSPSaveDialog::Update(int animSpeed)
EndDraw();
break;
case DS_LOAD_DONE:
JoinIOThread();
if (ioThread.joinable()) {
ioThread.join();
}
StartDraw();
DisplaySaveIcon(true);
@@ -971,7 +987,9 @@ int PSPSaveDialog::Update(int animSpeed)
break;
case DS_DELETE_DELETING:
if (ioThreadStatus != SAVEIO_PENDING) {
JoinIOThread();
if (ioThread.joinable()) {
ioThread.join();
}
}
StartDraw();
@@ -983,7 +1001,9 @@ int PSPSaveDialog::Update(int animSpeed)
EndDraw();
break;
case DS_DELETE_FAILED:
JoinIOThread();
if (ioThread.joinable()) {
ioThread.join();
}
StartDraw();
DisplayMessage(di->T("DeleteFailed", "Unable to delete data."));
@@ -1001,8 +1021,8 @@ int PSPSaveDialog::Update(int animSpeed)
EndDraw();
break;
case DS_DELETE_DONE:
if (ioThread) {
JoinIOThread();
if (ioThread.joinable()) {
ioThread.join();
param.SetPspParam(param.GetPspParam());
}
StartDraw();
@@ -1055,7 +1075,9 @@ int PSPSaveDialog::Update(int animSpeed)
// ... except in Host IO timing, where we wait as long as needed.
break;
}
JoinIOThread();
if (ioThread.joinable()) {
ioThread.join();
}
ChangeStatus(SCE_UTILITY_STATUS_FINISHED, 0);
break;
}
@@ -1205,14 +1227,6 @@ void PSPSaveDialog::ExecuteNotVisibleIOAction() {
param.ClearSFOCache();
}
void PSPSaveDialog::JoinIOThread() {
if (ioThread) {
ioThread->join();
delete ioThread;
ioThread = 0;
}
}
static void DoExecuteIOAction(PSPSaveDialog *dialog) {
SetCurrentThreadName("SaveIO");
@@ -1221,20 +1235,22 @@ static void DoExecuteIOAction(PSPSaveDialog *dialog) {
}
void PSPSaveDialog::StartIOThread() {
if (ioThread) {
if (ioThread.joinable()) {
WARN_LOG_REPORT(Log::sceUtility, "Starting a save io thread when one already pending, uh oh.");
JoinIOThread();
ioThread.join();
}
ioThreadStatus = SAVEIO_PENDING;
ioThread = new std::thread(&DoExecuteIOAction, this);
ioThread = std::thread(&DoExecuteIOAction, this);
}
int PSPSaveDialog::Shutdown(bool force) {
if (GetStatus() != SCE_UTILITY_STATUS_FINISHED && !force)
return SCE_ERROR_UTILITY_INVALID_STATUS;
JoinIOThread();
if (ioThread.joinable()) {
ioThread.join();
}
ioThreadStatus = SAVEIO_NONE;
PSPDialog::Shutdown(force);
@@ -1248,7 +1264,9 @@ int PSPSaveDialog::Shutdown(bool force) {
}
void PSPSaveDialog::DoState(PointerWrap &p) {
JoinIOThread();
if (ioThread.joinable()) {
ioThread.join();
}
PSPDialog::DoState(p);
auto s = p.Section("PSPSaveDialog", 1, 2);
Core/Dialog/PSPSaveDialog.h
+1 -2
View File
@@ -50,7 +50,6 @@ private:
void DisplayMessage(std::string_view text, bool hasYesNo = false);
std::string GetSelectedSaveDirName() const;
void JoinIOThread();
void StartIOThread();
void ExecuteNotVisibleIOAction();
@@ -102,7 +101,7 @@ private:
SAVEIO_DONE,
};
std::thread *ioThread = nullptr;
std::thread ioThread;
std::mutex paramLock;
volatile SaveIOStatus ioThreadStatus = SAVEIO_NONE;
};