fix lock bugs

bottos-project · Nov 7, 2018 · 5055c5a · 5055c5a · richard9219 · Nov 7, 2018
1 parent 2470d24
commit 5055c5a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/protocol/block/sync.go b/protocol/block/sync.go
@@ -417,7 +417,7 @@ func (s *synchronizes) syncBlockNumberCheck() {
 
 func (s *synchronizes) recordPeerSyncTimeout(index uint16) {
 	s.lock.Lock()
-	s.lock.Unlock()
+	defer s.lock.Unlock()
 
 	peer, ok := s.peers[index]
 	if ok {
@@ -427,7 +427,7 @@ func (s *synchronizes) recordPeerSyncTimeout(index uint16) {
 
 func (s *synchronizes) resetPeerSyncTimeout() {
 	s.lock.Lock()
-	s.lock.Unlock()
+	defer s.lock.Unlock()
 
 	for _, info := range s.peers {
 		info.syncTimeoutCounter = 0
@@ -436,7 +436,7 @@ func (s *synchronizes) resetPeerSyncTimeout() {
 
 func (s *synchronizes) getPeers() syncset {
 	s.lock.Lock()
-	s.lock.Unlock()
+	defer s.lock.Unlock()
 
 	var peerset syncset
 	for _, info := range s.peers {

diff --git a/protocol/discover/pne.go b/protocol/discover/pne.go
@@ -249,7 +249,7 @@ func makeNeighbors() *neighbors {
 //AddNeighbor add new neighbor
 func (n *neighbors) addNeighbor(peers []p2p.PeerInfo) {
 	n.lock.Lock()
-	n.lock.Unlock()
+	defer n.lock.Unlock()
 
 	//filter neighbor which is exist
 	for j := range peers {
@@ -283,7 +283,7 @@ func (n *neighbors) addNeighbor(peers []p2p.PeerInfo) {
 //DelNeighbor delete neighbor
 func (n *neighbors) delNeighbor(peer p2p.PeerInfo) {
 	n.lock.Lock()
-	n.lock.Unlock()
+	defer n.lock.Unlock()
 
 	//find addr and remove
 	var count uint16
@@ -305,7 +305,7 @@ func (n *neighbors) delNeighbor(peer p2p.PeerInfo) {
 //NextPneNeighbors get neighbors to discover
 func (n *neighbors) nextPneNeighbors() []p2p.PeerInfo {
 	n.lock.Lock()
-	n.lock.Unlock()
+	defer n.lock.Unlock()
 
 	len := n.neighbor.Len()
 	if len <= 0 {