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 broken async locking in release build

Browse source
This commit is contained in:
sapier 2013-12-02 22:21:58 +01:00 • committed by Perttu Ahola
parent 6cbd1b8bf7
commit 5004f31575
7 changed files with 102 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -26,15 +26,19 @@
*/
#include "jthread/jthread.h"
#include <assert.h>
#include <sys/time.h>
#include <time.h>
#include <stdlib.h>
#define UNUSED(expr) do { (void)(expr); } while (0)
JThread::JThread()
{
retval = NULL;
requeststop = false;
running = false;
started = false;
}
JThread::~JThread()
@ -48,6 +52,20 @@ void JThread::Stop() {
runningmutex.Unlock();
}
void JThread::Wait() {
void* status;
runningmutex.Lock();
if (started) {
runningmutex.Unlock();
int pthread_join_retval = pthread_join(threadid,&status);
assert(pthread_join_retval == 0);
UNUSED(pthread_join_retval);
runningmutex.Lock();
started = false;
}
runningmutex.Unlock();
}
int JThread::Start()
{
int status;
@ -63,7 +81,7 @@ int JThread::Start()
pthread_attr_t attr;
pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr,PTHREAD_CREATE_DETACHED);
//pthread_attr_setdetachstate(&attr,PTHREAD_CREATE_DETACHED);
continuemutex.Lock();
status = pthread_create(&threadid,&attr,TheThread,this);
@ -89,6 +107,7 @@ int JThread::Start()
runningmutex.Lock();
}
started = true;
runningmutex.Unlock();
continuemutex.Unlock();
@ -100,13 +119,30 @@ int JThread::Start()
int JThread::Kill()
{
void* status;
runningmutex.Lock();
if (!running)
{
if (started) {
runningmutex.Unlock();
int pthread_join_retval = pthread_join(threadid,&status);
assert(pthread_join_retval == 0);
UNUSED(pthread_join_retval);
runningmutex.Lock();
started = false;
}
runningmutex.Unlock();
return ERR_JTHREAD_NOTRUNNING;
}
pthread_cancel(threadid);
if (started) {
runningmutex.Unlock();
int pthread_join_retval = pthread_join(threadid,&status);
assert(pthread_join_retval == 0);
UNUSED(pthread_join_retval);
runningmutex.Lock();
started = false;
}
running = false;
runningmutex.Unlock();
return 0;