diff --git a/projects/mtg/include/Threading.h b/projects/mtg/include/Threading.h index 35249f63b..6d2056c7a 100644 --- a/projects/mtg/include/Threading.h +++ b/projects/mtg/include/Threading.h @@ -2,18 +2,23 @@ #define THREADING_H #if defined (WIN32) || defined (LINUX) - #include #include - +#include #else +#include +#include + #include "pspthreadman.h" +#include "DebugRoutines.h" #include "JLogger.h" namespace boost { - + /** + ** PSP specific variant of a boost mutex & scoped_lock + */ class mutex { public: @@ -55,8 +60,150 @@ namespace boost int mID; }; + /** + ** Emulating boost::thread configuration glue, with some shortcuts + ** This detail namespace is a distillation of boost's thread.hpp, thread_data.hpp. + */ + namespace detail + { + struct thread_data_base + { + thread_data_base() + { + } + + virtual ~thread_data_base() + { + } + + virtual void run() = 0; + }; + + typedef boost::shared_ptr thread_data_ptr; + + template + class thread_data : public detail::thread_data_base + { + public: + thread_data(F f_) : f(f_) + { + } + + void run() + { + f(); + } + + private: + F f; + + void operator=(thread_data&); + thread_data(thread_data&); + }; + + } //namespace detail + + + /** + ** A simplistic implementation of boost::thread, using pspsdk calls for the thread invocation. + ** + ** The intent of its usage is this form only: + ** mWorkerThread = boost::thread(ThreadProc, this); + ** where ThreadProc is a static member function of the 'this' class,eg: + ** static void FOO::ThreadProc(void* inParam) + ** { + ** FOO* instance = reinterpret_cast(inParam); + ** // now you have class instance data available... + ** } + ** + ** Any other variant of a thread proc with more than one param is unimplemented. + */ + class thread + { + /* + ** Helper class for sceKernelStartThread, which passes args by value, not by reference + ** We use this struct to wrap any pointers that we want to pass to the worker thread. + */ + struct CallbackData + { + CallbackData(detail::thread_data_ptr inThreadInfo) + : mThreadInfo(inThreadInfo) + { + } + + detail::thread_data_ptr mThreadInfo; + }; + + public: + + thread() + { + } + + template + thread(F f, A1 a1) : mThreadInfo(make_thread_info(boost::bind(boost::type(), f, a1))) + { + LOG("Calling bind on threadproc func"); + CallbackData callbackData(mThreadInfo); + + LOG("Creating SCE Thread"); + mThreadProcID = sceKernelCreateThread( typeid(a1).name(), thread::ThreadProc, 0x12, 0x20000, PSP_THREAD_ATTR_USER, NULL); + if (mThreadProcID > 0) + { + sceKernelStartThread(mThreadProcID, sizeof(CallbackData), &callbackData); + } + } + + ~thread() + { + } + + void join() + { + sceKernelTerminateDeleteThread(mThreadProcID); + } + + private: + + static int ThreadProc(SceSize args, void *inParam) + { + LOG("Entering thread::ThreadProc"); + CallbackData* callbackData = reinterpret_cast(inParam); + if (callbackData) + { + callbackData->mThreadInfo->run(); + } + + return 0; + } + + template + static inline detail::thread_data_ptr make_thread_info(F f) + { + return detail::thread_data_ptr(new detail::thread_data(f)); + } + + detail::thread_data_ptr mThreadInfo; + SceUID mThreadProcID; + }; + + namespace posix_time + { + typedef unsigned int milliseconds; + } + + /** + ** boost's platform neutral sleep call. + */ + namespace this_thread + { + inline void sleep(boost::posix_time::milliseconds const& time) + { + sceKernelDelayThread(time * 1000); + } + } } #endif -#endif // THREADING_H \ No newline at end of file +#endif // THREADING_H