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

Wake up waiting threads on file delete.

Browse source
This commit is contained in:
Unknown W. Brackets 2013-09-07 10:26:26 -07:00
parent cddfd2f3b2
commit 46b52ca552
2 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Core/HLE/KernelWaitHelpers.h
View file

@ -253,4 +253,17 @@ WaitBeginEndCallbackResult WaitEndCallback(SceUID threadID, SceUID prevCallbackI
return WaitEndCallback<KO, waitType>(threadID, prevCallbackId, waitTimer, TryUnlock, ko->waitingThreads, ko->pausedWaits);
}
inline bool VerifyWait(SceUID threadID, WaitType waitType, SceUID uid) {
u32 error;
SceUID waitID = __KernelGetWaitID(threadID, waitType, error);
return waitID == uid && error == 0;
}
template <typename T>
inline void ResumeFromWait(SceUID threadID, WaitType waitType, SceUID uid, T result) {
if (VerifyWait(threadID, waitType, uid)) {
__KernelResumeThreadFromWait(threadID, result);
}
}
};

18
Core/HLE/sceIo.cpp
View file

@ -44,6 +44,7 @@ extern "C" {
#include "Core/HLE/sceKernelMemory.h"
#include "Core/HLE/sceKernelThread.h"
#include "Core/HLE/sceKernelInterrupt.h"
#include "Core/HLE/KernelWaitHelpers.h"
// For headless screenshots.
#include "Core/HLE/sceDisplay.h"
@ -269,6 +270,13 @@ void __IoFreeFd(int fd, u32 &error) {
if (fd < PSP_MIN_FD || fd >= PSP_COUNT_FDS) {
error = ERROR_KERNEL_BAD_FILE_DESCRIPTOR;
} else {
FileNode *f = __IoGetFd(fd, error);
if (f) {
// Wake anyone waiting on the file before closing it.
for (size_t i = 0; i < f->waitingThreads.size(); ++i) {
HLEKernel::ResumeFromWait(f->waitingThreads[i], WAITTYPE_IO, fd, SCE_KERNEL_ERROR_WAIT_DELETE);
}
}
error = kernelObjects.Destroy<FileNode>(fds[fd]);
fds[fd] = 0;
}
@ -307,10 +315,9 @@ void __IoAsyncNotify(u64 userdata, int cyclesLate) {
SceUID threadID = f->waitingThreads.front();
f->waitingThreads.erase(f->waitingThreads.begin());
SceUID waitID = __KernelGetWaitID(threadID, WAITTYPE_IO, error);
u32 address = __KernelGetWaitValue(threadID, error);
if (waitID == fd && error == 0) {
__KernelResumeThreadFromWait(threadID, 0);
if (HLEKernel::VerifyWait(threadID, WAITTYPE_IO, fd)) {
HLEKernel::ResumeFromWait(threadID, WAITTYPE_IO, fd, 0);
if (Memory::IsValidAddress(address)) {
Memory::Write_U64((u64) f->asyncResult, address);
@ -345,10 +352,7 @@ void __IoSyncNotify(u64 userdata, int cyclesLate) {
ERROR_LOG(HLE, "Unable to complete IO operation.");
}
SceUID waitID = __KernelGetWaitID(threadID, WAITTYPE_IO, error);
if (waitID == fd && error == 0) {
__KernelResumeThreadFromWait(threadID, result);
}
HLEKernel::ResumeFromWait(threadID, WAITTYPE_IO, fd, result);
}
static DirectoryFileSystem *memstickSystem = NULL;