Archives/Cloak
2
0
Fork 0
mirror of https://github.com/cbeuw/Cloak.git synced 2024-11-03 23:15:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix memory leak

Browse Source
This commit is contained in:
Qian Wang 2019-01-19 19:30:00 +00:00
parent 935f995954
commit a6e16b4f74
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
internal/multiplex/frameSorter.go
View File

@ -74,6 +74,11 @@ func (s *Stream) recvNewFrame() {
// when there's no ooo packages in heap and we receive the next package in order // when there's no ooo packages in heap and we receive the next package in order
if len(s.sh) == 0 && f.Seq == s.nextRecvSeq { if len(s.sh) == 0 && f.Seq == s.nextRecvSeq {
s.pushFrame(f) s.pushFrame(f)
if f.Closing == 1 {
// empty data indicates closing signal
s.sortedBufCh <- []byte{}
return
}
continue continue
} }
@ -104,6 +109,11 @@ func (s *Stream) recvNewFrame() {
// Keep popping from the heap until empty or to the point that the wanted seq was not received // Keep popping from the heap until empty or to the point that the wanted seq was not received
for len(s.sh) > 0 && s.sh[0].frame.Seq == s.nextRecvSeq { for len(s.sh) > 0 && s.sh[0].frame.Seq == s.nextRecvSeq {
frame := heap.Pop(&s.sh).(*frameNode).frame frame := heap.Pop(&s.sh).(*frameNode).frame
if frame.Closing == 1 {
// empty data indicates closing signal
s.sortedBufCh <- []byte{}
return
}
s.pushFrame(frame) s.pushFrame(frame)
} }
} }
@ -111,11 +121,6 @@ func (s *Stream) recvNewFrame() {
} }
func (s *Stream) pushFrame(f *Frame) { func (s *Stream) pushFrame(f *Frame) {
if f.Closing == 1 {
// empty data indicates closing signal
s.sortedBufCh <- []byte{}
return
}
s.sortedBufCh <- f.Payload s.sortedBufCh <- f.Payload
s.nextRecvSeq += 1 s.nextRecvSeq += 1
if s.nextRecvSeq == 0 { // getting wrapped if s.nextRecvSeq == 0 { // getting wrapped