history-museum/Clash.Meta
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: a shared fastSingle.Do() may cause providers untouched (#2378)

Browse Source
This commit is contained in:
wwqgtxx
2022-11-04 13:11:01 +08:00
committed by GitHub
parent c8bc11d61d
commit 19b7c7f52a
4 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
adapter/outboundgroup/common.go
View File

@ -11,14 +11,19 @@ const (
defaultGetProxiesDuration = time.Second * 5
)
func touchProviders(providers []provider.ProxyProvider) {
for _, provider := range providers {
provider.Touch()
}
}
func getProvidersProxies(providers []provider.ProxyProvider, touch bool) []C.Proxy {
proxies := []C.Proxy{}
for _, provider := range providers {
if touch {
proxies = append(proxies, provider.ProxiesWithTouch()...)
} else {
proxies = append(proxies, provider.Proxies()...)
provider.Touch()
}
proxies = append(proxies, provider.Proxies()...)
}
return proxies
}

5
adapter/outboundgroup/urltest.go
View File

@ -66,7 +66,7 @@ func (u *URLTest) proxies(touch bool) []C.Proxy {
}
func (u *URLTest) fast(touch bool) C.Proxy {
elm, _, _ := u.fastSingle.Do(func() (any, error) {
elm, _, shared := u.fastSingle.Do(func() (any, error) {
proxies := u.proxies(touch)
fast := proxies[0]
min := fast.LastDelay()
@ -95,6 +95,9 @@ func (u *URLTest) fast(touch bool) C.Proxy {
return u.fastNode, nil
})
if shared && touch { // a shared fastSingle.Do() may cause providers untouched, so we touch them again
touchProviders(u.providers)
}
return elm.(C.Proxy)
}