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 race condition in the Bluetooth module (#591)

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2021-08-27 18:11:43 +02:00
parent f3632e529d
commit d49eef9020
4 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Modules/Bluetooth/readers.swift
View File

@@ -15,13 +15,35 @@ import CoreBluetooth
import IOBluetooth
internal class DevicesReader: Reader<[BLEDevice]>, CBCentralManagerDelegate, CBPeripheralDelegate {
private var devices: [BLEDevice] = []
private let queue = DispatchQueue(label: "eu.exelban.Stats.Bluetooth.reader", attributes: .concurrent)
private var manager: CBCentralManager!
private var uuidAddress: [UUID: String] = [:]
private var _devices: [BLEDevice] = []
private var _uuidAddress: [UUID: String] = [:]
private var peripherals: [CBPeripheral] = []
private var characteristicsDict: [UUID: CBCharacteristic] = [:]
private var devices: [BLEDevice] {
get {
self.queue.sync { self._devices }
}
set {
self.queue.async(flags: .barrier) {
self._devices = newValue
}
}
}
private var uuidAddress: [UUID: String] {
get {
self.queue.sync { self._uuidAddress }
}
set {
self.queue.async(flags: .barrier) {
self._uuidAddress = newValue
}
}
}
private let batteryServiceUUID = CBUUID(string: "0x180F")
private let batteryCharacteristicsUUID = CBUUID(string: "0x2A19")
@@ -89,7 +111,7 @@ internal class DevicesReader: Reader<[BLEDevice]>, CBCentralManagerDelegate, CBP
return
}
if let uuid = UUID(uuidString: key) {
if let uuid = UUID(uuidString: key), self.uuidAddress[uuid] == nil {
self.uuidAddress[uuid] = value
}
}