refine code after merging of PR #9

inkooboo · May 16, 2017 · 2044ae0 · 2044ae0
1 parent 5d120de
commit 2044ae0
Show file tree

Hide file tree

Showing 13 changed files with 607 additions and 611 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1 @@
-boost*
 build*
-thread_pool-build*
-*.pro.user
-*.user
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,23 +1,22 @@
 cmake_minimum_required(VERSION 3.0)
 
+project(thread-pool-cpp CXX)
+
 list(APPEND CMAKE_MODULE_PATH
        "${CMAKE_CURRENT_SOURCE_DIR}/cmake"
        "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
 
-project(thread-pool-cpp)
-add_definitions(-std=c++14 -Wall -Werror -O3)
-
+add_definitions(-std=c++14 -Wall -Werror)
 
 # Get all include files
-set(THREAD_POOL_CPP_INC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include/")
-include_directories("${THREAD_POOL_CPP_INC_DIR}")
-file(GLOB_RECURSE INSTALL_FILES_LIST "${THREAD_POOL_CPP_INC_DIR}/*")
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 add_subdirectory(tests)
 add_subdirectory(benchmark)
 
 # Install as header-only library
+file(GLOB_RECURSE INSTALL_FILES_LIST "${CMAKE_CURRENT_SOURCE_DIR}/include/*")
 set_source_files_properties(${INSTALL_FILES_LIST} PROPERTIES HEADER_FILE_ONLY 1)
 add_library(HEADER_ONLY_TARGET STATIC ${INSTALL_FILES_LIST})
 set_target_properties(HEADER_ONLY_TARGET PROPERTIES LINKER_LANGUAGE CXX)
-install(DIRECTORY ${THREAD_POOL_CPP_INC_DIR} DESTINATION "include")
+install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/" DESTINATION "include")
diff --git a/benchmark/CMakeLists.txt b/benchmark/CMakeLists.txt
@@ -1,11 +1,7 @@
 #benchmark
 
-include_directories("${THREAD_POOL_CPP_INC_DIR}")
-
-find_package(Boost REQUIRED COMPONENTS system)
-
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${Boost_INCLUDE_DIR})
+
 add_executable(benchmark benchmark.cpp)
-target_link_libraries(benchmark ${Boost_LIBRARIES} pthread)
+target_link_libraries(benchmark pthread)
 
diff --git a/benchmark/benchmark.cpp b/benchmark/benchmark.cpp
@@ -1,8 +1,6 @@
-//#define WITHOUT_ASIO 1
-
 #include <thread_pool.hpp>
 
-#ifndef WITHOUT_ASIO
+#ifdef WITH_ASIO
 #include <asio_thread_pool.hpp>
 #endif
 
@@ -14,8 +12,6 @@
 
 using namespace tp;
 
-using ThreadPoolStd = ThreadPool<>;
-
 static const size_t CONCURRENCY = 16;
 static const size_t REPOST_COUNT = 1000000;
 
@@ -85,20 +81,20 @@ struct Heavy
 
 struct RepostJob
 {
-    // Heavy heavy;
+    //Heavy heavy;
 
-    ThreadPoolStd* thread_pool;
-#ifndef WITHOUT_ASIO
+    ThreadPool* thread_pool;
+#ifdef WITH_ASIO
     AsioThreadPool* asio_thread_pool;
 #endif
 
     volatile size_t counter;
     long long int begin_count;
     std::promise<void>* waiter;
 
-    RepostJob(ThreadPoolStd* thread_pool, std::promise<void>* waiter)
+    RepostJob(ThreadPool* thread_pool, std::promise<void>* waiter)
         : thread_pool(thread_pool)
-#ifndef WITHOUT_ASIO
+#ifdef WITH_ASIO
           ,
           asio_thread_pool(0)
 #endif
@@ -110,7 +106,7 @@ struct RepostJob
                           .count();
     }
 
-#ifndef WITHOUT_ASIO
+#ifdef WITH_ASIO
     RepostJob(AsioThreadPool* asio_thread_pool, std::promise<void>* waiter)
         : thread_pool(0), asio_thread_pool(asio_thread_pool), counter(0),
           waiter(waiter)
@@ -123,9 +119,9 @@ struct RepostJob
 
     void operator()()
     {
-        if(counter++ < REPOST_COUNT)
+        if(++counter < REPOST_COUNT)
         {
-#ifndef WITHOUT_ASIO
+#ifdef WITH_ASIO
             if(asio_thread_pool)
             {
                 asio_thread_pool->post(*this);
@@ -159,7 +155,7 @@ int main(int, const char* [])
         std::cout << "***thread pool cpp***" << std::endl;
 
         std::promise<void> waiters[CONCURRENCY];
-        ThreadPoolStd thread_pool;
+        ThreadPool thread_pool;
         for(auto& waiter : waiters)
         {
             thread_pool.post(RepostJob(&thread_pool, &waiter));
@@ -171,7 +167,7 @@ int main(int, const char* [])
         }
     }
 
-#ifndef WITHOUT_ASIO
+#ifdef WITH_ASIO
     {
         std::cout << "***asio thread pool***" << std::endl;
 

diff --git a/cmake/Findthread-pool-cpp.cmake b/cmake/Findthread-pool-cpp.cmake
@@ -83,4 +83,4 @@ if (NOT EXISTS "${THREAD_POOL_CPP_INCLUDE_DIR}" AND DEFINED THREAD_POOL_CPP_CLON
 endif()
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(THREAD_POOL_CPP DEFAULT_MSG THREAD_POOL_CPP_INCLUDE_DIR)
+find_package_handle_standard_args(THREAD_POOL_CPP DEFAULT_MSG THREAD_POOL_CPP_INCLUDE_DIR)
diff --git a/include/thread_pool.hpp b/include/thread_pool.hpp
@@ -1,3 +1,3 @@
 #pragma once
 
-#include "./thread_pool/thread_pool.hpp"
+#include <thread_pool/thread_pool.hpp>