From 463567b19e433302035f3494c42ca902570dfa1e Mon Sep 17 00:00:00 2001
From: Gary Yu <gairy.yu@gmail.com>
Date: Sun, 7 Oct 2018 13:01:32 +0800
Subject: [PATCH] optimization of peer state write lock (#1669)

* optimization of peer state write lock
---
 p2p/src/peer.rs | 36 ++++++++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/p2p/src/peer.rs b/p2p/src/peer.rs
index 06c9fbcf..6c850227 100644
--- a/p2p/src/peer.rs
+++ b/p2p/src/peer.rs
@@ -326,12 +326,19 @@ impl Peer {
 	}
 
 	fn check_connection(&self) -> bool {
-		let mut state = self.state.write().unwrap();
 		match self.connection.as_ref().unwrap().error_channel.try_recv() {
 			Ok(Error::Serialization(e)) => {
-				if State::Banned != *state {
-					*state = State::Disconnected;
-					info!(
+				let need_stop = {
+					let mut state = self.state.write().unwrap();
+					if State::Banned != *state {
+						*state = State::Disconnected;
+						true
+					} else {
+						false
+					}
+				};
+				if need_stop {
+					debug!(
 						LOGGER,
 						"Client {} corrupted, will disconnect ({:?}).", self.info.addr, e
 					);
@@ -340,12 +347,25 @@ impl Peer {
 				false
 			}
 			Ok(e) => {
-				*state = State::Disconnected;
-				debug!(LOGGER, "Client {} connection lost: {:?}", self.info.addr, e);
-				self.stop();
+				let need_stop = {
+					let mut state = self.state.write().unwrap();
+					if State::Disconnected != *state {
+						*state = State::Disconnected;
+						true
+					} else {
+						false
+					}
+				};
+				if need_stop {
+					debug!(LOGGER, "Client {} connection lost: {:?}", self.info.addr, e);
+					self.stop();
+				}
 				false
 			}
-			Err(_) => State::Connected == *state,
+			Err(_) => {
+				let state = self.state.read().unwrap();
+				State::Connected == *state
+			}
 		}
 	}
 }