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/jthread/jsemaphore.h | 64 ------------------------------------------------ 1 file changed, 64 deletions(-) delete mode 100644 src/jthread/jsemaphore.h (limited to 'src/jthread/jsemaphore.h') diff --git a/src/jthread/jsemaphore.h b/src/jthread/jsemaphore.h deleted file mode 100644 index 32e9bc2f2..000000000 --- a/src/jthread/jsemaphore.h +++ /dev/null @@ -1,64 +0,0 @@ -/* -Minetest -Copyright (C) 2013 sapier, < sapier AT gmx DOT net > - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU Lesser General Public License as published by -the Free Software Foundation; either version 2.1 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public License along -with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ - -#ifndef JSEMAPHORE_H_ -#define JSEMAPHORE_H_ - -#if defined(WIN32) -#include -#include -#define MAX_SEMAPHORE_COUNT 1024 -#elif defined(__MACH__) && defined(__APPLE__) -#include -#include -#include -#include -#include -#include -#include -#else -#include -#include -#endif - -class JSemaphore { -public: - JSemaphore(); - ~JSemaphore(); - JSemaphore(int initval); - - void Post(); - void Wait(); - bool Wait(unsigned int time_ms); - - int GetValue(); - -private: -#if defined(WIN32) - HANDLE m_hSemaphore; -#elif defined(__MACH__) && defined(__APPLE__) - semaphore_t m_semaphore; - int semcount; -#else - sem_t m_semaphore; -#endif -}; - - -#endif /* JSEMAPHORE_H_ */ -- cgit v1.2.3