mirror of
https://github.com/love2d/love.git
synced 2026-08-20 04:30:09 +02:00
Added a 'main' thread (love.thread)
This commit is contained in:
@@ -112,10 +112,15 @@ 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);
|
||||||
len = strlen(code);
|
if (code)
|
||||||
this->code = new char[len+1];
|
{
|
||||||
memset(this->code, 0, len+1);
|
len = strlen(code);
|
||||||
memcpy(this->code, code, len);
|
this->code = new char[len+1];
|
||||||
|
memset(this->code, 0, len+1);
|
||||||
|
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,9 +175,19 @@ 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()
|
||||||
{
|
{
|
||||||
delete[] data;
|
if (data)
|
||||||
|
delete[] data;
|
||||||
delete comm;
|
delete comm;
|
||||||
if (handle)
|
if (handle)
|
||||||
SDL_KillThread(handle);
|
SDL_KillThread(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++)
|
||||||
|
|||||||
@@ -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();
|
||||||
|
|||||||
Reference in New Issue
Block a user