Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions p2p/discv5/metrics.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package discv5

import "github.com/XinFinOrg/XDPoSChain/metrics"

var (
ingressTrafficMeter = metrics.NewRegisteredMeter("discv5/InboundTraffic", nil)
egressTrafficMeter = metrics.NewRegisteredMeter("discv5/OutboundTraffic", nil)
)
16 changes: 11 additions & 5 deletions p2p/discv5/udp.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
"github.com/XinFinOrg/XDPoSChain/common"
"github.com/XinFinOrg/XDPoSChain/crypto"
"github.com/XinFinOrg/XDPoSChain/log"
"github.com/XinFinOrg/XDPoSChain/metrics"
"github.com/XinFinOrg/XDPoSChain/p2p/nat"
"github.com/XinFinOrg/XDPoSChain/p2p/netutil"
"github.com/XinFinOrg/XDPoSChain/rlp"
Expand Down Expand Up @@ -315,18 +316,20 @@ func (t *udp) sendTopicNodes(remote *Node, queryHash common.Hash, nodes []*Node)
}

func (t *udp) sendPacket(toid NodeID, toaddr *net.UDPAddr, ptype byte, req interface{}) (hash []byte, err error) {
//fmt.Println("sendPacket", nodeEvent(ptype), toaddr.String(), toid.String())
packet, hash, err := encodePacket(t.priv, ptype, req)
if err != nil {
//fmt.Println(err)
return hash, err
}
log.Trace(fmt.Sprintf(">>> %v to %x@%v", nodeEvent(ptype), toid[:8], toaddr))
if _, err = t.conn.WriteToUDP(packet, toaddr); err != nil {
if nbytes, err := t.conn.WriteToUDP(packet, toaddr); err != nil {
log.Trace(fmt.Sprint("UDP send failed:", err))
return hash, err
} else {
if metrics.Enabled() {
egressTrafficMeter.Mark(int64(nbytes))
}
}
//fmt.Println(err)
return hash, err
return hash, nil
}

// zeroed padding space for encodePacket.
Expand Down Expand Up @@ -371,6 +374,9 @@ func (t *udp) readLoop() {
log.Debug(fmt.Sprintf("Read error: %v", err))
return
}
if metrics.Enabled() {
ingressTrafficMeter.Mark(int64(nbytes))
}
t.handlePacket(from, buf[:nbytes])
}
}
Expand Down