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

Cleanup jthread and fix win32 build

Browse source
This commit is contained in:
sapier 2013-12-01 01:52:06 +01:00
parent f3439c40d8
commit 04e9a9d541
29 changed files with 185 additions and 194 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/jthread/CMakeLists.txt
View file

@ -3,11 +3,13 @@ if( UNIX )
${CMAKE_CURRENT_SOURCE_DIR}/pthread/jmutex.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pthread/jthread.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pthread/jsemaphore.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pthread/jevent.cpp
PARENT_SCOPE)
else( UNIX )
set(JTHREAD_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/win32/jmutex.cpp
${CMAKE_CURRENT_SOURCE_DIR}/win32/jthread.cpp
${CMAKE_CURRENT_SOURCE_DIR}/win32/jsemaphore.cpp
${CMAKE_CURRENT_SOURCE_DIR}/win32/jevent.cpp
PARENT_SCOPE)
endif( UNIX )

52
src/jthread/jevent.h Normal file
View file

@ -0,0 +1,52 @@
/*
This file is a part of the JThread package, which contains some object-
oriented thread wrappers for different thread implementations.
Copyright (c) 2000-2006 Jori Liesenborgs (jori.liesenborgs@gmail.com)
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
*/
#ifndef JEVENT_H_
#define JEVENT_H_
#ifdef _WIN32
#include <windows.h>
#else
#include <semaphore.h>
#endif
class Event {
#ifdef _WIN32
HANDLE hEvent;
#else
sem_t sem;
#endif
public:
Event();
~Event();
void wait();
void signal();
};
#endif /* JEVENT_H_ */

53
src/jthread/jmutex.h
View file

@ -53,10 +53,8 @@ class JMutex
public:
JMutex();
~JMutex();
int Init();
int Lock();
int Unlock();
bool IsInitialized() { return initialized; }
private:
#if (defined(WIN32) || defined(_WIN32_WCE))
@ -76,57 +74,6 @@ private:
return false;
}
#endif // WIN32
bool initialized;
};
#ifdef _WIN32
class Event {
HANDLE hEvent;
public:
Event() {
hEvent = CreateEvent(NULL, 0, 0, NULL);
}
~Event() {
CloseHandle(hEvent);
}
void wait() {
WaitForSingleObject(hEvent, INFINITE);
}
void signal() {
SetEvent(hEvent);
}
};
#else
#include <semaphore.h>
class Event {
sem_t sem;
public:
Event() {
sem_init(&sem, 0, 0);
}
~Event() {
sem_destroy(&sem);
}
void wait() {
sem_wait(&sem);
}
void signal() {
sem_post(&sem);
}
};
#endif
#endif // JMUTEX_H

1
src/jthread/jthread.h
View file

@ -74,7 +74,6 @@ private:
JMutex runningmutex;
JMutex continuemutex,continuemutex2;
bool mutexinit;
};
#endif // JTHREAD_H

44
src/jthread/pthread/jevent.cpp Normal file
View file

@ -0,0 +1,44 @@
/*
This file is a part of the JThread package, which contains some object-
oriented thread wrappers for different thread implementations.
Copyright (c) 2000-2006 Jori Liesenborgs (jori.liesenborgs@gmail.com)
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
*/
#include <assert.h>
#include "jthread/jevent.h"
Event::Event() {
assert(sem_init(&sem, 0, 0) == 0);
}
Event::~Event() {
assert(sem_destroy(&sem) == 0);
}
void Event::wait() {
assert(sem_wait(&sem) == 0);
}
void Event::signal() {
assert(sem_post(&sem) == 0);
}

23
src/jthread/pthread/jmutex.cpp
View file

@ -24,40 +24,27 @@
DEALINGS IN THE SOFTWARE.
*/
#include <assert.h>
#include "jthread/jmutex.h"
JMutex::JMutex()
{
pthread_mutex_init(&mutex,NULL);
initialized = true;
assert(pthread_mutex_init(&mutex,NULL) == 0);
}
JMutex::~JMutex()
{
if (initialized)
pthread_mutex_destroy(&mutex);
}
int JMutex::Init()
{
return 0;
assert(pthread_mutex_destroy(&mutex) == 0);
}
int JMutex::Lock()
{
if (!initialized)
return ERR_JMUTEX_NOTINIT;
pthread_mutex_lock(&mutex);
assert(pthread_mutex_lock(&mutex) == 0);
return 0;
}
int JMutex::Unlock()
{
if (!initialized)
return ERR_JMUTEX_NOTINIT;
pthread_mutex_unlock(&mutex);
assert(pthread_mutex_unlock(&mutex) == 0);
return 0;
}

11
src/jthread/pthread/jsemaphore.cpp
View file

@ -16,26 +16,27 @@ 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 <assert.h>
#include "jthread/jsemaphore.h"
JSemaphore::JSemaphore() {
sem_init(&m_semaphore,0,0);
assert(sem_init(&m_semaphore,0,0) == 0);
}
JSemaphore::~JSemaphore() {
sem_destroy(&m_semaphore);
assert(sem_destroy(&m_semaphore) == 0);
}
JSemaphore::JSemaphore(int initval) {
sem_init(&m_semaphore,0,initval);
assert(sem_init(&m_semaphore,0,initval) == 0);
}
void JSemaphore::Post() {
sem_post(&m_semaphore);
assert(sem_post(&m_semaphore) == 0);
}
void JSemaphore::Wait() {
sem_wait(&m_semaphore);
assert(sem_wait(&m_semaphore) == 0);
}
int JSemaphore::GetValue() {

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

@ -33,7 +33,6 @@
JThread::JThread()
{
retval = NULL;
mutexinit = false;
requeststop = false;
running = false;
}
@ -53,26 +52,6 @@ int JThread::Start()
{
int status;
if (!mutexinit)
{
if (!runningmutex.IsInitialized())
{
if (runningmutex.Init() < 0)
return ERR_JTHREAD_CANTINITMUTEX;
}
if (!continuemutex.IsInitialized())
{
if (continuemutex.Init() < 0)
return ERR_JTHREAD_CANTINITMUTEX;
}
if (!continuemutex2.IsInitialized())
{
if (continuemutex2.Init() < 0)
return ERR_JTHREAD_CANTINITMUTEX;
}
mutexinit = true;
}
runningmutex.Lock();
if (running)
{

43
src/jthread/win32/jevent.cpp Normal file
View file

@ -0,0 +1,43 @@
/*
This file is a part of the JThread package, which contains some object-
oriented thread wrappers for different thread implementations.
Copyright (c) 2000-2006 Jori Liesenborgs (jori.liesenborgs@gmail.com)
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
*/
#include "jthread/jevent.h"
Event::Event() {
hEvent = CreateEvent(NULL, 0, 0, NULL);
}
Event::~Event() {
CloseHandle(hEvent);
}
void Event::wait() {
WaitForSingleObject(hEvent, INFINITE);
}
void Event::signal() {
SetEvent(hEvent);
}

20
src/jthread/win32/jmutex.cpp
View file

@ -24,7 +24,7 @@
DEALINGS IN THE SOFTWARE.
*/
#include <assert.h>
#include "jthread/jmutex.h"
JMutex::JMutex()
@ -33,31 +33,21 @@ JMutex::JMutex()
InitializeCriticalSection(&mutex);
#else
mutex = CreateMutex(NULL,FALSE,NULL);
if (mutex == NULL)
return ERR_JMUTEX_CANTCREATEMUTEX;
assert(mutex != NULL);
#endif // JMUTEX_CRITICALSECTION
initialized = true;
}
JMutex::~JMutex()
{
if (initialized)
#ifdef JMUTEX_CRITICALSECTION
DeleteCriticalSection(&mutex);
DeleteCriticalSection(&mutex);
#else
CloseHandle(mutex);
CloseHandle(mutex);
#endif // JMUTEX_CRITICALSECTION
}
int JMutex::Init()
{
return 0;
}
int JMutex::Lock()
{
if (!initialized)
return ERR_JMUTEX_NOTINIT;
#ifdef JMUTEX_CRITICALSECTION
EnterCriticalSection(&mutex);
#else
@ -68,8 +58,6 @@ int JMutex::Lock()
int JMutex::Unlock()
{
if (!initialized)
return ERR_JMUTEX_NOTINIT;
#ifdef JMUTEX_CRITICALSECTION
LeaveCriticalSection(&mutex);
#else

20
src/jthread/win32/jthread.cpp
View file

@ -34,7 +34,6 @@
JThread::JThread()
{
retval = NULL;
mutexinit = false;
requeststop = false;
running = false;
}
@ -52,25 +51,6 @@ void JThread::Stop() {
int JThread::Start()
{
if (!mutexinit)
{
if (!runningmutex.IsInitialized())
{
if (runningmutex.Init() < 0)
return ERR_JTHREAD_CANTINITMUTEX;
}
if (!continuemutex.IsInitialized())
{
if (continuemutex.Init() < 0)
return ERR_JTHREAD_CANTINITMUTEX;
}
if (!continuemutex2.IsInitialized())
{
if (continuemutex2.Init() < 0)
return ERR_JTHREAD_CANTINITMUTEX;
} mutexinit = true;
}
runningmutex.Lock();
if (running)
{