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/ban.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/ban.h') diff --git a/src/ban.h b/src/ban.h index 5db7179de..d1a49cb15 100644 --- a/src/ban.h +++ b/src/ban.h @@ -21,9 +21,11 @@ with this program; if not, write to the Free Software Foundation, Inc., #define BAN_HEADER #include "util/string.h" -#include "jthread/jthread.h" -#include "jthread/jmutex.h" +#include "threading/thread.h" +#include "threading/mutex.h" #include "exceptions.h" +#include +#include class BanManager { @@ -40,7 +42,7 @@ public: void remove(const std::string &ip_or_name); bool isModified(); private: - JMutex m_mutex; + Mutex m_mutex; std::string m_banfilepath; StringMap m_ips; bool m_modified; -- cgit v1.2.3