From e4bff8be94c0db4f94e63ad448d0eeb869ccdbbd Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Tue, 7 Apr 2015 06:13:12 -0400 Subject: 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`. * 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. --- src/environment.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/environment.h') diff --git a/src/environment.h b/src/environment.h index c70694316..6ace12671 100644 --- a/src/environment.h +++ b/src/environment.h @@ -39,7 +39,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "util/numeric.h" #include "mapnode.h" #include "mapblock.h" -#include "jthread/jmutex.h" +#include "threading/mutex.h" #include "network/networkprotocol.h" // for AccessDeniedCode class ServerEnvironment; @@ -127,8 +127,8 @@ protected: bool m_cache_enable_shaders; private: - JMutex m_timeofday_lock; - JMutex m_time_lock; + Mutex m_timeofday_lock; + Mutex m_time_lock; }; -- cgit v1.2.3