forked from TrueCloudLab/neoneo-go
c2d444ace7
Fix data race ================== WARNING: DATA RACE Read at 0x00c00012cca3 by goroutine 208: testing.(*common).logDepth() /usr/local/go/src/testing/testing.go:727 +0xa4 testing.(*common).log() /usr/local/go/src/testing/testing.go:720 +0x8f testing.(*common).Logf() /usr/local/go/src/testing/testing.go:766 +0x21 testing.(*T).Logf() <autogenerated>:1 +0x75 go.uber.org/zap/zaptest.testingWriter.Write() /go/pkg/mod/go.uber.org/zap@v1.10.0/zaptest/logger.go:130 +0x11f go.uber.org/zap/zaptest.(*testingWriter).Write() <autogenerated>:1 +0xa9 go.uber.org/zap/zapcore.(*ioCore).Write() /go/pkg/mod/go.uber.org/zap@v1.10.0/zapcore/core.go:90 +0x1c3 go.uber.org/zap/zapcore.(*CheckedEntry).Write() /go/pkg/mod/go.uber.org/zap@v1.10.0/zapcore/entry.go:215 +0x1e7 go.uber.org/zap.(*Logger).Warn() /go/pkg/mod/go.uber.org/zap@v1.10.0/logger.go:195 +0x95 github.com/nspcc-dev/neo-go/pkg/network.(*TCPTransport).Accept() /go/src/github.com/nspcc-dev/neo-go/pkg/network/tcp_transport.go:59 +0x8da Previous write at 0x00c00012cca3 by goroutine 168: testing.tRunner.func1() /usr/local/go/src/testing/testing.go:1036 +0x467 testing.tRunner() /usr/local/go/src/testing/testing.go:1054 +0x20d Goroutine 208 (running) created at: github.com/nspcc-dev/neo-go/pkg/network.(*Server).Start() /go/src/github.com/nspcc-dev/neo-go/pkg/network/server.go:274 +0x391 Goroutine 168 (running) created at: testing.(*T).Run() /usr/local/go/src/testing/testing.go:1095 +0x537 testing.runTests.func1() /usr/local/go/src/testing/testing.go:1339 +0xa6 testing.tRunner() /usr/local/go/src/testing/testing.go:1050 +0x1eb testing.runTests() /usr/local/go/src/testing/testing.go:1337 +0x594 testing.(*M).Run() /usr/local/go/src/testing/testing.go:1252 +0x2ff main.main() _testmain.go:90 +0x223 ==================
112 lines
2.1 KiB
Go
112 lines
2.1 KiB
Go
package network
|
|
|
|
import (
|
|
"net"
|
|
"regexp"
|
|
"sync"
|
|
"time"
|
|
|
|
"go.uber.org/zap"
|
|
)
|
|
|
|
// TCPTransport allows network communication over TCP.
|
|
type TCPTransport struct {
|
|
log *zap.Logger
|
|
server *Server
|
|
listener net.Listener
|
|
bindAddr string
|
|
lock sync.RWMutex
|
|
quit bool
|
|
}
|
|
|
|
var reClosedNetwork = regexp.MustCompile(".* use of closed network connection")
|
|
|
|
// NewTCPTransport returns a new TCPTransport that will listen for
|
|
// new incoming peer connections.
|
|
func NewTCPTransport(s *Server, bindAddr string, log *zap.Logger) *TCPTransport {
|
|
return &TCPTransport{
|
|
log: log,
|
|
server: s,
|
|
bindAddr: bindAddr,
|
|
}
|
|
}
|
|
|
|
// Dial implements the Transporter interface.
|
|
func (t *TCPTransport) Dial(addr string, timeout time.Duration) error {
|
|
conn, err := net.DialTimeout("tcp", addr, timeout)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
p := NewTCPPeer(conn, t.server)
|
|
go p.handleConn()
|
|
return nil
|
|
}
|
|
|
|
// Accept implements the Transporter interface.
|
|
func (t *TCPTransport) Accept() {
|
|
l, err := net.Listen("tcp", t.bindAddr)
|
|
if err != nil {
|
|
t.log.Panic("TCP listen error", zap.Error(err))
|
|
return
|
|
}
|
|
|
|
t.lock.Lock()
|
|
if t.quit {
|
|
t.lock.Unlock()
|
|
l.Close()
|
|
return
|
|
}
|
|
t.listener = l
|
|
t.lock.Unlock()
|
|
|
|
for {
|
|
conn, err := l.Accept()
|
|
if err != nil {
|
|
t.lock.Lock()
|
|
quit := t.quit
|
|
t.lock.Unlock()
|
|
if t.isCloseError(err) && quit {
|
|
break
|
|
}
|
|
t.log.Warn("TCP accept error", zap.Error(err))
|
|
continue
|
|
}
|
|
p := NewTCPPeer(conn, t.server)
|
|
go p.handleConn()
|
|
}
|
|
}
|
|
|
|
func (t *TCPTransport) isCloseError(err error) bool {
|
|
if opErr, ok := err.(*net.OpError); ok {
|
|
if reClosedNetwork.Match([]byte(opErr.Error())) {
|
|
return true
|
|
}
|
|
}
|
|
|
|
return false
|
|
}
|
|
|
|
// Close implements the Transporter interface.
|
|
func (t *TCPTransport) Close() {
|
|
t.lock.Lock()
|
|
if t.listener != nil {
|
|
t.listener.Close()
|
|
}
|
|
t.quit = true
|
|
t.lock.Unlock()
|
|
}
|
|
|
|
// Proto implements the Transporter interface.
|
|
func (t *TCPTransport) Proto() string {
|
|
return "tcp"
|
|
}
|
|
|
|
// Address implements the Transporter interface.
|
|
func (t *TCPTransport) Address() string {
|
|
t.lock.RLock()
|
|
defer t.lock.RUnlock()
|
|
if t.listener != nil {
|
|
return t.listener.Addr().String()
|
|
}
|
|
return ""
|
|
}
|