kirillius
/
Cloak
mirror of https://github.com/cbeuw/Cloak
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix memory leaking by extra timers.

This commit is contained in:
notsure2 2020-12-06 01:47:52 +02:00
parent c0040f20c3
commit 208a7f249f
2 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
internal/multiplex/datagramBufferedPipe.go
View File

@ -20,6 +20,8 @@ type datagramBufferedPipe struct {
rwCond *sync.Cond rwCond *sync.Cond
wtTimeout time.Duration wtTimeout time.Duration
rDeadline time.Time rDeadline time.Time
timeoutTimer *time.Timer
} }
func NewDatagramBufferedPipe() *datagramBufferedPipe { func NewDatagramBufferedPipe() *datagramBufferedPipe {
@ -45,7 +47,7 @@ func (d *datagramBufferedPipe) Read(target []byte) (int, error) {
if delta <= 0 { if delta <= 0 {
return 0, ErrTimeout return 0, ErrTimeout
} }
time.AfterFunc(delta, d.rwCond.Broadcast) d.broadcastAfter(delta)
} }
if len(d.pLens) > 0 { if len(d.pLens) > 0 {
@ -81,13 +83,9 @@ func (d *datagramBufferedPipe) WriteTo(w io.Writer) (n int64, err error) {
} }
if d.wtTimeout == 0 { if d.wtTimeout == 0 {
// if there hasn't been a scheduled broadcast // if there hasn't been a scheduled broadcast
time.AfterFunc(delta, d.rwCond.Broadcast) d.broadcastAfter(delta)
} }
} }
if d.wtTimeout != 0 {
d.rDeadline = time.Now().Add(d.wtTimeout)
time.AfterFunc(d.wtTimeout, d.rwCond.Broadcast)
}
if len(d.pLens) > 0 { if len(d.pLens) > 0 {
var dataLen int var dataLen int
@ -100,6 +98,11 @@ func (d *datagramBufferedPipe) WriteTo(w io.Writer) (n int64, err error) {
} }
d.rwCond.Broadcast() d.rwCond.Broadcast()
} else { } else {
if d.wtTimeout != 0 {
d.rDeadline = time.Now().Add(d.wtTimeout)
d.broadcastAfter(d.wtTimeout)
}
d.rwCond.Wait() d.rwCond.Wait()
} }
} }
@ -160,3 +163,10 @@ func (d *datagramBufferedPipe) SetWriteToTimeout(t time.Duration) {
d.wtTimeout = t d.wtTimeout = t
d.rwCond.Broadcast() d.rwCond.Broadcast()
} }
func (d *datagramBufferedPipe) broadcastAfter(t time.Duration) {
if d.timeoutTimer != nil {
d.timeoutTimer.Stop()
}
d.timeoutTimer = time.AfterFunc(t, d.rwCond.Broadcast)
}

21
internal/multiplex/streamBufferedPipe.go
View File

@ -18,6 +18,8 @@ type streamBufferedPipe struct {
rwCond *sync.Cond rwCond *sync.Cond
rDeadline time.Time rDeadline time.Time
wtTimeout time.Duration wtTimeout time.Duration
timeoutTimer *time.Timer
} }
func NewStreamBufferedPipe() *streamBufferedPipe { func NewStreamBufferedPipe() *streamBufferedPipe {
@ -42,7 +44,7 @@ func (p *streamBufferedPipe) Read(target []byte) (int, error) {
if d <= 0 { if d <= 0 {
return 0, ErrTimeout return 0, ErrTimeout
} }
time.AfterFunc(d, p.rwCond.Broadcast) p.broadcastAfter(d)
} }
if p.buf.Len() > 0 { if p.buf.Len() > 0 {
break break
@ -72,13 +74,9 @@ func (p *streamBufferedPipe) WriteTo(w io.Writer) (n int64, err error) {
} }
if p.wtTimeout == 0 { if p.wtTimeout == 0 {
// if there hasn't been a scheduled broadcast // if there hasn't been a scheduled broadcast
time.AfterFunc(d, p.rwCond.Broadcast) p.broadcastAfter(d)
} }
} }
if p.wtTimeout != 0 {
p.rDeadline = time.Now().Add(p.wtTimeout)
time.AfterFunc(p.wtTimeout, p.rwCond.Broadcast)
}
if p.buf.Len() > 0 { if p.buf.Len() > 0 {
written, er := p.buf.WriteTo(w) written, er := p.buf.WriteTo(w)
n += written n += written
@ -88,6 +86,10 @@ func (p *streamBufferedPipe) WriteTo(w io.Writer) (n int64, err error) {
} }
p.rwCond.Broadcast() p.rwCond.Broadcast()
} else { } else {
if p.wtTimeout != 0 {
p.rDeadline = time.Now().Add(p.wtTimeout)
p.broadcastAfter(p.wtTimeout)
}
p.rwCond.Wait() p.rwCond.Wait()
} }
} }
@ -139,3 +141,10 @@ func (p *streamBufferedPipe) SetWriteToTimeout(d time.Duration) {
p.wtTimeout = d p.wtTimeout = d
p.rwCond.Broadcast() p.rwCond.Broadcast()
} }
func (p *streamBufferedPipe) broadcastAfter(d time.Duration) {
if p.timeoutTimer != nil {
p.timeoutTimer.Stop()
}
p.timeoutTimer = time.AfterFunc(d, p.rwCond.Broadcast)
}