Skip to content

G
Geth-Modification
Unverified Commit c42d1390 authored by Péter Szilágyi's avatar Péter Szilágyi Committed by GitHub
Browse files
Options

Merge pull request #21256 from karalabe/p2p-packet-metrics 

p2p: measure packet throughput too, not just bandwidth
parents dce533c2 42ccb2fd
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
p2p/peer.go
View file @ c42d1390
...@@ -304,6 +304,7 @@ func (p *Peer) handle(msg Msg) error { ...@@ -304,6 +304,7 @@ func (p *Peer) handle(msg Msg) error {
if metrics.Enabled { if metrics.Enabled {
m := fmt.Sprintf("%s/%s/%d/%#02x", ingressMeterName, proto.Name, proto.Version, msg.Code-proto.offset) m := fmt.Sprintf("%s/%s/%d/%#02x", ingressMeterName, proto.Name, proto.Version, msg.Code-proto.offset)
metrics.GetOrRegisterMeter(m, nil).Mark(int64(msg.meterSize)) metrics.GetOrRegisterMeter(m, nil).Mark(int64(msg.meterSize))
metrics.GetOrRegisterMeter(m+"/packets", nil).Mark(1)
} }
select { select {
case proto.in <- msg: case proto.in <- msg:
......
p2p/rlpx.go
View file @ c42d1390
...@@ -597,6 +597,7 @@ func (rw *rlpxFrameRW) WriteMsg(msg Msg) error { ...@@ -597,6 +597,7 @@ func (rw *rlpxFrameRW) WriteMsg(msg Msg) error {
if metrics.Enabled && msg.meterCap.Name != "" { // don't meter non-subprotocol messages if metrics.Enabled && msg.meterCap.Name != "" { // don't meter non-subprotocol messages
m := fmt.Sprintf("%s/%s/%d/%#02x", egressMeterName, msg.meterCap.Name, msg.meterCap.Version, msg.meterCode) m := fmt.Sprintf("%s/%s/%d/%#02x", egressMeterName, msg.meterCap.Name, msg.meterCap.Version, msg.meterCode)
metrics.GetOrRegisterMeter(m, nil).Mark(int64(msg.meterSize)) metrics.GetOrRegisterMeter(m, nil).Mark(int64(msg.meterSize))
metrics.GetOrRegisterMeter(m+"/packets", nil).Mark(1)
} }
// write header // write header
headbuf := make([]byte, 32) headbuf := make([]byte, 32)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment