hesoyam/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2026-11-02 08:26:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

xdrive: port slot ring optimizations for Google Drive

Browse Source 
Co-authored-by: RPRX <63339210+RPRX@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-11-02 03:00:32 +00:00
committed by GitHub
co-authored by RPRX
parent 2dd075d0e2
commit f03c20db42
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
transport/internet/xdrive/slots.go
+17 -6
View File
@@ -27,7 +27,7 @@ const (
// slotInlineLimit is how large a segment is at most to go in the description // slotInlineLimit is how large a segment is at most to go in the description
// of its slot, which takes one request less than a body // of its slot, which takes one request less than a body
slotInlineLimit = 14 << 10 slotInlineLimit = 14 << 10
slotDepthLimit = 8 slotDepthLimit = 16
// inlineRampSegments segments of one size in a row double it, from // inlineRampSegments segments of one size in a row double it, from
// slotInlineLimit up to segmentBytes // slotInlineLimit up to segmentBytes
inlineRampSegments = 8 inlineRampSegments = 8
@@ -42,13 +42,13 @@ var (
// the head is asked for between slotHuntFloor and slotHuntCeiling, a segment // the head is asked for between slotHuntFloor and slotHuntCeiling, a segment
// behind it at about the pace that segments come // behind it at about the pace that segments come
slotHuntFloor = 50 * time.Millisecond slotHuntFloor = 50 * time.Millisecond
slotHuntCeiling = 200 * time.Millisecond slotHuntCeiling = 100 * time.Millisecond
slotTailMin = 150 * time.Millisecond slotTailMin = 150 * time.Millisecond
slotTailMax = 800 * time.Millisecond slotTailMax = 800 * time.Millisecond
slotFetchAhead = 6 slotFetchAhead = 10
slotAckRetry = 100 * time.Millisecond slotAckRetry = 30 * time.Millisecond
slotWatermarkTTL = 250 * time.Millisecond slotWatermarkTTL = 100 * time.Millisecond
slotStallTimeout = 60 * time.Second slotStallTimeout = 60 * time.Second
slotCloseGrace = 10 * time.Second slotCloseGrace = 10 * time.Second
slotGoneTimeout = 60 * time.Second slotGoneTimeout = 60 * time.Second
@@ -271,6 +271,11 @@ func (w *slotWriter) readyToFlush() bool {
grew := len(w.buf) > w.lastSize grew := len(w.buf) > w.lastSize
w.lastSize = len(w.buf) w.lastSize = len(w.buf)
// slots are busy and the buffer small, so a bigger segment is worth the wait
if len(w.slots) > 0 && w.held < maxCoalescedTicks && len(w.buf) < w.size/2 {
w.held++
return false
}
if grew && w.held < maxCoalescedTicks { if grew && w.held < maxCoalescedTicks {
w.held++ w.held++
return false return false
@@ -296,6 +301,12 @@ func (w *slotWriter) flushLocked() error {
return w.err return w.err
} }
// a ring three quarters busy is saturated by small segments, so widen at once
if w.size < w.segmentBytes && len(w.buf) >= w.size && len(w.slots)*4 > cap(w.slots)*3 {
w.size = w.segmentBytes
w.full = 0
}
n := min(len(w.buf), w.size) n := min(len(w.buf), w.size)
if len(w.buf) > 4*slotInlineLimit { if len(w.buf) > 4*slotInlineLimit {
// a burst goes at the full size at once // a burst goes at the full size at once
@@ -393,7 +404,7 @@ func (w *slotWriter) await(seq int64) error {
w.ackMu.Lock() w.ackMu.Lock()
still := time.Since(w.progress) still := time.Since(w.progress)
w.ackMu.Unlock() w.ackMu.Unlock()
if time.Since(start) > slotStallTimeout || closed && still > slotCloseGrace { if min(time.Since(start), still) > slotStallTimeout || closed && still > slotCloseGrace {
return errors.New("the reader took nothing from slot ", w.slotID(seq), " for ", still).Base(err) return errors.New("the reader took nothing from slot ", w.slotID(seq), " for ", still).Base(err)
} }