Clean up threading

  * Rename everything.
    * Strip J prefix.
    * Change UpperCamelCase functions to lowerCamelCase.
  * Remove global (!) semaphore count mutex on OSX.
  * Remove semaphore count getter (unused, unsafe, depended on internal
    API functions on Windows, and used a hack on OSX).
  * Add `Atomic<type>`.
  * Make `Thread` handle thread names.
  * Add support for C++11 multi-threading.
  * Combine pthread and win32 sources.
  * Remove `ThreadStarted` (unused, unneeded).
  * Move some includes from the headers to the sources.
  * Move all of `Event` into its header (allows inlining with no new includes).
  * Make `Event` use `Semaphore` (except on Windows).
  * Move some porting functions into `Thread`.
  * Integrate logging with `Thread`.
  * Add threading test.

1 files changed, 5 insertions, 7 deletions

diff --git a/src/clientiface.h b/src/clientiface.h
index f6c4294e2..9be8bda61 100644
--- a/src/clientiface.h
+++ b/src/clientiface.h
@@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "constants.h"
 #include "serialization.h"             // for SER_FMT_VER_INVALID
-#include "jthread/jmutex.h"
+#include "threading/mutex.h"
 #include "network/networkpacket.h"
 
 #include <list>
@@ -487,10 +487,8 @@ public:
 
 protected:
 	//TODO find way to avoid this functions
-	void Lock()
-		{ m_clients_mutex.Lock(); }
-	void Unlock()
-		{ m_clients_mutex.Unlock(); }
+	void lock() { m_clients_mutex.lock(); }
+	void unlock() { m_clients_mutex.unlock(); }
 
 	std::map<u16, RemoteClient*>& getClientList()
 		{ return m_clients; }
@@ -501,14 +499,14 @@ private:
 
 	// Connection
 	con::Connection* m_con;
-	JMutex m_clients_mutex;
+	Mutex m_clients_mutex;
 	// Connected clients (behind the con mutex)
 	std::map<u16, RemoteClient*> m_clients;
 	std::vector<std::string> m_clients_names; //for announcing masterserver
 
 	// Environment
 	ServerEnvironment *m_env;
-	JMutex m_env_mutex;
+	Mutex m_env_mutex;
 
 	float m_print_info_timer;