morgan/macos-stats
1
0
Fork 0
mirror of https://github.com/morgan9e/macos-stats synced 2026-04-15 00:34:08 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix: fixed the forever loop in ICMP setup after adding an option to set the update interval for that reader (#2625)

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2025-07-14 17:51:13 +02:00
parent e67961038d
commit 6ce8497277
1 changed files with 17 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
Modules/Net/readers.swift
View File

@@ -669,42 +669,26 @@ internal class ConnectivityReader: Reader<Network_Connectivity> {
private var _status: Bool? = nil private var _status: Bool? = nil
private var status: Bool? { private var status: Bool? {
get { get { self.variablesQueue.sync { self._status } }
self.variablesQueue.sync { self._status } set { self.variablesQueue.sync { self._status = newValue } }
}
set {
self.variablesQueue.sync { self._status = newValue }
}
} }
private var _timeoutTimer: Timer? private var _timeoutTimer: Timer?
private var timeoutTimer: Timer? { private var timeoutTimer: Timer? {
get { get { self.variablesQueue.sync { self._timeoutTimer } }
self.variablesQueue.sync { self._timeoutTimer } set { self.variablesQueue.sync { self._timeoutTimer = newValue } }
}
set {
self.variablesQueue.sync { self._timeoutTimer = newValue }
}
} }
private var _isPinging: Bool = false private var _isPinging: Bool = false
private var isPinging: Bool { private var isPinging: Bool {
get { get { self.variablesQueue.sync { self._isPinging } }
self.variablesQueue.sync { self._isPinging } set { self.variablesQueue.sync { self._isPinging = newValue } }
}
set {
self.variablesQueue.sync { self._isPinging = newValue }
}
} }
private var _latency: Double? = nil private var _latency: Double? = nil
private var latency: Double? { private var latency: Double? {
get { get { self.variablesQueue.sync { self._latency } }
self.variablesQueue.sync { self._latency } set { self.variablesQueue.sync { self._latency = newValue } }
}
set {
self.variablesQueue.sync { self._latency = newValue }
}
} }
var start: DispatchTime? = nil var start: DispatchTime? = nil
@@ -733,6 +717,14 @@ internal class ConnectivityReader: Reader<Network_Connectivity> {
override func setup() { override func setup() {
self.setInterval(Store.shared.int(key: "Network_updateICMPInterval", defaultValue: 1)) self.setInterval(Store.shared.int(key: "Network_updateICMPInterval", defaultValue: 1))
self.prepare()
}
deinit {
self.closeConn()
}
private func prepare() {
DispatchQueue.global(qos: .background).async { DispatchQueue.global(qos: .background).async {
self.addr = self.resolve() self.addr = self.resolve()
self.openConn() self.openConn()
@@ -740,10 +732,6 @@ internal class ConnectivityReader: Reader<Network_Connectivity> {
} }
} }
deinit {
self.closeConn()
}
override func read() { override func read() {
guard !self.host.isEmpty else { guard !self.host.isEmpty else {
if self.socket != nil { if self.socket != nil {
@@ -753,7 +741,7 @@ internal class ConnectivityReader: Reader<Network_Connectivity> {
} }
if self.socket == nil { if self.socket == nil {
self.setup() self.prepare()
} }
if self.lastHost != self.host { if self.lastHost != self.host {