lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-01-06 01:05:35 -05:00
Code Issues Releases Wiki Activity

non-blocking timer. Fixes #848

Browse Source
This commit is contained in:
Darien Raymond
2018-02-06 11:16:49 +01:00
parent 3a0f211c22
commit ede2c39967
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/signal/timer.go
View File

@@ -12,6 +12,7 @@ type ActivityUpdater interface {
type ActivityTimer struct {
updated chan bool
timeout chan time.Duration
closing chan bool
}
func (t *ActivityTimer) Update() {
@@ -22,11 +23,17 @@ func (t *ActivityTimer) Update() {
}
func (t *ActivityTimer) SetTimeout(timeout time.Duration) {
t.timeout <- timeout
select {
case <-t.closing:
case t.timeout <- timeout:
}
}
func (t *ActivityTimer) run(ctx context.Context, cancel context.CancelFunc) {
defer cancel()
defer func() {
cancel()
close(t.closing)
}()
timeout := <-t.timeout
if timeout == 0 {
@@ -66,6 +73,7 @@ func CancelAfterInactivity(ctx context.Context, cancel context.CancelFunc, timeo
timer := &ActivityTimer{
timeout: make(chan time.Duration, 1),
updated: make(chan bool, 1),
closing: make(chan bool),
}
timer.timeout <- timeout
go timer.run(ctx, cancel)