OrgGo
/
clash
mirror of https://github.com/Dreamacro/clash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Optimization: use context in urltest speed test (#356)

This commit is contained in:
comwrg 2019-10-13 12:11:26 +08:00 committed by Dreamacro
parent 461e0a6873
commit 2c82a2bfc8
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
adapters/outbound/urltest.go
View File

@ -75,12 +75,15 @@ func (u *URLTest) Destroy() {
func (u *URLTest) loop() { func (u *URLTest) loop() {
tick := time.NewTicker(u.interval) tick := time.NewTicker(u.interval)
go u.speedTest() ctx, cancel := context.WithCancel(context.Background())
defer cancel()
go u.speedTest(ctx)
Loop: Loop:
for { for {
select { select {
case <-tick.C: case <-tick.C:
go u.speedTest() go u.speedTest(ctx)
case <-u.done: case <-u.done:
break Loop break Loop
} }
@ -104,13 +107,13 @@ func (u *URLTest) fallback() {
u.fast = fast u.fast = fast
} }
func (u *URLTest) speedTest() { func (u *URLTest) speedTest(ctx context.Context) {
if !atomic.CompareAndSwapInt32(&u.once, 0, 1) { if !atomic.CompareAndSwapInt32(&u.once, 0, 1) {
return return
} }
defer atomic.StoreInt32(&u.once, 0) defer atomic.StoreInt32(&u.once, 0)
ctx, cancel := context.WithTimeout(context.Background(), defaultURLTestTimeout) ctx, cancel := context.WithTimeout(ctx, defaultURLTestTimeout)
defer cancel() defer cancel()
picker := picker.WithoutAutoCancel(ctx) picker := picker.WithoutAutoCancel(ctx)
for _, p := range u.proxies { for _, p := range u.proxies {