Commitcf240bf

authored and

committed

fix Resource deadlock avoided error (#817)

* fix Resource deadlock avoided error* fix boost -> std

1 parentf94635c commitcf240bfCopy full SHA for cf240bf

File tree

-2

lines changed

boost/network
- protocol/http/client
  - async_impl.hpp
- utils
  - thread_group.hpp

-2

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,9 @@ struct async_client`
`74`	`74`	`voidwait_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`	`}`

Lines changed: 1 addition & 1 deletion

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`	`}`

Comments

(0)