fix Resource deadlock avoided error (#817)

olegabr · deanberris · commit cf240bf7fe28 · 2018-02-14T17:06:29.000+11:00
* fix Resource deadlock avoided error

* fix boost -&gt; std
diff --git a/boost/network/protocol/http/client/async_impl.hpp b/boost/network/protocol/http/client/async_impl.hpp
@@ -74,7 +74,9 @@ struct async_client
   void wait_complete() {
     sentinel_.reset();
     if (lifetime_thread_.get()) {
-      lifetime_thread_->join();
+      if (lifetime_thread_->joinable() && lifetime_thread_->get_id() != std::this_thread::get_id()) {
+        lifetime_thread_->join();
+      }
       lifetime_thread_.reset();
     }
   }
diff --git a/boost/network/utils/thread_group.hpp b/boost/network/utils/thread_group.hpp
@@ -55,7 +55,7 @@ class thread_group {
     std::unique_lock<std::mutex> guard(m);
 
     for (auto &thread : threads) {
-      if (thread->joinable()) {
+      if (thread->joinable() && thread->get_id() != std::this_thread::get_id()) {
         thread->join();
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,9 @@ struct async_client`
`74`	`74`	`void wait_complete() {`
`75`	`75`	`sentinel_.reset();`
`76`	`76`	`if (lifetime_thread_.get()) {`
`77`		`- lifetime_thread_->join();`
	`77`	`+ if (lifetime_thread_->joinable() && lifetime_thread_->get_id() != std::this_thread::get_id()) {`
	`78`	`+ lifetime_thread_->join();`
	`79`	`+ }`
`78`	`80`	`lifetime_thread_.reset();`
`79`	`81`	`}`
`80`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ class thread_group {`
`55`	`55`	`std::unique_lock<std::mutex> guard(m);`
`56`	`56`
`57`	`57`	`for (auto &thread : threads) {`
`58`		`- if (thread->joinable()) {`
	`58`	`+ if (thread->joinable() && thread->get_id() != std::this_thread::get_id()) {`
`59`	`59`	`thread->join();`
`60`	`60`	`}`
`61`	`61`	`}`