diff options
Diffstat (limited to 'backends/platform/psp/thread.cpp')
| -rw-r--r-- | backends/platform/psp/thread.cpp | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/backends/platform/psp/thread.cpp b/backends/platform/psp/thread.cpp index 916b1e553b..f9e497a342 100644 --- a/backends/platform/psp/thread.cpp +++ b/backends/platform/psp/thread.cpp @@ -23,12 +23,12 @@ * */ -#include <pspthreadman.h> +#include <pspthreadman.h> #include "backends/platform/psp/thread.h" #include "backends/platform/psp/trace.h" - -// Class PspThreadable -------------------------------------------------- + +// Class PspThreadable -------------------------------------------------- // Inherit this to create C++ threads easily bool PspThreadable::threadCreateAndStart(const char *threadName, int priority, int stackSize, bool useVfpu /*= false*/) { @@ -38,41 +38,41 @@ bool PspThreadable::threadCreateAndStart(const char *threadName, int priority, i PSP_ERROR("thread already created!\n"); return false; } - + _threadId = sceKernelCreateThread(threadName, __threadCallback, priority, stackSize, THREAD_ATTR_USER, 0); // add VFPU support if (_threadId < 0) { PSP_ERROR("failed to create %s thread. Error code %d\n", threadName, _threadId); return false; } - + // We want to pass the pointer to this, but we'll have to take address of this so use a little trick PspThreadable *_this = this; - + if (sceKernelStartThread(_threadId, sizeof(uint32 *), &_this) < 0) { PSP_ERROR("failed to start %s thread id[%d]\n", threadName, _threadId); return false; } - - PSP_DEBUG_PRINT("Started %s thread with id[%x]\n", threadName, _threadId); - + + PSP_DEBUG_PRINT("Started %s thread with id[%x]\n", threadName, _threadId); + return true; } // Callback function to be called by PSP kernel int PspThreadable::__threadCallback(SceSize, void *__this) { DEBUG_ENTER_FUNC(); - + PspThreadable *_this = *(PspThreadable **)__this; // Dereference the copied value which was 'this' - + _this->threadFunction(); // call the virtual function - + return 0; } // PspThread class // Utilities to access general thread functions - + void PspThread::delayMillis(uint32 ms) { sceKernelDelayThread(ms * 1000); } @@ -90,8 +90,8 @@ void PspThread::delayMicros(uint32 us) { PspSemaphore::PspSemaphore(int initialValue, int maxValue/*=255*/) { DEBUG_ENTER_FUNC(); _handle = 0; - _handle = (uint32)sceKernelCreateSema("ScummVM Sema", 0 /* attr */, - initialValue, maxValue, + _handle = (uint32)sceKernelCreateSema("ScummVM Sema", 0 /* attr */, + initialValue, maxValue, 0 /*option*/); if (!_handle) PSP_ERROR("failed to create semaphore.\n"); @@ -108,10 +108,10 @@ int PspSemaphore::numOfWaitingThreads() { DEBUG_ENTER_FUNC(); SceKernelSemaInfo info; info.numWaitThreads = 0; - + if (sceKernelReferSemaStatus((SceUID)_handle, &info) < 0) PSP_ERROR("failed to retrieve semaphore info for handle %d\n", _handle); - + return info.numWaitThreads; } @@ -119,10 +119,10 @@ int PspSemaphore::getValue() { DEBUG_ENTER_FUNC(); SceKernelSemaInfo info; info.currentCount = 0; - + if (sceKernelReferSemaStatus((SceUID)_handle, &info) < 0) PSP_ERROR("failed to retrieve semaphore info for handle %d\n", _handle); - + return info.currentCount; } @@ -130,18 +130,18 @@ bool PspSemaphore::pollForValue(int value) { DEBUG_ENTER_FUNC(); if (sceKernelPollSema((SceUID)_handle, value) < 0) return false; - + return true; } // false: timeout or error bool PspSemaphore::takeWithTimeOut(uint32 timeOut) { DEBUG_ENTER_FUNC(); - + uint32 *pTimeOut = 0; - if (timeOut) + if (timeOut) pTimeOut = &timeOut; - + if (sceKernelWaitSema(_handle, 1, pTimeOut) < 0) // we always wait for 1 return false; return true; @@ -149,9 +149,9 @@ bool PspSemaphore::takeWithTimeOut(uint32 timeOut) { bool PspSemaphore::give(int num /*=1*/) { DEBUG_ENTER_FUNC(); - + if (sceKernelSignalSema((SceUID)_handle, num) < 0) - return false; + return false; return true; } @@ -161,7 +161,7 @@ bool PspMutex::lock() { DEBUG_ENTER_FUNC(); int threadId = sceKernelGetThreadId(); bool ret = true; - + if (_ownerId == threadId) { _recursiveCount++; } else { @@ -176,19 +176,19 @@ bool PspMutex::unlock() { DEBUG_ENTER_FUNC(); int threadId = sceKernelGetThreadId(); bool ret = true; - + if (_ownerId != threadId) { PSP_ERROR("attempt to unlock mutex by thread[%x] as opposed to owner[%x]\n", threadId, _ownerId); return false; } - + if (_recursiveCount) { _recursiveCount--; } else { _ownerId = 0; ret = _semaphore.give(1); - } + } return ret; } @@ -200,7 +200,7 @@ void PspCondition::releaseAll() { if (_waitingThreads > _signaledThreads) { // we have signals to issue int numWaiting = _waitingThreads - _signaledThreads; // threads we haven't signaled _signaledThreads = _waitingThreads; - + _waitSem.give(numWaiting); _mutex.unlock(); for (int i=0; i<numWaiting; i++) // wait for threads to tell us they're awake |