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. --- .gitignore | 44 +++++++++----------------------------------- 1 file changed, 9 insertions(+), 35 deletions(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 7b2b030af..77b6a2b00 100644 --- a/.gitignore +++ b/.gitignore @@ -36,45 +36,18 @@ doc/html/ doc/doxygen_* ## Build files -CMakeFiles/* -src/CMakeFiles/* -src/Makefile -src/android_version_githash.h +CMakeFiles +Makefile +!build/android/Makefile +cmake_install.cmake +CMakeCache.txt +CPackConfig.cmake +CPackSourceConfig.cmake src/android_version.h +src/android_version_githash.h src/cmake_config.h src/cmake_config_githash.h -src/cmake_install.cmake -src/script/CMakeFiles/* -src/script/common/CMakeFiles/* -src/script/cpp_api/CMakeFiles/* -src/script/lua_api/CMakeFiles/* -src/util/CMakeFiles/* -src/unittest/CMakeFiles/* -src/jthread/CMakeFiles/* -src/jthread/Makefile -src/jthread/cmake_config.h -src/jthread/cmake_install.cmake -src/jthread/libjthread.a -src/json/libjson.a src/lua/build/ -src/lua/CMakeFiles/ -src/cguittfont/CMakeFiles/ -src/cguittfont/libcguittfont.a -src/cguittfont/cmake_install.cmake -src/cguittfont/Makefile -src/gmp/CMakeFiles/ -src/gmp/libgmp.a -src/json/CMakeFiles/ -src/json/libjsoncpp.a -src/sqlite/CMakeFiles/* -src/sqlite/libsqlite3.a -src/client/CMakeFiles/ -src/network/CMakeFiles/ -CMakeCache.txt -CPackConfig.cmake -CPackSourceConfig.cmake -Makefile -cmake_install.cmake locale/ .directory .kdev4/ @@ -82,6 +55,7 @@ locale/ *.kdev4 *.layout *.o +*.a ## Android build files build/android/assets -- cgit v1.2.3