dlss
/
FedP2P
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge messageTypes{Sent,Posted} into torrent expvar

This commit is contained in:
Matt Joiner 2018-06-29 22:10:21 +10:00
parent 60dd0eed53
commit a3bc6398c8
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
connection.go
View File

@ -332,7 +332,7 @@ func (cn *connection) PeerHasPiece(piece int) bool {
// Writes a message into the write buffer. // Writes a message into the write buffer.
func (cn *connection) Post(msg pp.Message) { func (cn *connection) Post(msg pp.Message) {
messageTypesPosted.Add(msg.Type.String(), 1) torrent.Add(fmt.Sprintf("messages posted of type %s", msg.Type.String()), 1)
// We don't need to track bytes here because a connection.w Writer wrapper // We don't need to track bytes here because a connection.w Writer wrapper
// takes care of that (although there's some delay between us recording // takes care of that (although there's some delay between us recording
// the message, and the connection writer flushing it out.). // the message, and the connection writer flushing it out.).
@ -604,7 +604,8 @@ func (cn *connection) writer(keepAliveTimeout time.Duration) {
cn.fillWriteBuffer(func(msg pp.Message) bool { cn.fillWriteBuffer(func(msg pp.Message) bool {
cn.wroteMsg(&msg) cn.wroteMsg(&msg)
cn.writeBuffer.Write(msg.MustMarshalBinary()) cn.writeBuffer.Write(msg.MustMarshalBinary())
return cn.writeBuffer.Len() < 1<<16 torrent.Add(fmt.Sprintf("messages filled of type %s", msg.Type.String()), 1)
return cn.writeBuffer.Len() < 1<<16 // 64KiB
}) })
} }
if cn.writeBuffer.Len() == 0 && time.Since(lastWrite) >= keepAliveTimeout { if cn.writeBuffer.Len() == 0 && time.Since(lastWrite) >= keepAliveTimeout {
@ -923,7 +924,7 @@ func (c *connection) requestPendingMetadata() {
} }
func (cn *connection) wroteMsg(msg *pp.Message) { func (cn *connection) wroteMsg(msg *pp.Message) {
messageTypesSent.Add(msg.Type.String(), 1) torrent.Add(fmt.Sprintf("messages written of type %s", msg.Type.String()), 1)
cn.allStats(func(cs *ConnStats) { cs.wroteMsg(msg) }) cn.allStats(func(cs *ConnStats) { cs.wroteMsg(msg) })
} }

2
global.go
View File

@ -42,8 +42,6 @@ var (
requestedChunkLengths = expvar.NewMap("requestedChunkLengths") requestedChunkLengths = expvar.NewMap("requestedChunkLengths")
messageTypesReceived = expvar.NewMap("messageTypesReceived") messageTypesReceived = expvar.NewMap("messageTypesReceived")
messageTypesSent = expvar.NewMap("messageTypesSent")
messageTypesPosted = expvar.NewMap("messageTypesPosted")
// Track the effectiveness of Torrent.connPieceInclinationPool. // Track the effectiveness of Torrent.connPieceInclinationPool.
pieceInclinationsReused = expvar.NewInt("pieceInclinationsReused") pieceInclinationsReused = expvar.NewInt("pieceInclinationsReused")