cerc-io/go-ethereum
18
0
Fork 0
Code Issues 9 Pull Requests Packages Projects Releases 66 Wiki Activity

p2p: fix rare deadlock in Stop (#17260)

Browse Source
This commit is contained in:
Janoš Guljaš 2018-07-30 11:44:17 +02:00 committed by Péter Szilágyi
parent d42ce0f2c1
commit 8f4c4fea20
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
p2p/server.go
View File

@ -340,8 +340,8 @@ func (srv *Server) makeSelf(listener net.Listener, ntab discoverTable) *discover
// It blocks until all active connections have been closed. // It blocks until all active connections have been closed.
func (srv *Server) Stop() { func (srv *Server) Stop() {
srv.lock.Lock() srv.lock.Lock()
defer srv.lock.Unlock()
if !srv.running { if !srv.running {
srv.lock.Unlock()
return return
} }
srv.running = false srv.running = false
@ -350,6 +350,7 @@ func (srv *Server) Stop() {
srv.listener.Close() srv.listener.Close()
} }
close(srv.quit) close(srv.quit)
srv.lock.Unlock()
srv.loopWG.Wait() srv.loopWG.Wait()
} }