Added a 'main' thread (love.thread)

This commit is contained in:
bart@bartbes.ath.cx
2010-02-14 19:14:07 +01:00
parent 736f7ab1a2
commit 8457d461f8
2 changed files with 30 additions and 7 deletions
+22 -2
View File
@@ -112,11 +112,16 @@ namespace sdl
this->name = new char[len+1]; this->name = new char[len+1];
memset(this->name, 0, len+1); memset(this->name, 0, len+1);
memcpy(this->name, name, len); memcpy(this->name, name, len);
if (code)
{
len = strlen(code); len = strlen(code);
this->code = new char[len+1]; this->code = new char[len+1];
memset(this->code, 0, len+1); memset(this->code, 0, len+1);
memcpy(this->code, code, len); memcpy(this->code, code, len);
} }
else
this->code = 0;
}
ThreadData::~ThreadData() ThreadData::~ThreadData()
{ {
@@ -158,7 +163,7 @@ namespace sdl
} }
Thread::Thread(ThreadModuleRegistrar *reg, std::string name, love::Data *data) Thread::Thread(ThreadModuleRegistrar *reg, std::string name, love::Data *data)
: reg(reg), name(name), handle(0) : reg(reg), name(name), handle(0), isThread(true)
{ {
reg->retain(); reg->retain();
unsigned int len = data->getSize(); unsigned int len = data->getSize();
@@ -170,8 +175,18 @@ namespace sdl
cond = SDL_CreateCond(); cond = SDL_CreateCond();
} }
Thread::Thread(ThreadModuleRegistrar *reg, std::string name)
: reg(reg), name(name), handle(0), data(0), isThread(false)
{
reg->retain();
comm = new ThreadData(name.c_str(), NULL);
mutex = SDL_CreateMutex();
cond = SDL_CreateCond();
}
Thread::~Thread() Thread::~Thread()
{ {
if (data)
delete[] data; delete[] data;
delete comm; delete comm;
if (handle) if (handle)
@@ -184,7 +199,7 @@ namespace sdl
void Thread::start() void Thread::start()
{ {
if (!handle) if (!handle && isThread)
handle = SDL_CreateThread((int (*)(void*)) threadfunc, (void*) comm); handle = SDL_CreateThread((int (*)(void*)) threadfunc, (void*) comm);
} }
@@ -259,6 +274,11 @@ namespace sdl
SDL_CondBroadcast(cond); SDL_CondBroadcast(cond);
} }
ThreadModule::ThreadModule()
{
threads["main"] = new Thread(this, "main");
}
ThreadModule::~ThreadModule() ThreadModule::~ThreadModule()
{ {
for (threadlist_t::iterator i = threads.begin(); i != threads.end(); i++) for (threadlist_t::iterator i = threads.begin(); i != threads.end(); i++)
+3
View File
@@ -104,9 +104,11 @@ namespace sdl
char *data; char *data;
SDL_mutex *mutex; SDL_mutex *mutex;
SDL_cond *cond; SDL_cond *cond;
bool isThread;
public: public:
Thread(ThreadModuleRegistrar *reg, std::string name, love::Data *data); Thread(ThreadModuleRegistrar *reg, std::string name, love::Data *data);
Thread(ThreadModuleRegistrar *reg, std::string name);
~Thread(); ~Thread();
void start(); void start();
void kill(); void kill();
@@ -128,6 +130,7 @@ namespace sdl
threadlist_t threads; threadlist_t threads;
public: public:
ThreadModule();
~ThreadModule(); ~ThreadModule();
Thread *newThread(std::string name, love::Data *data); Thread *newThread(std::string name, love::Data *data);
Thread **getThreads(); Thread **getThreads();