Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #14867 from unknownbrackets/savedata-volatile

Browse source 
Dialog: Allow termination of access thread at return
This commit is contained in:
Henrik Rydgård 2021-09-16 18:38:28 +02:00 • committed by GitHub
commit e6a2da69c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Core/HLE/sceUtility.cpp
View file

@ -136,11 +136,12 @@ static int oldStatus = -1;
static std::map<int, u32> currentlyLoadedModules;
static int volatileUnlockEvent = -1;
static HLEHelperThread *accessThread = nullptr;
static bool accessThreadFinished = true;
static const char *accessThreadState = "initial";
static void CleanupDialogThreads(bool force = false) {
if (accessThread) {
if (accessThread->Stopped()) {
if (accessThread->Stopped() || accessThreadFinished) {
delete accessThread;
accessThread = nullptr;
accessThreadState = "cleaned up";
@ -219,7 +220,7 @@ void __UtilityInit() {
}
void __UtilityDoState(PointerWrap &p) {
auto s = p.Section("sceUtility", 1, 4);
auto s = p.Section("sceUtility", 1, 5);
if (!s) {
return;
}
@ -262,6 +263,9 @@ void __UtilityDoState(PointerWrap &p) {
hasAccessThread = false;
}
if (s >= 5)
Do(p, accessThreadFinished);
if (!hasAccessThread && accessThread) {
accessThread->Forget();
delete accessThread;
@ -283,6 +287,7 @@ void __UtilityShutdown() {
accessThread = nullptr;
accessThreadState = "shutdown";
}
accessThreadFinished = true;
delete saveDialog;
delete msgDialog;
@ -320,6 +325,7 @@ void UtilityDialogInitialize(UtilityDialogType type, int delayUs, int priority)
CleanupDialogThreads(true);
accessThread = new HLEHelperThread("ScePafJob", insts, (uint32_t)ARRAY_SIZE(insts), priority, 0x200);
accessThread->Start(partDelay, 0);
accessThreadFinished = false;
accessThreadState = "initializing";
}
@ -348,6 +354,7 @@ void UtilityDialogShutdown(UtilityDialogType type, int delayUs, int priority) {
__DisableInterrupts();
accessThread = new HLEHelperThread("ScePafJob", insts, (uint32_t)ARRAY_SIZE(insts), priority, 0x200);
accessThread->Start(partDelay, 0);
accessThreadFinished = false;
accessThreadState = "shutting down";
if (prevInterrupts)
__EnableInterrupts();
@ -367,6 +374,7 @@ static int UtilityWorkUs(int us) {
static int UtilityInitDialog(int type) {
PSPDialog *dialog = CurrentDialog((UtilityDialogType)type);
accessThreadFinished = true;
accessThreadState = "init finished";
if (dialog)
return hleLogSuccessI(SCEUTILITY, dialog->FinishInit());
@ -375,6 +383,7 @@ static int UtilityInitDialog(int type) {
static int UtilityFinishDialog(int type) {
PSPDialog *dialog = CurrentDialog((UtilityDialogType)type);
accessThreadFinished = true;
accessThreadState = "shutdown finished";
if (dialog)
return hleLogSuccessI(SCEUTILITY, dialog->FinishShutdown());
@ -389,6 +398,7 @@ static int sceUtilitySavedataInitStart(u32 paramAddr) {
accessThread->Terminate();
delete accessThread;
accessThread = nullptr;
accessThreadFinished = true;
accessThreadState = "terminated";
// Try to unlock in case other dialog was shutting down.
KernelVolatileMemUnlock(0);