Fix modstore/favourites hang by adding asynchronous lua job support

2 files changed, 72 insertions, 18 deletions

diff --git a/src/jthread/pthread/jsemaphore.cpp b/src/jthread/pthread/jsemaphore.cpp
new file mode 100644
index 000000000..963ac83cf
--- /dev/null
+++ b/src/jthread/pthread/jsemaphore.cpp
@@ -0,0 +1,48 @@
+/*
+Minetest
+Copyright (C) 2013 sapier, < sapier AT gmx DOT net >
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+#include "jthread/jsemaphore.h"
+
+JSemaphore::JSemaphore() {
+	sem_init(&m_semaphore,0,0);
+}
+
+JSemaphore::~JSemaphore() {
+	sem_destroy(&m_semaphore);
+}
+
+JSemaphore::JSemaphore(int initval) {
+	sem_init(&m_semaphore,0,initval);
+}
+
+void JSemaphore::Post() {
+	sem_post(&m_semaphore);
+}
+
+void JSemaphore::Wait() {
+	sem_wait(&m_semaphore);
+}
+
+int JSemaphore::GetValue() {
+
+	int retval = 0;
+	sem_getvalue(&m_semaphore,&retval);
+
+	return retval;
+}
+
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();