github/nps
1
0
Fork 0
mirror of https://github.com/ehang-io/nps.git synced 2025-08-31 17:56:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix mux conn release race condition, add gui

Browse Source
This commit is contained in:
ffdfgdfg
2019-12-13 22:26:41 +08:00
parent 6703a98419
commit fa3beabfaf
4 changed files with 225 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/mux/conn.go
View File

@@ -293,8 +293,8 @@ copyData:
// reset to 60s if timeout and data still available
Self.off = 0
if err != nil {
Self.CloseWindow() // also close the window, to avoid read twice
return // queue receive stop or time out, break the loop and return
Self.CloseWindow() // also close the window, to avoid read twice
return // queue receive stop or time out, break the loop and return
}
//logs.Warn("pop element", Self.element.l, Self.element.part)
}
@@ -362,14 +362,14 @@ func (Self *ReceiveWindow) release() {
// common.ListElementPool.Put(Self.element)
//}
for {
Self.element = Self.bufQueue.TryPop()
if Self.element == nil {
ele := Self.bufQueue.TryPop()
if ele == nil {
return
}
if Self.element.Buf != nil {
common.WindowBuff.Put(Self.element.Buf)
if ele.Buf != nil {
common.WindowBuff.Put(ele.Buf)
}
common.ListElementPool.Put(Self.element)
common.ListElementPool.Put(ele)
} // release resource
}