mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-08-31 17:55:23 +02:00
Henrik RydgårdandClaude Sonnet 5
21b7ce7392
These KernelObject subclasses (and their Native* status structs) were private implementation details of their respective .cpp files. Move them into the matching .h instead, so external code - specifically the upcoming WebSocket kernel-object introspection endpoints - can read a live object's state directly via kernelObjects.Get<T>()/Iterate<T>(), the same way PSPModule/PSPThread already can. Read-only by convention: nothing outside each file should call DoState() or otherwise mutate these; the fields are public here for that file's own pre-existing use, not an invitation to write from elsewhere. To avoid pulling each type's full dependency set (Memory::, BlockAllocator, CoreTiming, HLEKernel::...) into headers many other files include, non-trivial method bodies (DoState, and MsgPipe's buffer/wait-list management) are declared in the header but still defined out-of-line in the .cpp, same as before - only genuinely trivial one-liners went inline. KernelObjectPool also gains IterateAll(), a type-agnostic sibling of the existing Iterate<T>() - walks every live kernel object regardless of type, for a coarse "what's alive right now" overview. No behavior change - this is a pure visibility/declaration-vs-definition move, not new functionality. That lands in a follow-up commit. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01GZq8ZtJmFY7bkX5FVkr3P9
88 lines
3.5 KiB
C++
88 lines
3.5 KiB
C++
// Copyright (c) 2012- PPSSPP Project.
|
|
|
|
// This program is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, version 2.0 or later versions.
|
|
|
|
// This program is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License 2.0 for more details.
|
|
|
|
// A copy of the GPL 2.0 should have been included with the program.
|
|
// If not, see http://www.gnu.org/licenses/
|
|
|
|
// Official git repository and contact information can be found at
|
|
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
|
|
|
|
#pragma once
|
|
|
|
#include <map>
|
|
#include <vector>
|
|
|
|
#include "Core/HLE/sceKernel.h"
|
|
#include "Core/HLE/ErrorCodes.h"
|
|
|
|
class PointerWrap;
|
|
|
|
struct NativeMutex {
|
|
SceSize_le size;
|
|
char name[KERNELOBJECT_MAX_NAME_LENGTH + 1];
|
|
SceUInt_le attr;
|
|
s32_le initialCount;
|
|
s32_le lockLevel;
|
|
SceUID_le lockThread;
|
|
// Not kept up to date.
|
|
s32_le numWaitThreads;
|
|
};
|
|
|
|
// Exposed here (rather than kept private to sceKernelMutex.cpp) so the WebSocket debugger can
|
|
// read a live object's state directly via kernelObjects.Get<PSPMutex>()/Iterate<PSPMutex>() - see
|
|
// HLEKernelObjectSubscriber.cpp. That's a read-only use: nothing outside this file should call
|
|
// DoState() or otherwise mutate a PSPMutex - it's public here for this file's own use as before,
|
|
// not an invitation to write to it from elsewhere.
|
|
struct PSPMutex : public KernelObject {
|
|
const char *GetName() override { return nm.name; }
|
|
const char *GetTypeName() override { return GetStaticTypeName(); }
|
|
static const char *GetStaticTypeName() { return "Mutex"; }
|
|
static u32 GetMissingErrorCode() { return SCE_MUTEX_ERROR_NO_SUCH_MUTEX; }
|
|
static int GetStaticIDType() { return SCE_KERNEL_TMID_Mutex; }
|
|
int GetIDType() const override { return SCE_KERNEL_TMID_Mutex; }
|
|
|
|
void DoState(PointerWrap &p) override;
|
|
|
|
NativeMutex nm;
|
|
std::vector<SceUID> waitingThreads;
|
|
// Key is the callback id it was for, or if no callback, the thread id.
|
|
std::map<SceUID, u64> pausedWaits;
|
|
};
|
|
|
|
int sceKernelCancelMutex(SceUID uid, int count, u32 numWaitThreadsPtr);
|
|
int sceKernelCreateMutex(const char *name, u32 attr, int initialCount, u32 optionsPtr);
|
|
int sceKernelDeleteMutex(SceUID id);
|
|
int sceKernelLockMutex(SceUID id, int count, u32 timeoutPtr);
|
|
int sceKernelLockMutexCB(SceUID id, int count, u32 timeoutPtr);
|
|
int sceKernelTryLockMutex(SceUID id, int count);
|
|
int sceKernelUnlockMutex(SceUID id, int count);
|
|
int sceKernelReferMutexStatus(SceUID id, u32 infoAddr);
|
|
|
|
int sceKernelCreateLwMutex(u32 workareaPtr, const char *name, u32 attr, int initialCount, u32 optionsPtr);
|
|
int sceKernelDeleteLwMutex(u32 workareaPtr);
|
|
int sceKernelTryLockLwMutex(u32 workareaPtr, int count);
|
|
int sceKernelTryLockLwMutex_600(u32 workareaPtr, int count);
|
|
int sceKernelLockLwMutex(u32 workareaPtr, int count, u32 timeoutPtr);
|
|
int sceKernelLockLwMutexCB(u32 workareaPtr, int count, u32 timeoutPtr);
|
|
int sceKernelUnlockLwMutex(u32 workareaPtr, int count);
|
|
int sceKernelReferLwMutexStatusByID(SceUID uid, u32 infoPtr);
|
|
int sceKernelReferLwMutexStatus(u32 workareaPtr, u32 infoPtr);
|
|
|
|
void __KernelMutexTimeout(u64 userdata, int cyclesLate);
|
|
void __KernelLwMutexTimeout(u64 userdata, int cyclesLate);
|
|
void __KernelMutexThreadEnd(SceUID thread);
|
|
|
|
void __KernelMutexInit();
|
|
void __KernelMutexDoState(PointerWrap &p);
|
|
void __KernelMutexShutdown();
|
|
KernelObject *__KernelMutexObject();
|
|
KernelObject *__KernelLwMutexObject();
|