Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added a Boost::recursive_mutex variant to the threading support. Also bumped up the default stack size of a worker thread to 256K, and moved the thread priority slightly down as 0x12 is pretty aggressive for a default value.

Browse Source
This commit is contained in:
wrenczes@gmail.com
2011-03-31 10:37:41 +00:00
parent 3c691b6741
commit e7f2ae4e6e
1 changed files with 118 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

142
JGE/include/Threading.h
View File

@@ -19,33 +19,28 @@ namespace boost
/**
** PSP specific variant of a boost mutex & scoped_lock
*/
template <class Mutex>
struct unique_lock
{
unique_lock(Mutex& inMutex) : mMutex(&inMutex)
{
mMutex->lock();
}
~unique_lock()
{
mMutex->unlock();
}
Mutex* mMutex;
};
class mutex
{
public:
struct scoped_lock
{
scoped_lock(mutex& inMutex) : mID(inMutex.mID)
{
int result = sceKernelWaitSema(mID, 1, 0);
if (result < 0)
{
LOG("Semaphore error on lock acquire, mutex id: ");
LOG((char*)mID);
}
}
~scoped_lock()
{
int result = sceKernelSignalSema(mID, 1);
if (result < 0)
{
LOG("Semaphore error on lock release, mutex id: ");
LOG((char*)mID);
}
}
int mID;
};
typedef unique_lock<mutex> scoped_lock;
mutex()
{
@@ -56,10 +51,109 @@ namespace boost
{
sceKernelDeleteSema(mID);
}
void lock()
{
int result = sceKernelWaitSema(mID, 1, 0);
if (result < 0)
{
LOG("Semaphore error on lock acquire, mutex id: ");
LOG((char*)mID);
}
}
void unlock()
{
int result = sceKernelSignalSema(mID, 1);
if (result < 0)
{
LOG("Semaphore error on lock release, mutex id: ");
LOG((char*)mID);
}
}
int mID;
private:
mutex(mutex const&);
mutex& operator=(mutex const&);
};
class recursive_mutex
{
public:
typedef unique_lock<recursive_mutex> scoped_lock;
recursive_mutex() : mRecursionCount(0)
{
mID = sceKernelCreateSema("Unnamed", 0, 1, 1, 0);
}
~recursive_mutex()
{
sceKernelDeleteSema(mID);
}
void lock()
{
int currentThreadID = sceKernelGetThreadId();
if (!try_recursive_lock(currentThreadID))
{
int result = sceKernelWaitSema(mID, 1, 0);
if (result < 0)
{
LOG("Semaphore error on lock acquire, mutex id: ");
LOG((char*)mID);
}
else
{
mThreadID = currentThreadID;
mRecursionCount = 1;
}
}
}
void unlock()
{
if(!--mRecursionCount)
{
mThreadID = 0;
int result = sceKernelSignalSema(mID, 1);
if (result < 0)
{
LOG("Semaphore error on lock release, mutex id: ");
LOG((char*)mID);
}
}
}
int mID;
int mThreadID;
volatile int mRecursionCount;
private:
recursive_mutex(recursive_mutex const&);
recursive_mutex& operator=(recursive_mutex const&);
bool try_recursive_lock(int inThreadID)
{
if (mThreadID == inThreadID)
{
++mRecursionCount;
return true;
}
return false;
}
};
/**
** Emulating boost::thread configuration glue, with some shortcuts
** This detail namespace is a distillation of boost's thread.hpp, thread_data.hpp.
@@ -147,7 +241,7 @@ namespace boost
CallbackData callbackData(mThreadInfo);
LOG("Creating SCE Thread");
mThreadProcID = sceKernelCreateThread( typeid(a1).name(), thread::ThreadProc, 0x12, 0x20000, PSP_THREAD_ATTR_USER, NULL);
mThreadProcID = sceKernelCreateThread( typeid(a1).name(), thread::ThreadProc, 0x15, 0x40000, PSP_THREAD_ATTR_USER, NULL);
if (mThreadProcID > 0)
{
sceKernelStartThread(mThreadProcID, sizeof(CallbackData), &callbackData);