Removed dependency on boost thread, including for examples.

glynos · glynos · commit 8797e4daeef0 · 2016-01-30T16:42:37.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -47,7 +47,7 @@ add_definitions(-DBOOST_TEST_DYN_LINK)
 set(Boost_USE_MULTI_THREADED ON)
 
 find_package(Boost 1.57.0
-  REQUIRED system thread filesystem program_options)
+  REQUIRED system filesystem program_options)
 
 if (CPP-NETLIB_ENABLE_HTTPS)
     find_package( OpenSSL )
diff --git a/libs/network/example/http/fileserver.cpp b/libs/network/example/http/fileserver.cpp
@@ -4,8 +4,8 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #include <memory>
+#include <thread>
 #include <boost/network/include/http/server.hpp>
-#include <boost/thread.hpp>
 #include <sys/mman.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -28,7 +28,7 @@ struct file_cache {
   std::string doc_root_;
   region_map regions;
   meta_map file_headers;
-  boost::shared_mutex cache_mutex;
+  std::mutex cache_mutex;
 
   explicit file_cache(std::string doc_root) : doc_root_(std::move(doc_root)) {}
 
@@ -39,12 +39,12 @@ struct file_cache {
   }
 
   bool has(std::string const &path) {
-    boost::shared_lock<boost::shared_mutex> lock(cache_mutex);
+    std::unique_lock<std::mutex> lock(cache_mutex);
     return regions.find(doc_root_ + path) != regions.end();
   }
 
   bool add(std::string const &path) {
-    boost::upgrade_lock<boost::shared_mutex> lock(cache_mutex);
+    std::unique_lock<std::mutex> lock(cache_mutex);
     std::string real_filename = doc_root_ + path;
     if (regions.find(real_filename) != regions.end()) return true;
 #ifdef O_NOATIME
@@ -60,7 +60,6 @@ struct file_cache {
       return false;
     }
 
-    boost::upgrade_to_unique_lock<boost::shared_mutex> unique_lock(lock);
     regions.insert(std::make_pair(real_filename, std::make_pair(region, size)));
     static server::response_header common_headers[] = {
         {"Connection", "close"}, {"Content-Type", "x-application/octet-stream"},
@@ -73,7 +72,7 @@ struct file_cache {
   }
 
   std::pair<void *, std::size_t> get(std::string const &path) {
-    boost::shared_lock<boost::shared_mutex> lock(cache_mutex);
+    std::unique_lock<std::mutex> lock(cache_mutex);
     region_map::const_iterator region = regions.find(doc_root_ + path);
     if (region != regions.end())
       return region->second;
@@ -83,14 +82,12 @@ struct file_cache {
 
   boost::iterator_range<std::vector<server::response_header>::iterator> meta(
       std::string const &path) {
-    boost::shared_lock<boost::shared_mutex> lock(cache_mutex);
+    std::unique_lock<std::mutex> lock(cache_mutex);
     static std::vector<server::response_header> empty_vector;
     auto headers = file_headers.find(doc_root_ + path);
     if (headers != file_headers.end()) {
-      auto begin = headers->second
-                                                                 .begin(),
-                                                     end =
-                                                         headers->second.end();
+      auto begin = headers->second.begin(),
+           end = headers->second.end();
       return boost::make_iterator_range(begin, end);
     } else
       return boost::make_iterator_range(empty_vector);
diff --git a/libs/network/example/http/hello_world_async_server_with_work_queue.cpp b/libs/network/example/http/hello_world_async_server_with_work_queue.cpp
@@ -167,7 +167,7 @@ int main() {
     auto server(std::make_shared<server_data>(
         server::options(request_handler)
         .address("0.0.0.0")
-        .port("8800")
+        .port("8000")
         .io_service(io_service)
         .reuse_address(true)
         .thread_pool(std::make_shared<boost::network::utils::thread_pool>(
