mirror of
https://github.com/minetest/minetest.git
synced 2024-10-05 01:13:16 +02:00
c93f7f5cea
If a newly spawned thread called getThreadId or getThreadHandle before the spawning thread finished saving the thread handle, then the handle/id would be used uninitialized. This would cause the threading tests to fail since isCurrentThread would return false, and if Minetest is built with C++11 support the std::thread object pointer would be dereferenced while ininitialized, causing a segmentation fault. This fixes the issue by using a mutex to force the spawned thread to wait for the spawning thread to finish initializing the thread object. An alternative way to handle this would be to also set the thread handle/id in the started thread but this wouldn't work for C++11 builds because there's no way to get the partially constructed object.
85 lines
2.0 KiB
C++
85 lines
2.0 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.
|
|
*/
|
|
|
|
#ifndef THREADING_MUTEX_H
|
|
#define THREADING_MUTEX_H
|
|
|
|
#include "threads.h"
|
|
|
|
#if USE_CPP11_MUTEX
|
|
#include <mutex>
|
|
using Mutex = std::mutex;
|
|
using RecursiveMutex = std::recursive_mutex;
|
|
#else
|
|
|
|
#if USE_WIN_MUTEX
|
|
#ifndef _WIN32_WINNT
|
|
#define _WIN32_WINNT 0x0501
|
|
#endif
|
|
#ifndef WIN32_LEAN_AND_MEAN
|
|
#define WIN32_LEAN_AND_MEAN
|
|
#endif
|
|
#include <windows.h>
|
|
#else
|
|
#include <pthread.h>
|
|
#endif
|
|
|
|
#include "util/basic_macros.h"
|
|
|
|
class Mutex
|
|
{
|
|
public:
|
|
Mutex();
|
|
~Mutex();
|
|
void lock();
|
|
void unlock();
|
|
|
|
bool try_lock();
|
|
|
|
protected:
|
|
Mutex(bool recursive);
|
|
void init_mutex(bool recursive);
|
|
private:
|
|
#if USE_WIN_MUTEX
|
|
CRITICAL_SECTION mutex;
|
|
#else
|
|
pthread_mutex_t mutex;
|
|
#endif
|
|
|
|
DISABLE_CLASS_COPY(Mutex);
|
|
};
|
|
|
|
class RecursiveMutex : public Mutex
|
|
{
|
|
public:
|
|
RecursiveMutex();
|
|
|
|
DISABLE_CLASS_COPY(RecursiveMutex);
|
|
};
|
|
|
|
#endif // C++11
|
|
|
|
#endif
|