Alawn/ShadowsocksX-NG-R
1
0
Fork 0
mirror of https://github.com/qinyuhang/ShadowsocksX-NG-R.git synced 2026-10-20 14:34:30 +00:00
Code Releases Activity

Merge pull request #168 from mcfans/develop

Browse Source 
the ping process thread-safe now
This commit is contained in:
秦宇航
2017-06-10 00:30:30 +08:00
committed by GitHub
parent 9eeb0233ab 2d331b2bd0
commit 15833de218
1 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ShadowsocksX-NG/PingClient.swift
+14 -16
View File
@@ -144,23 +144,25 @@ class PingServers:NSObject{
if let latency = $0{
self.SerMgr.profiles[k].latency = String(latency)
synchronized(lock: result as AnyObject){
result.append(k,latency)
}
DispatchQueue.main.async {
// do the UI update HERE
(NSApplication.shared().delegate as! AppDelegate).updateServersMenu()
(NSApplication.shared().delegate as! AppDelegate).updateRunningModeMenu()
}
}
})
}
// after two seconds ,time out
delay(3){
DispatchQueue.main.async {
for k in 0..<self.SerMgr.profiles.count {
if let late = self.SerMgr.profiles[k].latency{
if let latency = Double(late){
result.append((k,latency))
}
}
}
(NSApplication.shared().delegate as! AppDelegate).updateServersMenu()
(NSApplication.shared().delegate as! AppDelegate).updateRunningModeMenu()
// do the UI update HERE
if let min = result.min(by: {$0.1 < $1.1}){
self.fastest = String(describing: min.1)
@@ -218,11 +220,7 @@ typealias Task = (_ cancel : Bool) -> Void
}
func synchronized(lock: AnyObject, closure: () -> ()) {
objc_sync_enter(lock)
closure()
objc_sync_exit(lock)
}
func cancel(_ task: Task?) {
task?(true)
}