Jan 2, 2013 · Dec 27, 2012 · Dec 27, 2012 · Dec 29, 2012 · Dec 29, 2012 · Dec 29, 2012
diff --git a/CMakeLists.txt b/CMakeLists.txt

 if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
  INCLUDE(CheckCXXCompilerFlag)
  CHECK_CXX_COMPILER_FLAG(-std=c++0x HAVE_STD0X)
  CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STD11)
  if (HAVE_STD11)
    set(CMAKE_CXX_FLAGS -std=c++11)
  elseif (HAVE_STD0X)
    set(CMAKE_CXX_FLAGS -std=c++0x)
  else()
    message(FATAL_ERROR "No advanced standard C++ support (-std=c++0x and -std=c++11 not defined).")
    message(FATAL_ERROR "No advanced standard C++ support (-std=c++11 not defined).")
  endif()
 elseif(${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
  INCLUDE(CheckCXXCompilerFlag)
    if(CPP-NETLIB_BUILD_TESTS)
      enable_testing()
    endif()
    add_subdirectory(libs/network/src)
 #add_subdirectory(libs/network/src)
    if(CPP-NETLIB_BUILD_TESTS)
      enable_testing()
      add_subdirectory(libs/network/test)
 #add_subdirectory(libs/network/test)
      if (NOT MSVC)
        #add_subdirectory(libs/mime/test)
      endif(NOT MSVC)
 add_subdirectory(uri)
 add_subdirectory(message)
 add_subdirectory(logging)
 add_subdirectory(concurrency)
 add_subdirectory(http)
 add_subdirectory(mime)
diff --git a/concurrency/CMakeLists.txt b/concurrency/CMakeLists.txt
 # Copyright (c) Glyn Matthews 2012.
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt)

 add_subdirectory(src)

 if(CPP-NETLIB_BUILD_TESTS)
  enable_testing()
  add_subdirectory(test)
 endif(CPP-NETLIB_BUILD_TESTS)
diff --git a/concurrency/src/CMakeLists.txt b/concurrency/src/CMakeLists.txt
 # Copyright (c) Glyn Matthews 2012.
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt)

 include_directories(${CPP-NETLIB_SOURCE_DIR}/concurrency/src)

 if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
  set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11")
 elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
  CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STD11)
  set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11 -stdlib=libc++")
  set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11 -stdlib=libc++")
 endif()

 set(CPP-NETLIB_CONCURRENCY_SRCS thread_pool.cpp)
 add_library(cppnetlib-concurrency ${CPP-NETLIB_CONCURRENCY_SRCS})
 foreach (src_file ${CPP-NETLIB_CONCURRENCY_SRCS})
 if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
    set_source_files_properties(${src_file}
        PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
 elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
    set_source_files_properties(${src_file}
        PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
 endif()
 endforeach(src_file)
diff --git a/include/network/utils/thread_pool.hpp → ...y/src/network/concurrency/thread_pool.hpp b/include/network/utils/thread_pool.hpp → ...y/src/network/concurrency/thread_pool.hpp
 // Copyright 2010 Dean Michael Berris.
 // Copyright 2012 Google, Inc.
 // Copyright (c) Glyn Matthews 2012.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)

 #ifndefNETWORK_UTILS_THREAD_POOL_HPP_20101020
 #defineNETWORK_UTILS_THREAD_POOL_HPP_20101020
 #ifndefNETWORK_CONCURRENCY_THREAD_POOL_HPP_20101020
 #defineNETWORK_CONCURRENCY_THREAD_POOL_HPP_20101020

 #include <cstddef>
 #include <thread>
 #include <vector>
 #include <boost/asio/io_service.hpp>

 namespace network { namespaceutils {
 namespace network { namespaceconcurrency {

  typedef std::shared_ptr<boost::asio::io_service> io_service_ptr;
  typedef std::shared_ptr<std::vector<std::thread>> worker_threads_ptr;
    l.swap(r);
  }

 }  // namespaceutils
 }  // namespaceconcurrency
 }  // namespace network

 #endif /*NETWORK_UTILS_THREAD_POOL_HPP_20101020 */
 #endif /*NETWORK_CONCURRENCY_THREAD_POOL_HPP_20101020 */
diff --git a/include/network/utils/thread_pool.ipp → ...y/src/network/concurrency/thread_pool.ipp b/include/network/utils/thread_pool.ipp → ...y/src/network/concurrency/thread_pool.ipp
 // Copyright 2011 Dean Michael Berris <dberris@google.com>.
 // Copyright 2011 Google, Inc.
 // Copyright (c) Glyn Matthews 2012.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)

 #ifndefNETWORK_UTILS_THREAD_POOL_IPP_20111021
 #defineNETWORK_UTILS_THREAD_POOL_IPP_20111021
 #ifndefNETWORK_CONCURRENCY_THREAD_POOL_IPP_20111021
 #defineNETWORK_CONCURRENCY_THREAD_POOL_IPP_20111021

 #include <vector>
 #include <thread>
 #include <network/utils/thread_pool.hpp>
 #include <network/concurrency/thread_pool.hpp>
 #include <boost/scope_exit.hpp>

 namespace network { namespaceutils {
 namespace network { namespaceconcurrency {

  struct thread_pool_pimpl {
    thread_pool_pimpl(std::size_t threads = 1,
    delete pimpl;
  }

 }  // namespaceutils
 }  // namespaceconcurrency
 }  // namespace network

 #endif /*NETWORK_UTILS_THREAD_POOL_IPP_20111021 */
 #endif /*NETWORK_CONCURRENCY_THREAD_POOL_IPP_20111021 */
diff --git a/concurrency/src/network/utils/thread_pool.hpp b/concurrency/src/network/utils/thread_pool.hpp
 // Copyright (c) Glyn Matthews 2012.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)


 #ifndef __NETWORK_UTILS_THREAD_POOL_INC__
 #define __NETWORK_UTILS_THREAD_POOL_INC__

 #include <network/concurrency/thread_pool.hpp>

 namespace network {
 namespace utils {
  typedef ::network::concurrency::thread_pool thread_pool;
 } // namespace utils
 } // namespace network


 #endif // __NETWORK_UTILS_THREAD_POOL_INC__
diff --git a/libs/network/src/utils/thread_pool.cpp → concurrency/src/thread_pool.cpp b/libs/network/src/utils/thread_pool.cpp → concurrency/src/thread_pool.cpp
 // Copyright 2011 Dean Michael Berris <dberris@google.com>.
 // Copyright 2011 Google, Inc.
 // Copyright (c) Glyn Matthews 2012.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)

 #include <network/utils/thread_pool.ipp>
 #include <network/concurrency/thread_pool.ipp>
diff --git a/concurrency/test/CMakeLists.txt b/concurrency/test/CMakeLists.txt
 # Copyright (c) Glyn Matthews 2012.
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt)

 include_directories(${CPP-NETLIB_SOURCE_DIR}/concurrency/src)

 if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
  set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11")
 elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
  CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STD11)
  set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11 -stdlib=libc++")
  set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11 -stdlib=libc++")
 endif()

 set_source_files_properties(thread_pool_test.cpp
  PROPERTIES COMPILE_FLAGS "-Wall")
 add_executable(cpp-netlib-thread_pool_test thread_pool_test.cpp)
 target_link_libraries(cpp-netlib-thread_pool_test
  cppnetlib-concurrency
  ${Boost_LIBRARIES}
  ${CMAKE_THREAD_LIBS_INIT})
 set_target_properties(cpp-netlib-thread_pool_test
  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/tests)
 add_test(cpp-netlib-thread_pool_test ${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-thread_pool_test)
diff --git a/libs/network/test/utils_thread_pool.cpp → concurrency/test/thread_pool_test.cpp b/libs/network/test/utils_thread_pool.cpp → concurrency/test/thread_pool_test.cpp

 // Copyright 2010 Dean Michael Berris.
 // Copyright 2012 Google, Inc.
 // Copyright (c) Glyn Matthews 2012.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)

 #ifdef BUILD_SHARED_LIBS
 # define BOOST_TEST_DYN_LINK
 #endif
 #define BOOST_TEST_MODULEutilsthread pool test
 #define BOOST_TEST_MODULE thread pool test
 #include <boost/config/warning_disable.hpp>
 #include <boost/test/unit_test.hpp>
 #include <network/utils/thread_pool.hpp>
 #include <network/concurrency/thread_pool.hpp>
 #include <boost/bind.hpp>

 usingnamespacenetwork;
 using network::concurrency::thread_pool;

 // This test specifies the requirements for a thread pool interface. At the
 // very least any thread pool implementation should be able to pass the simple
 //

 BOOST_AUTO_TEST_CASE( default_constructor ) {
  utils::thread_pool pool;
 BOOST_CHECK_EQUAL(pool.thread_count(), std::size_t(1));
  thread_pool pool;
  BOOST_CHECK_EQUAL(pool.thread_count(), std::size_t(1));
 }

 struct foo {
 foo() : val_(0) {}
 void bar(int val) {
 val_ += val;
 }
 int const val() const {
 return val_;
 }
  foo() : val_(0) {}
  void bar(int val) {
    val_ += val;
  }
  int const val() const {
    return val_;
  }
 protected:
 int val_;
  int val_;
 };

 BOOST_AUTO_TEST_CASE( post_work ) {
 foo instance;
 {
    utils::thread_pool pool;
 BOOST_CHECK_NO_THROW(pool.post(boost::bind(&foo::bar, &instance, 1)));
 BOOST_CHECK_NO_THROW(pool.post(boost::bind(&foo::bar, &instance, 2)));
 // require that pool is destroyed here, RAII baby
 }
 BOOST_CHECK_EQUAL(instance.val(), 3);
  foo instance;
  {
    thread_pool pool;
    BOOST_CHECK_NO_THROW(pool.post(boost::bind(&foo::bar, &instance, 1)));
    BOOST_CHECK_NO_THROW(pool.post(boost::bind(&foo::bar, &instance, 2)));
    // require that pool is destroyed here, RAII baby
  }
  BOOST_CHECK_EQUAL(instance.val(), 3);
 }
diff --git a/http/CMakeLists.txt b/http/CMakeLists.txt
 # Copyright (c) Glyn Matthews 2012.
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt)

 add_subdirectory(src)

 if(CPP-NETLIB_BUILD_TESTS)
  enable_testing()
  add_subdirectory(test)
 endif(CPP-NETLIB_BUILD_TESTS)
diff --git a/libs/network/src/CMakeLists.txt → http/src/CMakeLists.txt b/libs/network/src/CMakeLists.txt → http/src/CMakeLists.txt
 endif()
 endforeach(src_file)

 set(CPP-NETLIB_UTILS_THREAD_POOL_SRCS utils/thread_pool.cpp)
 add_library(cppnetlib-utils-thread_pool ${CPP-NETLIB_UTILS_THREAD_POOL_SRCS})
 foreach (src_file ${CPP-NETLIB_UTILS_THREAD_POOL_SRCS})
 if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
    set_source_files_properties(${src_file}
        PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
 elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
    set_source_files_properties(${src_file}
        PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
 endif()
 endforeach(src_file)

 set(CPP-NETLIB_CONSTANTS_SRCS constants.cpp)
 add_library(cppnetlib-constants ${CPP-NETLIB_CONSTANTS_SRCS})
 foreach (src_file ${CPP-NETLIB_CONSTANTS_SRCS})
diff --git a/libs/network/src/client.cpp → http/src/client.cpp b/libs/network/src/client.cpp → http/src/client.cpp
diff --git a/libs/network/src/constants.cpp → http/src/constants.cpp b/libs/network/src/constants.cpp → http/src/constants.cpp
diff --git a/libs/network/src/http/client.cpp → http/src/http/client.cpp b/libs/network/src/http/client.cpp → http/src/http/client.cpp
diff --git a/...etwork/src/http/client_async_resolver.cpp → http/src/http/client_async_resolver.cpp b/...etwork/src/http/client_async_resolver.cpp → http/src/http/client_async_resolver.cpp
diff --git a/.../src/http/client_connection_delegates.cpp → .../src/http/client_connection_delegates.cpp b/.../src/http/client_connection_delegates.cpp → .../src/http/client_connection_delegates.cpp
diff --git a/...rk/src/http/client_connection_factory.cpp → http/src/http/client_connection_factory.cpp b/...rk/src/http/client_connection_factory.cpp → http/src/http/client_connection_factory.cpp
diff --git a/...ork/src/http/client_connection_normal.cpp → http/src/http/client_connection_normal.cpp b/...ork/src/http/client_connection_normal.cpp → http/src/http/client_connection_normal.cpp
diff --git a/libs/network/src/http/client_connections.cpp → http/src/http/client_connections.cpp b/libs/network/src/http/client_connections.cpp → http/src/http/client_connections.cpp
diff --git a/...ork/src/http/client_resolver_delegate.cpp → http/src/http/client_resolver_delegate.cpp b/...ork/src/http/client_resolver_delegate.cpp → http/src/http/client_resolver_delegate.cpp
diff --git a/...http/client_resolver_delegate_factory.cpp → ...http/client_resolver_delegate_factory.cpp b/...http/client_resolver_delegate_factory.cpp → ...http/client_resolver_delegate_factory.cpp
diff --git a/.../src/http/connection_delegate_factory.cpp → .../src/http/connection_delegate_factory.cpp b/.../src/http/connection_delegate_factory.cpp → .../src/http/connection_delegate_factory.cpp
diff --git a/libs/network/src/http/message/wrappers.cpp → http/src/http/message/wrappers.cpp b/libs/network/src/http/message/wrappers.cpp → http/src/http/message/wrappers.cpp
diff --git a/libs/network/src/http/request.cpp → http/src/http/request.cpp b/libs/network/src/http/request.cpp → http/src/http/request.cpp
diff --git a/libs/network/src/http/response.cpp → http/src/http/response.cpp b/libs/network/src/http/response.cpp → http/src/http/response.cpp
diff --git a/libs/network/src/http/server_async_impl.cpp → http/src/http/server_async_impl.cpp b/libs/network/src/http/server_async_impl.cpp → http/src/http/server_async_impl.cpp
diff --git a/libs/network/src/http/server_options.cpp → http/src/http/server_options.cpp b/libs/network/src/http/server_options.cpp → http/src/http/server_options.cpp
diff --git a/...src/http/server_socket_options_setter.cpp → ...src/http/server_socket_options_setter.cpp b/...src/http/server_socket_options_setter.cpp → ...src/http/server_socket_options_setter.cpp
diff --git a/libs/network/src/http/server_sync_impl.cpp → http/src/http/server_sync_impl.cpp b/libs/network/src/http/server_sync_impl.cpp → http/src/http/server_sync_impl.cpp
diff --git a/...rk/src/http/simple_connection_factory.cpp → http/src/http/simple_connection_factory.cpp b/...rk/src/http/simple_connection_factory.cpp → http/src/http/simple_connection_factory.cpp
diff --git a/...rk/src/http/simple_connection_manager.cpp → http/src/http/simple_connection_manager.cpp b/...rk/src/http/simple_connection_manager.cpp → http/src/http/simple_connection_manager.cpp
diff --git a/http/src/network/constants.hpp b/http/src/network/constants.hpp
 #ifndef NETWORK_CONSTANTS_HPP_20100808
 #define NETWORK_CONSTANTS_HPP_20100808

 // Copyright 2010 (C) Dean Michael Berris
 // Copyright 2012 Google, Inc.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)

 namespace network {

 struct constants {
  static char const * crlf();
  static char const * dot();
  static char dot_char();
  static char const * http_slash();
  static char const * space();
  static char space_char();
  static char const * slash();
  static char slash_char();
  static char const * host();
  static char const * colon();
  static char colon_char();
  static char const * accept();
  static char const * default_accept_mime();
  static char const * accept_encoding();
  static char const * default_accept_encoding();
  static char const * user_agent();
  static char const * default_user_agent();
  static char const * cpp_netlib_slash();
  static char question_mark_char();
  static char hash_char();
  static char const * connection();
  static char const * close();
  static char const * https();
 };

 } // namespace network

 #endif // NETWORK_CONSTANTS_HPP_20100808
Original file line number	Diff line number	Diff line change
Expand Up		@@ -43,14 +43,11 @@ endif()

		if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
		INCLUDE(CheckCXXCompilerFlag)
		CHECK_CXX_COMPILER_FLAG(-std=c++0x HAVE_STD0X)
		CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STD11)
		if (HAVE_STD11)
		set(CMAKE_CXX_FLAGS -std=c++11)
		elseif (HAVE_STD0X)
		set(CMAKE_CXX_FLAGS -std=c++0x)
		else()
		message(FATAL_ERROR "No advanced standard C++ support (-std=c++0x and -std=c++11 not defined).")
		message(FATAL_ERROR "No advanced standard C++ support (-std=c++11 not defined).")
		endif()
		elseif(${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
		INCLUDE(CheckCXXCompilerFlag)
Expand DownExpand Up		@@ -81,10 +78,10 @@ if (Boost_FOUND)
		if(CPP-NETLIB_BUILD_TESTS)
		enable_testing()
		endif()
		add_subdirectory(libs/network/src)
		#add_subdirectory(libs/network/src)
		if(CPP-NETLIB_BUILD_TESTS)
		enable_testing()
		add_subdirectory(libs/network/test)
		#add_subdirectory(libs/network/test)
		if (NOT MSVC)
		#add_subdirectory(libs/mime/test)
		endif(NOT MSVC)
Expand DownExpand Up		@@ -113,3 +110,6 @@ message(STATUS " CPP-NETLIB_DISABLE_LOGGING: ${CPP-NETLIB_DISABLE_LOGGING}\t(
		add_subdirectory(uri)
		add_subdirectory(message)
		add_subdirectory(logging)
		add_subdirectory(concurrency)
		add_subdirectory(http)
		add_subdirectory(mime)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,11 @@
		# Copyright (c) Glyn Matthews 2012.
		# Distributed under the Boost Software License, Version 1.0.
		# (See accompanying file LICENSE_1_0.txt or copy at
		# http://www.boost.org/LICENSE_1_0.txt)

		add_subdirectory(src)

		if(CPP-NETLIB_BUILD_TESTS)
		enable_testing()
		add_subdirectory(test)
		endif(CPP-NETLIB_BUILD_TESTS)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,26 @@
		# Copyright (c) Glyn Matthews 2012.
		# Distributed under the Boost Software License, Version 1.0.
		# (See accompanying file LICENSE_1_0.txt or copy at
		# http://www.boost.org/LICENSE_1_0.txt)

		include_directories(${CPP-NETLIB_SOURCE_DIR}/concurrency/src)

		if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
		set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11")
		elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
		CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STD11)
		set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11 -stdlib=libc++")
		set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11 -stdlib=libc++")
		endif()

		set(CPP-NETLIB_CONCURRENCY_SRCS thread_pool.cpp)
		add_library(cppnetlib-concurrency ${CPP-NETLIB_CONCURRENCY_SRCS})
		foreach (src_file ${CPP-NETLIB_CONCURRENCY_SRCS})
		if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
		set_source_files_properties(${src_file}
		PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
		elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
		set_source_files_properties(${src_file}
		PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
		endif()
		endforeach(src_file)
Original file line number	Diff line number	Diff line change
		@@ -1,11 +1,12 @@
		// Copyright 2010 Dean Michael Berris.
		// Copyright 2012 Google, Inc.
		// Copyright (c) Glyn Matthews 2012.
		// Distributed under the Boost Software License, Version 1.0.
		// (See accompanying file LICENSE_1_0.txt or copy at
		// http://www.boost.org/LICENSE_1_0.txt)

		#ifndefNETWORK_UTILS_THREAD_POOL_HPP_20101020
		#defineNETWORK_UTILS_THREAD_POOL_HPP_20101020
		#ifndefNETWORK_CONCURRENCY_THREAD_POOL_HPP_20101020
		#defineNETWORK_CONCURRENCY_THREAD_POOL_HPP_20101020

		#include <cstddef>
		#include <thread>
Expand All		@@ -14,7 +15,7 @@
		#include <vector>
		#include <boost/asio/io_service.hpp>

		namespace network { namespaceutils {
		namespace network { namespaceconcurrency {

		typedef std::shared_ptr<boost::asio::io_service> io_service_ptr;
		typedef std::shared_ptr<std::vector<std::thread>> worker_threads_ptr;
Expand DownExpand Up		@@ -46,7 +47,7 @@ namespace network { namespace utils {
		l.swap(r);
		}

		} // namespaceutils
		} // namespaceconcurrency
		} // namespace network

		#endif /NETWORK_UTILS_THREAD_POOL_HPP_20101020 /
		#endif /NETWORK_CONCURRENCY_THREAD_POOL_HPP_20101020 /
Original file line number	Diff line number	Diff line change
		@@ -1,18 +1,19 @@
		// Copyright 2011 Dean Michael Berris <dberris@google.com>.
		// Copyright 2011 Google, Inc.
		// Copyright (c) Glyn Matthews 2012.
		// Distributed under the Boost Software License, Version 1.0.
		// (See accompanying file LICENSE_1_0.txt or copy at
		// http://www.boost.org/LICENSE_1_0.txt)

		#ifndefNETWORK_UTILS_THREAD_POOL_IPP_20111021
		#defineNETWORK_UTILS_THREAD_POOL_IPP_20111021
		#ifndefNETWORK_CONCURRENCY_THREAD_POOL_IPP_20111021
		#defineNETWORK_CONCURRENCY_THREAD_POOL_IPP_20111021

		#include <vector>
		#include <thread>
		#include <network/utils/thread_pool.hpp>
		#include <network/concurrency/thread_pool.hpp>
		#include <boost/scope_exit.hpp>

		namespace network { namespaceutils {
		namespace network { namespaceconcurrency {

		struct thread_pool_pimpl {
		thread_pool_pimpl(std::size_t threads = 1,
Expand DownExpand Up		@@ -109,7 +110,7 @@ namespace network { namespace utils {
		delete pimpl;
		}

		} // namespaceutils
		} // namespaceconcurrency
		} // namespace network

		#endif /NETWORK_UTILS_THREAD_POOL_IPP_20111021 /
		#endif /NETWORK_CONCURRENCY_THREAD_POOL_IPP_20111021 /
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,19 @@
		// Copyright (c) Glyn Matthews 2012.
		// Distributed under the Boost Software License, Version 1.0.
		// (See accompanying file LICENSE_1_0.txt or copy at
		// http://www.boost.org/LICENSE_1_0.txt)


		#ifndef __NETWORK_UTILS_THREAD_POOL_INC__
		#define __NETWORK_UTILS_THREAD_POOL_INC__

		#include <network/concurrency/thread_pool.hpp>

		namespace network {
		namespace utils {
		typedef ::network::concurrency::thread_pool thread_pool;
		} // namespace utils
		} // namespace network


		#endif // __NETWORK_UTILS_THREAD_POOL_INC__
Original file line number	Diff line number	Diff line change
		@@ -1,7 +1,8 @@
		// Copyright 2011 Dean Michael Berris <dberris@google.com>.
		// Copyright 2011 Google, Inc.
		// Copyright (c) Glyn Matthews 2012.
		// Distributed under the Boost Software License, Version 1.0.
		// (See accompanying file LICENSE_1_0.txt or copy at
		// http://www.boost.org/LICENSE_1_0.txt)

		#include <network/utils/thread_pool.ipp>
		#include <network/concurrency/thread_pool.ipp>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,25 @@
		# Copyright (c) Glyn Matthews 2012.
		# Distributed under the Boost Software License, Version 1.0.
		# (See accompanying file LICENSE_1_0.txt or copy at
		# http://www.boost.org/LICENSE_1_0.txt)

		include_directories(${CPP-NETLIB_SOURCE_DIR}/concurrency/src)

		if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
		set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11")
		elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
		CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STD11)
		set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11 -stdlib=libc++")
		set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11 -stdlib=libc++")
		endif()

		set_source_files_properties(thread_pool_test.cpp
		PROPERTIES COMPILE_FLAGS "-Wall")
		add_executable(cpp-netlib-thread_pool_test thread_pool_test.cpp)
		target_link_libraries(cpp-netlib-thread_pool_test
		cppnetlib-concurrency
		${Boost_LIBRARIES}
		${CMAKE_THREAD_LIBS_INIT})
		set_target_properties(cpp-netlib-thread_pool_test
		PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/tests)
		add_test(cpp-netlib-thread_pool_test ${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-thread_pool_test)
Original file line number	Diff line number	Diff line change
		@@ -1,20 +1,21 @@

		// Copyright 2010 Dean Michael Berris.
		// Copyright 2012 Google, Inc.
		// Copyright (c) Glyn Matthews 2012.
		// Distributed under the Boost Software License, Version 1.0.
		// (See accompanying file LICENSE_1_0.txt or copy at
		// http://www.boost.org/LICENSE_1_0.txt)

		#ifdef BUILD_SHARED_LIBS
		# define BOOST_TEST_DYN_LINK
		#endif
		#define BOOST_TEST_MODULEutilsthread pool test
		#define BOOST_TEST_MODULE thread pool test
		#include <boost/config/warning_disable.hpp>
		#include <boost/test/unit_test.hpp>
		#include <network/utils/thread_pool.hpp>
		#include <network/concurrency/thread_pool.hpp>
		#include <boost/bind.hpp>

		usingnamespacenetwork;
		using network::concurrency::thread_pool;

		// This test specifies the requirements for a thread pool interface. At the
		// very least any thread pool implementation should be able to pass the simple
Expand All		@@ -25,29 +26,29 @@ using namespace network;
		//

		BOOST_AUTO_TEST_CASE( default_constructor ) {
		utils::thread_pool pool;
		BOOST_CHECK_EQUAL(pool.thread_count(), std::size_t(1));
		thread_pool pool;
		BOOST_CHECK_EQUAL(pool.thread_count(), std::size_t(1));
		}

		struct foo {
		foo() : val_(0) {}
		void bar(int val) {
		val_ += val;
		}
		int const val() const {
		return val_;
		}
		foo() : val_(0) {}
		void bar(int val) {
		val_ += val;
		}
		int const val() const {
		return val_;
		}
		protected:
		int val_;
		int val_;
		};

		BOOST_AUTO_TEST_CASE( post_work ) {
		foo instance;
		{
		utils::thread_pool pool;
		BOOST_CHECK_NO_THROW(pool.post(boost::bind(&foo::bar, &instance, 1)));
		BOOST_CHECK_NO_THROW(pool.post(boost::bind(&foo::bar, &instance, 2)));
		// require that pool is destroyed here, RAII baby
		}
		BOOST_CHECK_EQUAL(instance.val(), 3);
		foo instance;
		{
		thread_pool pool;
		BOOST_CHECK_NO_THROW(pool.post(boost::bind(&foo::bar, &instance, 1)));
		BOOST_CHECK_NO_THROW(pool.post(boost::bind(&foo::bar, &instance, 2)));
		// require that pool is destroyed here, RAII baby
		}
		BOOST_CHECK_EQUAL(instance.val(), 3);
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -172,18 +172,6 @@ elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
		endif()
		endforeach(src_file)

		set(CPP-NETLIB_UTILS_THREAD_POOL_SRCS utils/thread_pool.cpp)
		add_library(cppnetlib-utils-thread_pool ${CPP-NETLIB_UTILS_THREAD_POOL_SRCS})
		foreach (src_file ${CPP-NETLIB_UTILS_THREAD_POOL_SRCS})
		if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
		set_source_files_properties(${src_file}
		PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
		elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
		set_source_files_properties(${src_file}
		PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
		endif()
		endforeach(src_file)

		set(CPP-NETLIB_CONSTANTS_SRCS constants.cpp)
		add_library(cppnetlib-constants ${CPP-NETLIB_CONSTANTS_SRCS})
		foreach (src_file ${CPP-NETLIB_CONSTANTS_SRCS})
Expand Down