Merge pull request cpp-netlib#181 from glynos/restructure_dirs

Restructure dirs

Author: deanberris

CMakeLists.txt

@@ -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)
@@ -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)
@@ -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)

concurrency/CMakeLists.txt

@@ -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)

concurrency/src/CMakeLists.txt

@@ -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)

include/network/utils/thread_pool.hpp renamed to concurrency/src/network/concurrency/thread_pool.hpp

@@ -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)
 
-#ifndef NETWORK_UTILS_THREAD_POOL_HPP_20101020
-#define NETWORK_UTILS_THREAD_POOL_HPP_20101020
+#ifndef NETWORK_CONCURRENCY_THREAD_POOL_HPP_20101020
+#define NETWORK_CONCURRENCY_THREAD_POOL_HPP_20101020
 
 #include <cstddef>
 #include <thread>
@@ -14,7 +15,7 @@
 #include <vector>
 #include <boost/asio/io_service.hpp>
 
-namespace network { namespace utils {
+namespace network { namespace concurrency {
 
   typedef std::shared_ptr<boost::asio::io_service> io_service_ptr;
   typedef std::shared_ptr<std::vector<std::thread>> worker_threads_ptr;
@@ -46,7 +47,7 @@ namespace network { namespace utils {
     l.swap(r);
   }
 
-}  // namespace utils
+}  // namespace concurrency
 }  // namespace network
 
-#endif /* NETWORK_UTILS_THREAD_POOL_HPP_20101020 */
+#endif /* NETWORK_CONCURRENCY_THREAD_POOL_HPP_20101020 */

include/network/utils/thread_pool.ipp renamed to concurrency/src/network/concurrency/thread_pool.ipp

@@ -1,18 +1,19 @@
 // Copyright 2011 Dean Michael Berris <[email protected]>.
 // 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)
 
-#ifndef NETWORK_UTILS_THREAD_POOL_IPP_20111021
-#define NETWORK_UTILS_THREAD_POOL_IPP_20111021
+#ifndef NETWORK_CONCURRENCY_THREAD_POOL_IPP_20111021
+#define NETWORK_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 { namespace utils {
+namespace network { namespace concurrency {
 
   struct thread_pool_pimpl {
     thread_pool_pimpl(std::size_t threads = 1,
@@ -109,7 +110,7 @@ namespace network { namespace utils {
     delete pimpl;
   }
 
-}  // namespace utils
+}  // namespace concurrency
 }  // namespace network
 
-#endif /* NETWORK_UTILS_THREAD_POOL_IPP_20111021 */
+#endif /* NETWORK_CONCURRENCY_THREAD_POOL_IPP_20111021 */

concurrency/src/network/utils/thread_pool.hpp

@@ -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__

libs/network/src/utils/thread_pool.cpp renamed to concurrency/src/thread_pool.cpp

@@ -1,7 +1,8 @@
 // Copyright 2011 Dean Michael Berris <[email protected]>.
 // 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>

concurrency/test/CMakeLists.txt

@@ -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)

libs/network/test/utils_thread_pool.cpp renamed to concurrency/test/thread_pool_test.cpp

@@ -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_MODULE utils thread 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>
 
-using namespace network;
+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
@@ -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);
 }

http/CMakeLists.txt

@@ -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)

libs/network/src/CMakeLists.txt renamed to http/src/CMakeLists.txt

@@ -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})

libs/network/src/client.cpp renamed to http/src/client.cpp

@@ -0,0 +1,40 @@
+#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