oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-07-27 17:28:41 +00:00
Code Wiki Activity

Fix modstore/favourites hang by adding asynchronous lua job support

Browse source
This commit is contained in:
sapier 2013-11-26 18:15:31 +01:00
parent b08d7558de
commit 2e66aca357
27 changed files with 2271 additions and 559 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/jthread/pthread/jthread.cpp
View file

@ -42,6 +42,12 @@ JThread::~JThread()
Kill();
}
void JThread::Stop() {
runningmutex.Lock();
running = false;
runningmutex.Unlock();
}
int JThread::Start()
{
int status;
@ -65,7 +71,7 @@ int JThread::Start()
}
mutexinit = true;
}
runningmutex.Lock();
if (running)
{
@ -73,27 +79,27 @@ int JThread::Start()
return ERR_JTHREAD_ALREADYRUNNING;
}
runningmutex.Unlock();
pthread_attr_t attr;
pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr,PTHREAD_CREATE_DETACHED);
continuemutex.Lock();
status = pthread_create(&threadid,&attr,TheThread,this);
status = pthread_create(&threadid,&attr,TheThread,this);
pthread_attr_destroy(&attr);
if (status != 0)
{
continuemutex.Unlock();
return ERR_JTHREAD_CANTSTARTTHREAD;
}
/* Wait until 'running' is set */
runningmutex.Lock();
runningmutex.Lock();
while (!running)
{
runningmutex.Unlock();
struct timespec req,rem;
req.tv_sec = 0;
@ -103,9 +109,9 @@ int JThread::Start()
runningmutex.Lock();
}
runningmutex.Unlock();
continuemutex.Unlock();
continuemutex2.Lock();
continuemutex2.Unlock();
return 0;
@ -113,7 +119,7 @@ int JThread::Start()
int JThread::Kill()
{
runningmutex.Lock();
runningmutex.Lock();
if (!running)
{
runningmutex.Unlock();
@ -128,8 +134,8 @@ int JThread::Kill()
bool JThread::IsRunning()
{
bool r;
runningmutex.Lock();
runningmutex.Lock();
r = running;
runningmutex.Unlock();
return r;
@ -138,7 +144,7 @@ bool JThread::IsRunning()
void *JThread::GetReturnValue()
{
void *val;
runningmutex.Lock();
if (running)
val = NULL;
@ -157,17 +163,17 @@ void *JThread::TheThread(void *param)
{
JThread *jthread;
void *ret;
jthread = (JThread *)param;
jthread->continuemutex2.Lock();
jthread->runningmutex.Lock();
jthread->running = true;
jthread->runningmutex.Unlock();
jthread->continuemutex.Lock();
jthread->continuemutex.Unlock();
ret = jthread->Thread();
jthread->runningmutex.Lock();