forked from Mirrorlandia_minetest/minetest
0a16e53b40
The initial problem was that mutex_auto_lock.h tries to use std::unique_lock<std::mutex> despite mutex.h not using C++11's std::mutex on Windows. The problem here is the mismatch between C++11 usage conditions of the two headers. This commit moves the decision logic to threads.h and makes sure mutex.h, mutex_auto_lock.h and event.h all use the same features.
90 lines
2.2 KiB
C++
90 lines
2.2 KiB
C++
/*
|
|
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 "threading/event.h"
|
|
|
|
Event::Event()
|
|
{
|
|
#ifndef USE_CPP11_MUTEX
|
|
# if USE_WIN_MUTEX
|
|
event = CreateEvent(NULL, false, false, NULL);
|
|
# else
|
|
pthread_cond_init(&cv, NULL);
|
|
pthread_mutex_init(&mutex, NULL);
|
|
notified = false;
|
|
# endif
|
|
#endif
|
|
}
|
|
|
|
#ifndef USE_CPP11_MUTEX
|
|
Event::~Event()
|
|
{
|
|
#if USE_WIN_MUTEX
|
|
CloseHandle(event);
|
|
#else
|
|
pthread_cond_destroy(&cv);
|
|
pthread_mutex_destroy(&mutex);
|
|
#endif
|
|
}
|
|
#endif
|
|
|
|
|
|
void Event::wait()
|
|
{
|
|
#if USE_CPP11_MUTEX
|
|
MutexAutoLock lock(mutex);
|
|
while (!notified) {
|
|
cv.wait(lock);
|
|
}
|
|
notified = false;
|
|
#elif USE_WIN_MUTEX
|
|
WaitForSingleObject(event, INFINITE);
|
|
#else
|
|
pthread_mutex_lock(&mutex);
|
|
while (!notified) {
|
|
pthread_cond_wait(&cv, &mutex);
|
|
}
|
|
notified = false;
|
|
pthread_mutex_unlock(&mutex);
|
|
#endif
|
|
}
|
|
|
|
|
|
void Event::signal()
|
|
{
|
|
#if USE_CPP11_MUTEX
|
|
MutexAutoLock lock(mutex);
|
|
notified = true;
|
|
cv.notify_one();
|
|
#elif USE_WIN_MUTEX
|
|
SetEvent(event);
|
|
#else
|
|
pthread_mutex_lock(&mutex);
|
|
notified = true;
|
|
pthread_cond_signal(&cv);
|
|
pthread_mutex_unlock(&mutex);
|
|
#endif
|
|
}
|