From 05f4e7360886e36b221ef5c3af4426625a3de686 Mon Sep 17 00:00:00 2001
From: Michael Lutz <michi@icosahedron.de>
Date: Mon, 11 Mar 2019 00:45:39 +0100
Subject: Codechange: Replace custom mutex code with C++11 mutex'es.

A conforming compiler with a valid <mutex>-header is expected.
Most parts of the code assume that locking a mutex will never fail unexpectedly,
which is generally true on all common platforms that don't just pretend to
be C++11. The use of condition variables in driver code is checked.
---
 src/thread/thread_pthread.cpp | 81 -------------------------------------------
 1 file changed, 81 deletions(-)

(limited to 'src/thread/thread_pthread.cpp')

diff --git a/src/thread/thread_pthread.cpp b/src/thread/thread_pthread.cpp
index afb259183..50fefb531 100644
--- a/src/thread/thread_pthread.cpp
+++ b/src/thread/thread_pthread.cpp
@@ -108,84 +108,3 @@ private:
 	if (thread != NULL) *thread = to;
 	return true;
 }
-
-/**
- * POSIX pthread version of ThreadMutex.
- */
-class ThreadMutex_pthread : public ThreadMutex {
-private:
-	pthread_mutex_t mutex;    ///< The actual mutex.
-	pthread_cond_t condition; ///< Data for conditional waiting.
-	pthread_mutexattr_t attr; ///< Attributes set for the mutex.
-	pthread_t owner;          ///< Owning thread of the mutex.
-	uint recursive_count;     ///< Recursive lock count.
-
-public:
-	ThreadMutex_pthread() : owner(0), recursive_count(0)
-	{
-		pthread_mutexattr_init(&this->attr);
-		pthread_mutexattr_settype(&this->attr, PTHREAD_MUTEX_ERRORCHECK);
-		pthread_mutex_init(&this->mutex, &this->attr);
-		pthread_cond_init(&this->condition, NULL);
-	}
-
-	~ThreadMutex_pthread() override
-	{
-		int err = pthread_cond_destroy(&this->condition);
-		assert(err != EBUSY);
-		err = pthread_mutex_destroy(&this->mutex);
-		assert(err != EBUSY);
-	}
-
-	bool IsOwnedByCurrentThread() const
-	{
-		return this->owner == pthread_self();
-	}
-
-	void BeginCritical(bool allow_recursive = false) override
-	{
-		/* pthread mutex is not recursive by itself */
-		if (this->IsOwnedByCurrentThread()) {
-			if (!allow_recursive) NOT_REACHED();
-		} else {
-			int err = pthread_mutex_lock(&this->mutex);
-			assert(err == 0);
-			assert(this->recursive_count == 0);
-			this->owner = pthread_self();
-		}
-		this->recursive_count++;
-	}
-
-	void EndCritical(bool allow_recursive = false) override
-	{
-		assert(this->IsOwnedByCurrentThread());
-		if (!allow_recursive && this->recursive_count != 1) NOT_REACHED();
-		this->recursive_count--;
-		if (this->recursive_count != 0) return;
-		this->owner = 0;
-		int err = pthread_mutex_unlock(&this->mutex);
-		assert(err == 0);
-	}
-
-	void WaitForSignal() override
-	{
-		uint old_recursive_count = this->recursive_count;
-		this->recursive_count = 0;
-		this->owner = 0;
-		int err = pthread_cond_wait(&this->condition, &this->mutex);
-		assert(err == 0);
-		this->owner = pthread_self();
-		this->recursive_count = old_recursive_count;
-	}
-
-	void SendSignal() override
-	{
-		int err = pthread_cond_signal(&this->condition);
-		assert(err == 0);
-	}
-};
-
-/* static */ ThreadMutex *ThreadMutex::New()
-{
-	return new ThreadMutex_pthread();
-}
-- 
cgit v1.2.3-54-g00ecf