TrueCloudLab/neo-go
8
0
Fork 0
mirror of https://github.com/nspcc-dev/neo-go.git synced 2025-05-04 19:02:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Node network improvements (#45)

Browse source 
* small improvements.

* Fixed datarace + cleanup node and peer

* bumped version.

* removed race flag to pass build
This commit is contained in:
Anthony De Meulemeester 2018-03-10 13:04:06 +01:00 • committed by GitHub
parent 4023661cf1
commit aa4bd34b6b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 367 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

45
pkg/network/server.go
View file

@ -70,7 +70,7 @@ type Server struct {
listener net.Listener
register chan Peer
unregister chan Peer
unregister chan peerDrop
badAddrOp chan func(map[string]bool)
badAddrOpDone chan struct{}
@ -81,6 +81,11 @@ type Server struct {
quit chan struct{}
}
type peerDrop struct {
p Peer
err error
}
// NewServer returns a new Server object created from the
// given config.
func NewServer(cfg Config) *Server {
@ -103,7 +108,7 @@ func NewServer(cfg Config) *Server {
id: util.RandUint32(1000000, 9999999),
quit: make(chan struct{}, 1),
register: make(chan Peer),
unregister: make(chan Peer),
unregister: make(chan peerDrop),
badAddrOp: make(chan func(map[string]bool)),
badAddrOpDone: make(chan struct{}),
peerOp: make(chan func(map[Peer]bool)),
@ -131,12 +136,14 @@ func (s *Server) listenTCP() {
s.logger.Log("msg", "conn read error", "err", err)
break
}
go s.setupConnection(conn)
go s.setupPeerConn(conn)
}
s.Quit()
}
func (s *Server) setupConnection(conn net.Conn) {
// setupPeerConn runs in its own routine for each connected Peer.
// and waits till the Peer.Run() returns.
func (s *Server) setupPeerConn(conn net.Conn) {
if !s.hasCapacity() {
s.logger.Log("msg", "server reached maximum capacity")
return
@ -144,9 +151,9 @@ func (s *Server) setupConnection(conn net.Conn) {
p := NewTCPPeer(conn, s.proto.handleProto)
s.register <- p
if err := p.run(); err != nil {
s.unregister <- p
}
err := p.run()
s.unregister <- peerDrop{p, err}
}
func (s *Server) connectToPeers(addrs ...string) {
@ -161,7 +168,7 @@ func (s *Server) connectToPeers(addrs ...string) {
<-s.badAddrOpDone
return
}
go s.setupConnection(conn)
go s.setupPeerConn(conn)
}(addr)
}
}
@ -194,13 +201,12 @@ func (s *Server) hasCapacity() bool {
return s.PeerCount() != s.MaxPeers
}
func (s *Server) sendVersion(peer Peer) {
peer.Send(NewMessage(s.Net, CMDVersion, s.proto.version()))
func (s *Server) sendVersion(p Peer) {
p.Send(NewMessage(s.Net, CMDVersion, s.proto.version()))
}
func (s *Server) run() {
var (
ticker = time.NewTicker(30 * time.Second).C
peers = make(map[Peer]bool)
badAddrs = make(map[string]bool)
)
@ -219,11 +225,18 @@ func (s *Server) run() {
// out our version immediately.
s.sendVersion(p)
s.logger.Log("event", "peer connected", "endpoint", p.Endpoint())
case p := <-s.unregister:
delete(peers, p)
s.logger.Log("event", "peer disconnected", "endpoint", p.Endpoint())
case <-ticker:
s.printState()
case drop := <-s.unregister:
delete(peers, drop.p)
s.logger.Log(
"event", "peer disconnected",
"endpoint", drop.p.Endpoint(),
"reason", drop.err,
"peerCount", len(peers),
)
if len(peers) == 0 {
s.logger.Log("fatal", "no more available peers")
return
}
case <-s.quit:
return
}