Page MenuHomePhabricator (Chris)
Files F126673

No OneTemporary
Actions

Authored By
Unknown
Size
6 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/util/thread.cpp b/util/thread.cpp
index 1cefef54..e43be316 100644
--- a/util/thread.cpp
+++ b/util/thread.cpp
@@ -1,105 +1,142 @@
// #include <pthread.h>
#include "thread.h"
namespace Util{
namespace Thread{
+#ifdef USE_SDL
+void initializeLock(Lock * lock){
+ *lock = SDL_CreateMutex();
+}
+
+int acquireLock(Lock * lock){
+ return SDL_LockMutex(*lock);
+}
+
+int releaseLock(Lock * lock){
+ return SDL_UnlockMutex(*lock);
+}
+
+void destroyLock(Lock * lock){
+ SDL_DestroyMutex(*lock);
+}
+
+bool createThread(Id * thread, void * attributes, ThreadFunction function, void * arg){
+ *thread = SDL_CreateThread(function, arg);
+ return *thread != NULL;
+}
+
+void joinThread(Id thread){
+ SDL_WaitThread(thread, NULL);
+}
+
+void cancelThread(Id thread){
+ SDL_KillThread(thread);
+}
+
+#else
void initializeLock(Lock * lock){
pthread_mutex_init(lock, NULL);
}
int acquireLock(Lock * lock){
return pthread_mutex_lock(lock);
}
int releaseLock(Lock * lock){
return pthread_mutex_unlock(lock);
}
bool createThread(Id * thread, void * attributes, ThreadFunction function, void * arg){
return pthread_create(thread, (pthread_attr_t*) attributes, function, arg) == 0;
}
void joinThread(Id thread){
pthread_join(thread, NULL);
}
void cancelThread(Id thread){
/* FIXME: cancel is not implemented for libogc, find another way.
* thread suspend/resume is there, though.
*/
#if !defined(WII)
pthread_cancel(thread);
#endif
}
+
+void destroyLock(Lock * lock){
+ /* nothing */
+}
+
+#endif
}
WaitThread::WaitThread():
done(false){
Thread::initializeLock(&doneLock);
}
-WaitThread::WaitThread(void * (*thread)(void*), void * arg){
+WaitThread::WaitThread(Thread::ThreadFunction thread, void * arg){
Thread::initializeLock(&doneLock);
start(thread, arg);
}
static void * do_thread(void * arg){
WaitThread * thread = (WaitThread *) arg;
thread->doRun();
return NULL;
}
void WaitThread::doRun(){
this->function(this->arg);
Thread::acquireLock(&doneLock);
this->done = true;
Thread::releaseLock(&doneLock);
}
void WaitThread::start(Thread::ThreadFunction thread, void * arg){
done = false;
this->arg = arg;
this->function = thread;
- Thread::createThread(&this->thread, NULL, do_thread, this);
+ Thread::createThread(&this->thread, NULL, (Thread::ThreadFunction) do_thread, this);
}
bool WaitThread::isRunning(){
Thread::acquireLock(&doneLock);
bool what = done;
Thread::releaseLock(&doneLock);
return what;
}
void WaitThread::kill(){
Thread::cancelThread(thread);
Thread::joinThread(thread);
}
WaitThread::~WaitThread(){
/* FIXME: Should we join the thread? */
/* pthread_join(thread); */
}
ThreadBoolean::ThreadBoolean(volatile bool & what, Thread::Lock & lock):
what(what),
lock(lock){
}
bool ThreadBoolean::get(){
Thread::acquireLock(&lock);
bool b = what;
Thread::releaseLock(&lock);
return b;
}
void ThreadBoolean::set(bool value){
Thread::acquireLock(&lock);
what = value;
Thread::releaseLock(&lock);
}
}
diff --git a/util/thread.h b/util/thread.h
index e821ef3e..9067afb0 100644
--- a/util/thread.h
+++ b/util/thread.h
@@ -1,66 +1,78 @@
#ifndef _paintown_thread_h
#define _paintown_thread_h
+#ifdef USE_SDL
+#include <SDL_thread.h>
+#include <SDL_mutex.h>
+#else
#include <pthread.h>
+#endif
namespace Util{
/* Either uses pthreads or SDL_thread */
namespace Thread{
+#ifdef USE_SDL
+ typedef SDL_mutex* Lock;
+ typedef SDL_Thread* Id;
+ typedef int (*ThreadFunction)(void*);
+#else
typedef pthread_mutex_t Lock;
typedef pthread_t Id;
typedef void * (*ThreadFunction)(void*);
+#endif
void initializeLock(Lock * lock);
int acquireLock(Lock * lock);
int releaseLock(Lock * lock);
+ void destroyLock(Lock * lock);
bool createThread(Id * thread, void * attributes, ThreadFunction function, void * arg);
void joinThread(Id thread);
void cancelThread(Id thread);
}
class WaitThread{
public:
/* does not start a new thread yet */
WaitThread();
/* starts a thread */
WaitThread(Thread::ThreadFunction thread, void * arg);
/* starts a thread */
void start(Thread::ThreadFunction thread, void * arg);
bool isRunning();
void kill();
virtual ~WaitThread();
public:
/* actually runs the thread */
void doRun();
protected:
Thread::Lock doneLock;
Thread::Id thread;
volatile bool done;
void * arg;
Thread::ThreadFunction function;
};
/* wraps a boolean with lock/unlock while checking/setting it */
class ThreadBoolean{
public:
ThreadBoolean(volatile bool & what, Thread::Lock & lock);
bool get();
void set(bool value);
protected:
volatile bool & what;
Thread::Lock & lock;
};
}
#endif
diff --git a/util/timer.cpp b/util/timer.cpp
index a258bd08..23adca5d 100644
--- a/util/timer.cpp
+++ b/util/timer.cpp
@@ -1,43 +1,43 @@
#include <time.h>
#include "timer.h"
#include "init.h"
#include "funcs.h"
#include "thread.h"
namespace Util{
void * do_wait(void * timer_){
Timer * timer = (Timer *) timer_;
unsigned int now = Global::second_counter;
/* add 1 because the current time is in between X and X+1 */
while (Global::second_counter - now < timer->wait+1){
Util::rest(50);
bool do_stop = false;
Thread::acquireLock(&timer->lock);
do_stop = timer->stopped;
Thread::releaseLock(&timer->lock);
if (do_stop){
return NULL;
}
}
timer->func(timer->arg);
return NULL;
}
Timer::Timer(unsigned int seconds_to_wait, timeout func, void * arg):
wait(seconds_to_wait),
func(func),
arg(arg),
stopped(false){
Thread::initializeLock(&lock);
- Thread::createThread(&timer, NULL, do_wait, this);
+ Thread::createThread(&timer, NULL, (Util::Thread::ThreadFunction) do_wait, this);
}
void Timer::stop(){
Thread::acquireLock(&lock);
stopped = true;
Thread::releaseLock(&lock);
Thread::joinThread(timer);
}
}

File Metadata

Mime Type
text/x-diff
Expires
Thu, Jun 11, 12:29 PM (3 w, 4 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
69037
Default Alt Text
(6 KB)

Event Timeline