dahjah/Cemu
1
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2026-04-16 21:31:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use OSMutex

Browse Source
This commit is contained in:
capitalistspz 2026-04-15 01:46:14 +01:00
parent 54d7795211
commit e586389ae9
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Cafe/OS/common/OSUtil.h
View File

@ -242,3 +242,14 @@ MPTR makeCallableExport()
}
void osLib_addVirtualPointer(const char* libraryName, const char* functionName, uint32 vPtr);
class CafeLockGuard
{
public:
explicit CafeLockGuard(coreinit::OSMutex* mutex) : m_mutex(mutex) { coreinit::OSLockMutex(m_mutex); }
~CafeLockGuard() { coreinit::OSUnlockMutex(m_mutex); }
CafeLockGuard(const CafeLockGuard&) = delete;
CafeLockGuard& operator=(const CafeLockGuard&) = delete;
private:
coreinit::OSMutex* m_mutex;
};

16
src/Cafe/OS/libs/camera/camera.cpp
View File

@ -7,6 +7,7 @@
#include "Cafe/HW/Espresso/PPCCallback.h"
#include "camera/CameraManager.h"
#include "Common/CafeString.h"
#include "OS/common/OSUtil.h"
#include "util/helpers/ringbuffer.h"
namespace camera
@ -97,7 +98,6 @@ namespace camera
struct
{
std::recursive_mutex mutex{};
bool initialized = false;
std::atomic_bool isOpen = false;
std::atomic_bool isExiting = false;
@ -106,7 +106,7 @@ namespace camera
RingBuffer<MEMPTR<uint8>, 20> inTargetBuffers{};
RingBuffer<MEMPTR<uint8>, 20> outTargetBuffers{};
} s_instance;
SysAllocator<coreinit::OSMutex> s_cameraMutex;
SysAllocator<CAMDecodeEventParam> s_cameraEventData;
SysAllocator<OSThread_t> s_cameraWorkerThread;
SysAllocator<uint8, 1024 * 64> s_cameraWorkerThreadStack;
@ -169,7 +169,7 @@ namespace camera
sint32 CAMInit(uint32 cameraId, const CAMInitInfo_t* initInfo, betype<CAMStatus>* error)
{
*error = CAM_STATUS_SUCCESS;
std::scoped_lock lock(s_instance.mutex);
CafeLockGuard lock(s_cameraMutex);
if (s_instance.initialized)
{
*error = CAM_STATUS_DEVICE_IN_USE;
@ -212,12 +212,10 @@ namespace camera
{
if (camHandle != CAM_HANDLE)
return CAM_STATUS_INVALID_HANDLE;
{
std::scoped_lock lock(s_instance.mutex);
CafeLockGuard lock(s_cameraMutex);
if (!s_instance.initialized || !s_instance.isOpen)
return CAM_STATUS_UNINITIALIZED;
s_instance.isOpen = false;
}
CameraManager::Close();
return CAM_STATUS_SUCCESS;
}
@ -226,7 +224,7 @@ namespace camera
{
if (camHandle != CAM_HANDLE)
return CAM_STATUS_INVALID_HANDLE;
auto lock = std::scoped_lock(s_instance.mutex);
CafeLockGuard lock(s_cameraMutex);
if (!s_instance.initialized)
return CAM_STATUS_UNINITIALIZED;
if (s_instance.isOpen)
@ -246,7 +244,7 @@ namespace camera
if (!targetSurface || targetSurface->data.IsNull() || targetSurface->size < 1)
return CAM_STATUS_INVALID_ARG;
cemu_assert_debug(targetSurface->size >= CameraManager::CAMERA_NV12_BUFFER_SIZE);
auto lock = std::scoped_lock(s_instance.mutex);
CafeLockGuard lock(s_cameraMutex);
if (!s_instance.initialized)
return CAM_STATUS_UNINITIALIZED;
if (!s_instance.inTargetBuffers.Push(targetSurface->data))
@ -258,7 +256,7 @@ namespace camera
{
if (camHandle != CAM_HANDLE)
return;
std::scoped_lock lock(s_instance.mutex);
CafeLockGuard lock(s_cameraMutex);
if (!s_instance.initialized)
return;
s_instance.isExiting = true;