From 04e9a9d5410a151d232a577b46791d2edffba527 Mon Sep 17 00:00:00 2001 From: sapier Date: Sun, 1 Dec 2013 01:52:06 +0100 Subject: Cleanup jthread and fix win32 build --- src/jthread/pthread/jevent.cpp | 44 ++++++++++++++++++++++++++++++++++++++ src/jthread/pthread/jmutex.cpp | 23 +++++--------------- src/jthread/pthread/jsemaphore.cpp | 11 +++++----- src/jthread/pthread/jthread.cpp | 21 ------------------ 4 files changed, 55 insertions(+), 44 deletions(-) create mode 100644 src/jthread/pthread/jevent.cpp (limited to 'src/jthread/pthread') diff --git a/src/jthread/pthread/jevent.cpp b/src/jthread/pthread/jevent.cpp new file mode 100644 index 000000000..738e74f83 --- /dev/null +++ b/src/jthread/pthread/jevent.cpp @@ -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 +#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); +} diff --git a/src/jthread/pthread/jmutex.cpp b/src/jthread/pthread/jmutex.cpp index 3dfad5e6c..bcc3853d2 100644 --- a/src/jthread/pthread/jmutex.cpp +++ b/src/jthread/pthread/jmutex.cpp @@ -24,40 +24,27 @@ DEALINGS IN THE SOFTWARE. */ - +#include #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; } diff --git a/src/jthread/pthread/jsemaphore.cpp b/src/jthread/pthread/jsemaphore.cpp index 963ac83cf..31bf39466 100644 --- a/src/jthread/pthread/jsemaphore.cpp +++ b/src/jthread/pthread/jsemaphore.cpp @@ -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 #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() { diff --git a/src/jthread/pthread/jthread.cpp b/src/jthread/pthread/jthread.cpp index c4d9162c8..e7bf17612 100644 --- a/src/jthread/pthread/jthread.cpp +++ b/src/jthread/pthread/jthread.cpp @@ -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) { -- cgit v1.2.3