Swap support for request.

deanberris · deanberris · commit 4c411e7a4222 · 2012-03-14T18:14:12.000+11:00
diff --git a/boost/network/protocol/http/request/request.ipp b/boost/network/protocol/http/request/request.ipp
@@ -144,6 +144,7 @@ bool request::equals(request const &other) const {
 
 void request::swap(request & other) {
   std::swap(this->pimpl_, other.pimpl_);
+  request_storage_base::swap(other);
 }
 
 // From message_base...
diff --git a/boost/network/protocol/http/request/request_base.hpp b/boost/network/protocol/http/request/request_base.hpp
@@ -32,6 +32,7 @@ struct request_storage_base {
   virtual void flatten(std::string &destination) const;
   virtual void clear();
   virtual bool equals(request_storage_base const &other) const;
+  virtual void swap(request_storage_base &other);
   virtual ~request_storage_base();
 
  private:
diff --git a/boost/network/protocol/http/request/request_base.ipp b/boost/network/protocol/http/request/request_base.ipp
@@ -25,13 +25,14 @@ struct request_storage_base_pimpl {
   void flatten(std::string &destination) const;
   void clear();
   bool equals(request_storage_base_pimpl const &other) const;
+  void swap(request_storage_base_pimpl &other);
   ~request_storage_base_pimpl();
 
  private:
   size_t chunk_size_;
   typedef std::vector<std::pair<char *, size_t> > chunks_vector;
   chunks_vector chunks_;
-  mutex chunk_mutex;
+  mutable mutex chunk_mutex_;
 
   request_storage_base_pimpl(request_storage_base_pimpl const &other);
 };
@@ -68,6 +69,10 @@ bool request_storage_base::equals(request_storage_base const &other) const {
   return pimpl_->equals(*other.pimpl_);
 }
 
+void request_storage_base::swap(request_storage_base &other) {
+  return other.pimpl_->swap(*pimpl_);
+}
+
 request_storage_base_pimpl::request_storage_base_pimpl(size_t chunk_size)
 : chunk_size_(chunk_size)
 , chunks_()
@@ -78,6 +83,7 @@ request_storage_base_pimpl::request_storage_base_pimpl(size_t chunk_size)
 request_storage_base_pimpl::request_storage_base_pimpl(request_storage_base_pimpl const &other)
 : chunk_size_(other.chunk_size_)
 , chunks_(0) {
+  lock_guard<mutex> scoped_lock(other.chunk_mutex_);
   chunks_.reserve(other.chunks_.size());
   chunks_vector::const_iterator it = other.chunks_.begin();
   for (; it != other.chunks_.end(); ++it) {
@@ -95,6 +101,7 @@ request_storage_base_pimpl * request_storage_base_pimpl::clone() const {
 }
  
 void request_storage_base_pimpl::append(char const *data, size_t size) {
+  lock_guard<mutex> scoped_lock(chunk_mutex_);
   if (chunks_.empty()) {
     chunks_.push_back(std::make_pair(
         new (std::nothrow) char[chunk_size_], 0));
@@ -121,6 +128,7 @@ void request_storage_base_pimpl::append(char const *data, size_t size) {
 }
 
 size_t request_storage_base_pimpl::read(char *destination, size_t offset, size_t size) const {
+  lock_guard<mutex> scoped_lock(chunk_mutex_);
   if (chunks_.empty()) return 0;
   // First we find which chunk we're going to read from using the provided
   // offset and some arithmetic to determine the correct one.
@@ -145,13 +153,15 @@ size_t request_storage_base_pimpl::read(char *destination, size_t offset, size_t
 }
 
 void request_storage_base_pimpl::flatten(std::string &destination) const {
+  lock_guard<mutex> scpoped_lock(chunk_mutex_);
   chunks_vector::const_iterator chunk_iterator = chunks_.begin();
   for (; chunk_iterator != chunks_.end(); ++chunk_iterator) {
     destination.append(chunk_iterator->first, chunk_iterator->second);
   }
 }
 
 void request_storage_base_pimpl::clear() {
+  lock_guard<mutex> scoped_lock(chunk_mutex_);
   chunks_vector::const_iterator chunk_iterator = chunks_.begin();
   for (; chunk_iterator != chunks_.end(); ++chunk_iterator) {
     delete [] chunk_iterator->first;
@@ -160,18 +170,36 @@ void request_storage_base_pimpl::clear() {
 }
 
 bool request_storage_base_pimpl::equals(request_storage_base_pimpl const &other) const {
-  if (other.chunk_size_ != chunk_size_) return false;
-  if (other.chunks_.size() != chunks_.size()) return false;
+  lock(other.chunk_mutex_, this->chunk_mutex_);
+  if (other.chunk_size_ != chunk_size_ || other.chunks_.size() != chunks_.size()) {
+    other.chunk_mutex_.unlock();
+    this->chunk_mutex_.unlock();
+    return false;
+  }
   chunks_vector::const_iterator chunk_iterator = chunks_.begin();
   chunks_vector::const_iterator other_iterator = other.chunks_.begin();
   for (; chunk_iterator != chunks_.begin() && other_iterator != other.chunks_.end();
          ++chunk_iterator, ++other_iterator) {
-    if (chunk_iterator->second != other_iterator->second) return false;
-    if (strncmp(chunk_iterator->first, other_iterator->first, chunk_iterator->second)) return false;
+    if (chunk_iterator->second != other_iterator->second ||
+        strncmp(chunk_iterator->first, other_iterator->first, chunk_iterator->second)) {
+      other.chunk_mutex_.unlock();
+      this->chunk_mutex_.unlock();
+      return false;
+    }
   }
+  other.chunk_mutex_.unlock();
+  this->chunk_mutex_.unlock();
   return true;
 }
 
+void request_storage_base_pimpl::swap(request_storage_base_pimpl &other) {
+  lock(other.chunk_mutex_, this->chunk_mutex_);
+  std::swap(chunk_size_, other.chunk_size_);
+  std::swap(chunks_, other.chunks_);
+  other.chunk_mutex_.unlock();
+  this->chunk_mutex_.unlock();
+}
+
 request_storage_base_pimpl::~request_storage_base_pimpl() {
   clear();
 }
diff --git a/libs/network/test/CMakeLists.txt b/libs/network/test/CMakeLists.txt
@@ -45,8 +45,6 @@ if (Boost_FOUND)
     set_source_files_properties(utils_thread_pool.cpp
       PROPERTIES COMPILE_FLAGS "-Wall")
     add_executable(cpp-netlib-utils_thread_pool utils_thread_pool.cpp)
-    add_dependencies(cpp-netlib-utils_thread_pool
-      cppnetlib-utils-thread_pool)
     target_link_libraries(cpp-netlib-utils_thread_pool
       cppnetlib-utils-thread_pool
       ${Boost_LIBRARIES}
diff --git a/libs/network/test/http/request_test.cpp b/libs/network/test/http/request_test.cpp
@@ -31,15 +31,16 @@ BOOST_AUTO_TEST_CASE(request_value_semantics) {
   // Next we modify the assigned object and make sure it's not the same as the
   // original.
   assigned.set_uri("http://www.google.com/");
-  std::string original_uri, assigned_uri;
-  original.get_uri(original_uri);
-  assigned.get_uri(assigned_uri);
-  BOOST_CHECK_NE(original_uri, assigned_uri);
+  assigned.set_source("127.0.0.1");
+  assigned.set_destination("http://www.google.com/");
+  assigned.append_header("Connection", "close");
+  assigned.set_body("Hello, world!");
   BOOST_CHECK(original != assigned);
   // Next we swap the assigned and copy.
   std::swap(assigned, copy);
   BOOST_CHECK(copy != assigned);
-  BOOST_CHECK(assigned == original);
+  BOOST_CHECK(copy != original);
+  BOOST_CHECK(original == assigned);
 }
 
 BOOST_AUTO_TEST_CASE(request_uri_test) {

Original file line number	Diff line number	Diff line change
`@@ -144,6 +144,7 @@ bool request::equals(request const &other) const {`
`144`	`144`
`145`	`145`	`void request::swap(request & other) {`
`146`	`146`	`std::swap(this->pimpl_, other.pimpl_);`
	`147`	`+ request_storage_base::swap(other);`
`147`	`148`	`}`
`148`	`149`
`149`	`150`	`// From message_base...`