p2p: instrument P2P networking layer

This commit is contained in:
Péter Szilágyi 2015-06-21 20:23:37 +03:00
parent 821e01b013
commit 6994a3daaa
3 changed files with 56 additions and 3 deletions

View File

@ -196,7 +196,9 @@ func (t *dialTask) Do(srv *Server) {
glog.V(logger.Detail).Infof("dial error: %v", err) glog.V(logger.Detail).Infof("dial error: %v", err)
return return
} }
srv.setupConn(fd, t.flags, t.dest) mfd := newMeteredConn(fd, false)
srv.setupConn(mfd, t.flags, t.dest)
} }
func (t *dialTask) String() string { func (t *dialTask) String() string {
return fmt.Sprintf("%v %x %v:%d", t.flags, t.dest.ID[:8], t.dest.IP, t.dest.TCP) return fmt.Sprintf("%v %x %v:%d", t.flags, t.dest.ID[:8], t.dest.IP, t.dest.TCP)

49
p2p/metrics.go Normal file
View File

@ -0,0 +1,49 @@
// Contains the meters and timers used by the networking layer.
package p2p
import (
"net"
"github.com/rcrowley/go-metrics"
)
var (
ingressConnectMeter = metrics.GetOrRegisterMeter("p2p/InboundConnects", metrics.DefaultRegistry)
ingressTrafficMeter = metrics.GetOrRegisterMeter("p2p/InboundTraffic", metrics.DefaultRegistry)
egressConnectMeter = metrics.GetOrRegisterMeter("p2p/OutboundConnects", metrics.DefaultRegistry)
egressTrafficMeter = metrics.GetOrRegisterMeter("p2p/OutboundTraffic", metrics.DefaultRegistry)
)
// meteredConn is a wrapper around a network TCP connection that meters both the
// inbound and outbound network traffic.
type meteredConn struct {
*net.TCPConn // Network connection to wrap with metering
}
// newMeteredConn creates a new metered connection, also bumping the ingress or
// egress connection meter.
func newMeteredConn(conn net.Conn, ingress bool) net.Conn {
if ingress {
ingressConnectMeter.Mark(1)
} else {
egressConnectMeter.Mark(1)
}
return &meteredConn{conn.(*net.TCPConn)}
}
// Read delegates a network read to the underlying connection, bumping the ingress
// traffic meter along the way.
func (c *meteredConn) Read(b []byte) (n int, err error) {
n, err = c.TCPConn.Read(b)
ingressTrafficMeter.Mark(int64(n))
return
}
// Write delegates a network write to the underlying connection, bumping the
// egress traffic meter along the way.
func (c *meteredConn) Write(b []byte) (n int, err error) {
n, err = c.TCPConn.Write(b)
egressTrafficMeter.Mark(int64(n))
return
}

View File

@ -548,9 +548,11 @@ func (srv *Server) listenLoop() {
if err != nil { if err != nil {
return return
} }
glog.V(logger.Debug).Infof("Accepted conn %v\n", fd.RemoteAddr()) mfd := newMeteredConn(fd, true)
glog.V(logger.Debug).Infof("Accepted conn %v\n", mfd.RemoteAddr())
go func() { go func() {
srv.setupConn(fd, inboundConn, nil) srv.setupConn(mfd, inboundConn, nil)
slots <- struct{}{} slots <- struct{}{}
}() }()
} }