GuanM/hysteria
1
0
Fork 0
mirror of https://github.com/cedar2025/hysteria.git synced 2025-06-08 13:29:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #729 from apernet/brutal-debug

Browse Source 
feat: HYSTERIA_BRUTAL_DEBUG
This commit is contained in:
Toby 2023-10-05 19:32:57 -07:00 committed by GitHub
commit 282ec2a0c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
core/internal/congestion/brutal/brutal.go
View File

@ -1,6 +1,9 @@
package brutal package brutal
import ( import (
"fmt"
"os"
"strconv"
"time" "time"
"github.com/apernet/hysteria/core/internal/congestion/common" "github.com/apernet/hysteria/core/internal/congestion/common"
@ -12,6 +15,9 @@ const (
pktInfoSlotCount = 5 // slot index is based on seconds, so this is basically how many seconds we sample pktInfoSlotCount = 5 // slot index is based on seconds, so this is basically how many seconds we sample
minSampleCount = 50 minSampleCount = 50
minAckRate = 0.8 minAckRate = 0.8
debugEnv = "HYSTERIA_BRUTAL_DEBUG"
debugPrintInterval = 2
) )
var _ congestion.CongestionControl = &BrutalSender{} var _ congestion.CongestionControl = &BrutalSender{}
@ -24,6 +30,9 @@ type BrutalSender struct {
pktInfoSlots [pktInfoSlotCount]pktInfo pktInfoSlots [pktInfoSlotCount]pktInfo
ackRate float64 ackRate float64
debug bool
lastAckPrintTimestamp int64
} }
type pktInfo struct { type pktInfo struct {
@ -33,10 +42,12 @@ type pktInfo struct {
} }
func NewBrutalSender(bps uint64) *BrutalSender { func NewBrutalSender(bps uint64) *BrutalSender {
debug, _ := strconv.ParseBool(os.Getenv(debugEnv))
bs := &BrutalSender{ bs := &BrutalSender{
bps: congestion.ByteCount(bps), bps: congestion.ByteCount(bps),
maxDatagramSize: congestion.InitialPacketSizeIPv4, maxDatagramSize: congestion.InitialPacketSizeIPv4,
ackRate: 1, ackRate: 1,
debug: debug,
} }
bs.pacer = common.NewPacer(func() congestion.ByteCount { bs.pacer = common.NewPacer(func() congestion.ByteCount {
return congestion.ByteCount(float64(bs.bps) / bs.ackRate) return congestion.ByteCount(float64(bs.bps) / bs.ackRate)
@ -104,6 +115,9 @@ func (b *BrutalSender) OnCongestionEventEx(priorInFlight congestion.ByteCount, e
func (b *BrutalSender) SetMaxDatagramSize(size congestion.ByteCount) { func (b *BrutalSender) SetMaxDatagramSize(size congestion.ByteCount) {
b.maxDatagramSize = size b.maxDatagramSize = size
b.pacer.SetMaxDatagramSize(size) b.pacer.SetMaxDatagramSize(size)
if b.debug {
b.debugPrint("SetMaxDatagramSize: %d", size)
}
} }
func (b *BrutalSender) updateAckRate(currentTimestamp int64) { func (b *BrutalSender) updateAckRate(currentTimestamp int64) {
@ -118,14 +132,26 @@ func (b *BrutalSender) updateAckRate(currentTimestamp int64) {
} }
if ackCount+lossCount < minSampleCount { if ackCount+lossCount < minSampleCount {
b.ackRate = 1 b.ackRate = 1
if b.canPrintAckRate(currentTimestamp) {
b.lastAckPrintTimestamp = currentTimestamp
b.debugPrint("Not enough samples (total=%d, ack=%d, loss=%d)", ackCount+lossCount, ackCount, lossCount)
}
return return
} }
rate := float64(ackCount) / float64(ackCount+lossCount) rate := float64(ackCount) / float64(ackCount+lossCount)
if rate < minAckRate { if rate < minAckRate {
b.ackRate = minAckRate b.ackRate = minAckRate
if b.canPrintAckRate(currentTimestamp) {
b.lastAckPrintTimestamp = currentTimestamp
b.debugPrint("ACK rate too low: %.2f, clamped to %.2f (total=%d, ack=%d, loss=%d)", rate, minAckRate, ackCount+lossCount, ackCount, lossCount)
}
return return
} }
b.ackRate = rate b.ackRate = rate
if b.canPrintAckRate(currentTimestamp) {
b.lastAckPrintTimestamp = currentTimestamp
b.debugPrint("ACK rate: %.2f (total=%d, ack=%d, loss=%d)", rate, ackCount+lossCount, ackCount, lossCount)
}
} }
func (b *BrutalSender) InSlowStart() bool { func (b *BrutalSender) InSlowStart() bool {
@ -139,3 +165,13 @@ func (b *BrutalSender) InRecovery() bool {
func (b *BrutalSender) MaybeExitSlowStart() {} func (b *BrutalSender) MaybeExitSlowStart() {}
func (b *BrutalSender) OnRetransmissionTimeout(packetsRetransmitted bool) {} func (b *BrutalSender) OnRetransmissionTimeout(packetsRetransmitted bool) {}
func (b *BrutalSender) canPrintAckRate(currentTimestamp int64) bool {
return b.debug && currentTimestamp-b.lastAckPrintTimestamp >= debugPrintInterval
}
func (b *BrutalSender) debugPrint(format string, a ...any) {
fmt.Printf("[BrutalSender] [%s] %s\n",
time.Now().Format("15:04:05"),
fmt.Sprintf(format, a...))
}