summaryrefslogtreecommitdiff
path: root/src/jthread/pthread/jthread.cpp
diff options
context:
space:
mode:
authorsapier <Sapier at GMX dot net>2013-11-26 18:15:31 +0100
committersapier <Sapier at GMX dot net>2013-11-29 22:09:14 +0100
commit2e66aca35722e7fee786027d545fe371786fc01f (patch)
treef6d3ec721d23680bb493bd66054379b9327a1c7a /src/jthread/pthread/jthread.cpp
parentb08d7558de53325d184b3ddf0476cb84fc08d0ad (diff)
downloadminetest-2e66aca35722e7fee786027d545fe371786fc01f.tar.gz
minetest-2e66aca35722e7fee786027d545fe371786fc01f.tar.bz2
minetest-2e66aca35722e7fee786027d545fe371786fc01f.zip
Fix modstore/favourites hang by adding asynchronous lua job support
Diffstat (limited to 'src/jthread/pthread/jthread.cpp')
-rw-r--r--src/jthread/pthread/jthread.cpp42
1 files changed, 24 insertions, 18 deletions
diff --git a/src/jthread/pthread/jthread.cpp b/src/jthread/pthread/jthread.cpp
index 0ef250825..2980e26b1 100644
--- a/src/jthread/pthread/jthread.cpp
+++ b/src/jthread/pthread/jthread.cpp
@@ -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();