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
4 changes: 2 additions & 2 deletions agent.go
Original file line number Diff line number Diff line change
Expand Up @@ -1104,8 +1104,8 @@ func replacePairRemote(pair *CandidatePair, remote Candidate) *CandidatePair {

atomic.StoreInt64(&replacement.currentRoundTripTime, atomic.LoadInt64(&pair.currentRoundTripTime))
atomic.StoreInt64(&replacement.totalRoundTripTime, atomic.LoadInt64(&pair.totalRoundTripTime))
atomic.StoreUint32(&replacement.packetsSent, atomic.LoadUint32(&pair.packetsSent))
atomic.StoreUint32(&replacement.packetsReceived, atomic.LoadUint32(&pair.packetsReceived))
atomic.StoreUint64(&replacement.packetsSent, atomic.LoadUint64(&pair.packetsSent))
atomic.StoreUint64(&replacement.packetsReceived, atomic.LoadUint64(&pair.packetsReceived))
atomic.StoreUint64(&replacement.bytesSent, atomic.LoadUint64(&pair.bytesSent))
atomic.StoreUint64(&replacement.bytesReceived, atomic.LoadUint64(&pair.bytesReceived))
atomic.StoreUint64(&replacement.requestsReceived, atomic.LoadUint64(&pair.requestsReceived))
Expand Down
8 changes: 4 additions & 4 deletions agent_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1436,8 +1436,8 @@ func TestCandidatePairsStats(t *testing.T) { //nolint:cyclop,gocyclo
require.False(t, cps.FirstRequestReceivedTimestamp.IsZero())
require.False(t, cps.LastRequestReceivedTimestamp.IsZero())

require.Equal(t, uint32(1), cps.PacketsSent)
require.Equal(t, uint32(1), cps.PacketsReceived)
require.Equal(t, uint64(1), cps.PacketsSent)
require.Equal(t, uint64(1), cps.PacketsReceived)
require.Equal(t, uint64(100), cps.BytesSent)
require.Equal(t, uint64(200), cps.BytesReceived)
require.False(t, cps.LastPacketSentTimestamp.IsZero())
Expand Down Expand Up @@ -1504,8 +1504,8 @@ func TestSelectedCandidatePairStats(t *testing.T) { //nolint:cyclop
require.Equal(t, float64(55), stats.TotalRoundTripTime)
require.Equal(t, uint64(10), stats.ResponsesReceived)

require.Equal(t, uint32(1), stats.PacketsSent)
require.Equal(t, uint32(1), stats.PacketsReceived)
require.Equal(t, uint64(1), stats.PacketsSent)
require.Equal(t, uint64(1), stats.PacketsReceived)
require.Equal(t, uint64(150), stats.BytesSent)
require.Equal(t, uint64(250), stats.BytesReceived)
require.False(t, stats.LastPacketSentTimestamp.IsZero())
Expand Down
16 changes: 8 additions & 8 deletions candidatepair.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ type CandidatePair struct {
currentRoundTripTime int64 // in ns
totalRoundTripTime int64 // in ns

packetsSent uint32
packetsReceived uint32
packetsSent uint64
packetsReceived uint64
bytesSent uint64
bytesReceived uint64
lastPacketSentAt atomic.Int64 // monotonic nanos since timeRef, see getMonoNanos
Expand Down Expand Up @@ -196,13 +196,13 @@ func (p *CandidatePair) ResponsesSent() uint64 {
}

// PacketsSent returns total application (non-STUN) packets sent on this pair.
func (p *CandidatePair) PacketsSent() uint32 {
return atomic.LoadUint32(&p.packetsSent)
func (p *CandidatePair) PacketsSent() uint64 {
return atomic.LoadUint64(&p.packetsSent)
}

// PacketsReceived returns total application (non-STUN) packets received on this pair.
func (p *CandidatePair) PacketsReceived() uint32 {
return atomic.LoadUint32(&p.packetsReceived)
func (p *CandidatePair) PacketsReceived() uint64 {
return atomic.LoadUint64(&p.packetsReceived)
}

// BytesSent returns total application bytes sent on this pair.
Expand Down Expand Up @@ -239,7 +239,7 @@ func (p *CandidatePair) UpdatePacketSent(n int) {
return
}

atomic.AddUint32(&p.packetsSent, 1)
atomic.AddUint64(&p.packetsSent, 1)
atomic.AddUint64(&p.bytesSent, uint64(n)) // #nosec G115 -- n > 0 validated above
p.lastPacketSentAt.Store(getMonoNanos(time.Now()))
}
Expand All @@ -250,7 +250,7 @@ func (p *CandidatePair) UpdatePacketReceived(n int) {
return
}

atomic.AddUint32(&p.packetsReceived, 1)
atomic.AddUint64(&p.packetsReceived, 1)
atomic.AddUint64(&p.bytesReceived, uint64(n)) // #nosec G115 -- n > 0 validated above
p.lastPacketReceivedAt.Store(getMonoNanos(time.Now()))
}
Expand Down
4 changes: 2 additions & 2 deletions stats.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ type CandidatePairStats struct {
Nominated bool

// PacketsSent represents the total number of packets sent on this candidate pair.
PacketsSent uint32
PacketsSent uint64

// PacketsReceived represents the total number of packets received on this candidate pair.
PacketsReceived uint32
PacketsReceived uint64

// BytesSent represents the total number of payload bytes sent on this candidate pair
// not including headers or padding.
Expand Down
Loading