forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 10:22:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

swarm/network/simulation: adjust disconnections on simulation close

Browse source
This commit is contained in:
Janos Guljas 2018-08-03 17:52:03 +02:00
parent 6959c93e3e
commit 5d419c3edb
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
swarm/network/simulation/simulation.go
View file

@ -161,6 +161,14 @@ var maxParallelCleanups = 10
// simulation. // simulation.
func (s *Simulation) Close() { func (s *Simulation) Close() {
close(s.done) close(s.done)
// Close all connections before calling the Network Shutdown.
// It is possible that p2p.Server.Stop will block if there are
// existing connections.
for _, c := range s.Net.Conns {
if c.Up {
s.Net.Disconnect(c.One, c.Other)
}
}
sem := make(chan struct{}, maxParallelCleanups) sem := make(chan struct{}, maxParallelCleanups)
s.mu.RLock() s.mu.RLock()
cleanupFuncs := make([]func(), len(s.cleanupFuncs)) cleanupFuncs := make([]func(), len(s.cleanupFuncs))
@ -190,14 +198,6 @@ func (s *Simulation) Close() {
close(s.runC) close(s.runC)
} }
s.shutdownWG.Wait() s.shutdownWG.Wait()
// Close all connections before calling the Network Shutdown.
// It is possible that p2p.Server.Stop will block if there are
// existing connections.
for _, c := range s.Net.Conns {
if c.Up {
s.Net.Disconnect(c.One, c.Other)
}
}
s.Net.Shutdown() s.Net.Shutdown()
} }