Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0284bd652a | ||
|
|
c82251169f | ||
|
|
f065464e2c | ||
|
|
534e7da40d |
@@ -158,7 +158,8 @@ func (s *session) recvLoop() {
|
|||||||
t := s.client.Transport()
|
t := s.client.Transport()
|
||||||
oldNum := t.LastRecvOldNum()
|
oldNum := t.LastRecvOldNum()
|
||||||
newNum := t.LastRecvNewNum()
|
newNum := t.LastRecvNewNum()
|
||||||
s.tracker.applyDiff(diff, oldNum, newNum)
|
throwawayNum := t.ThrowawayNum()
|
||||||
|
s.tracker.applyDiff(diff, oldNum, newNum, throwawayNum)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+9
-25
@@ -41,7 +41,8 @@ func newStateTracker(cols, rows int) *stateTracker {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// applyDiff processes an incoming server diff using state tracking.
|
// applyDiff processes an incoming server diff using state tracking.
|
||||||
func (st *stateTracker) applyDiff(diff []byte, oldNum, newNum uint64) {
|
// throwawayNum is the server's indication of which states it no longer references.
|
||||||
|
func (st *stateTracker) applyDiff(diff []byte, oldNum, newNum, throwawayNum uint64) {
|
||||||
st.mu.Lock()
|
st.mu.Lock()
|
||||||
defer st.mu.Unlock()
|
defer st.mu.Unlock()
|
||||||
|
|
||||||
@@ -93,9 +94,13 @@ func (st *stateTracker) applyDiff(diff []byte, oldNum, newNum uint64) {
|
|||||||
st.latestState = newNum
|
st.latestState = newNum
|
||||||
}
|
}
|
||||||
|
|
||||||
// Bound states list.
|
// Prune states the server no longer references.
|
||||||
if len(st.states) > 128 {
|
if throwawayNum > 0 {
|
||||||
st.pruneStates()
|
for n := range st.states {
|
||||||
|
if n < throwawayNum {
|
||||||
|
delete(st.states, n)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Display diff: compute ANSI difference between displayed and latest.
|
// Display diff: compute ANSI difference between displayed and latest.
|
||||||
@@ -133,24 +138,3 @@ func (st *stateTracker) resize(cols, rows int) {
|
|||||||
st.displayedFB = nil
|
st.displayedFB = nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (st *stateTracker) pruneStates() {
|
|
||||||
if len(st.states) <= 64 {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
// Keep the 64 most recent states.
|
|
||||||
var nums []uint64
|
|
||||||
for n := range st.states {
|
|
||||||
nums = append(nums, n)
|
|
||||||
}
|
|
||||||
// Simple sort for small lists.
|
|
||||||
for i := range nums {
|
|
||||||
for j := i + 1; j < len(nums); j++ {
|
|
||||||
if nums[j] < nums[i] {
|
|
||||||
nums[i], nums[j] = nums[j], nums[i]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for _, n := range nums[:len(nums)-64] {
|
|
||||||
delete(st.states, n)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -379,6 +379,14 @@ func (t *Transport) LastRecvNewNum() uint64 {
|
|||||||
return t.lastRecvNewNum
|
return t.lastRecvNewNum
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ThrowawayNum returns the server's throwaway number — states below this
|
||||||
|
// are no longer referenced by the server and can be safely pruned.
|
||||||
|
func (t *Transport) ThrowawayNum() uint64 {
|
||||||
|
t.mu.Lock()
|
||||||
|
defer t.mu.Unlock()
|
||||||
|
return t.throwawayNum
|
||||||
|
}
|
||||||
|
|
||||||
// LastRecv returns the time of the last received datagram.
|
// LastRecv returns the time of the last received datagram.
|
||||||
func (t *Transport) LastRecv() time.Time {
|
func (t *Transport) LastRecv() time.Time {
|
||||||
t.mu.Lock()
|
t.mu.Lock()
|
||||||
|
|||||||
Reference in New Issue
Block a user