[Improve] MutexFactory does not need to be async

SkipRLimestone · Nov 16, 2023 · f1e8eef · f1e8eef
1 parent 2235473
commit f1e8eef
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 26 deletions.
diff --git a/lib/src/bluetooth_characteristic.dart b/lib/src/bluetooth_characteristic.dart
@@ -101,7 +101,7 @@ class BluetoothCharacteristic {
     }
 
     // Only allow a single ble operation to be underway at a time
-    _Mutex mtx = await _MutexFactory.getMutexForKey("global");
+    _Mutex mtx = _MutexFactory.getMutexForKey("global");
     await mtx.take();
 
     // return value
@@ -172,7 +172,7 @@ class BluetoothCharacteristic {
     }
 
     // Only allow a single ble operation to be underway at a time
-    _Mutex mtx = await _MutexFactory.getMutexForKey("global");
+    _Mutex mtx = _MutexFactory.getMutexForKey("global");
     await mtx.take();
 
     try {
@@ -238,7 +238,7 @@ class BluetoothCharacteristic {
     }
 
     // Only allow a single ble operation to be underway at a time
-    _Mutex mtx = await _MutexFactory.getMutexForKey("global");
+    _Mutex mtx = _MutexFactory.getMutexForKey("global");
     await mtx.take();
 
     try {

diff --git a/lib/src/bluetooth_descriptor.dart b/lib/src/bluetooth_descriptor.dart
@@ -76,7 +76,7 @@ class BluetoothDescriptor {
     }
 
     // Only allow a single ble operation to be underway at a time
-    _Mutex mtx = await _MutexFactory.getMutexForKey("global");
+    _Mutex mtx = _MutexFactory.getMutexForKey("global");
     await mtx.take();
 
     // return value
@@ -134,7 +134,7 @@ class BluetoothDescriptor {
     }
 
     // Only allow a single ble operation to be underway at a time
-    _Mutex mtx = await _MutexFactory.getMutexForKey("global");
+    _Mutex mtx = _MutexFactory.getMutexForKey("global");
     await mtx.take();
 
     try {

diff --git a/lib/src/bluetooth_device.dart b/lib/src/bluetooth_device.dart
@@ -93,11 +93,11 @@ class BluetoothDevice {
     int? mtu = 512,
   }) async {
     // make sure no one else is calling disconnect
-    _Mutex dmtx = await _MutexFactory.getMutexForKey("disconnect");
+    _Mutex dmtx = _MutexFactory.getMutexForKey("disconnect");
     bool dtook = await dmtx.take();
 
     // Only allow a single ble operation to be underway at a time
-    _Mutex mtx = await _MutexFactory.getMutexForKey("global");
+    _Mutex mtx = _MutexFactory.getMutexForKey("global");
     await mtx.take();
 
     try {
@@ -165,11 +165,11 @@ class BluetoothDevice {
   ///     of the fbp operation queue, which is useful to cancel an in-progress connection attempt.
   Future<void> disconnect({int timeout = 35, bool queue = true}) async {
     // Only allow a single disconnect operation at a time
-    _Mutex dtx = await _MutexFactory.getMutexForKey("disconnect");
+    _Mutex dtx = _MutexFactory.getMutexForKey("disconnect");
     await dtx.take();
 
     // Only allow a single ble operation to be underway at a time?
-    _Mutex mtx = await _MutexFactory.getMutexForKey("global");
+    _Mutex mtx = _MutexFactory.getMutexForKey("global");
     if (queue) {
       await mtx.take();
     }
@@ -209,7 +209,7 @@ class BluetoothDevice {
     }
 
     // Only allow a single ble operation to be underway at a time
-    _Mutex mtx = await _MutexFactory.getMutexForKey("global");
+    _Mutex mtx = _MutexFactory.getMutexForKey("global");
     await mtx.take();
 
     List<BluetoothService> result = [];
@@ -324,7 +324,7 @@ class BluetoothDevice {
     }
 
     // Only allow a single ble operation to be underway at a time
-    _Mutex mtx = await _MutexFactory.getMutexForKey("global");
+    _Mutex mtx = _MutexFactory.getMutexForKey("global");
     await mtx.take();
 
     int rssi = 0;
@@ -375,7 +375,7 @@ class BluetoothDevice {
     }
 
     // Only allow a single ble operation to be underway at a time
-    _Mutex mtx = await _MutexFactory.getMutexForKey("global");
+    _Mutex mtx = _MutexFactory.getMutexForKey("global");
     await mtx.take();
 
     var mtu = 0;
@@ -482,7 +482,7 @@ class BluetoothDevice {
     }
 
     // Only allow a single ble operation to be underway at a time
-    _Mutex mtx = await _MutexFactory.getMutexForKey("global");
+    _Mutex mtx = _MutexFactory.getMutexForKey("global");
     await mtx.take();
 
     try {
@@ -525,7 +525,7 @@ class BluetoothDevice {
     }
 
     // Only allow a single ble operation to be underway at a time
-    _Mutex mtx = await _MutexFactory.getMutexForKey("global");
+    _Mutex mtx = _MutexFactory.getMutexForKey("global");
     await mtx.take();
 
     try {

diff --git a/lib/src/flutter_blue_plus.dart b/lib/src/flutter_blue_plus.dart
@@ -449,7 +449,7 @@ class FlutterBluePlus {
     dynamic out;
 
     // only allow 1 invocation at a time (guarentees that hot restart finishes)
-    _Mutex mtx = await _MutexFactory.getMutexForKey("invokeMethod");
+    _Mutex mtx = _MutexFactory.getMutexForKey("invokeMethod");
     await mtx.take();
 
     try {

diff --git a/lib/src/utils.dart b/lib/src/utils.dart
@@ -338,18 +338,10 @@ class _Mutex {
 
 // Create mutexes in a parrallel-safe way,
 class _MutexFactory {
-  static final _Mutex _global = _Mutex();
   static final Map<String, _Mutex> _all = {};
-
-  static Future<_Mutex> getMutexForKey(String key) async {
-    _Mutex? value;
-    await _global.take();
-    {
-      _all[key] ??= _Mutex();
-      value = _all[key];
-    }
-    _global.give();
-    return value!;
+  static _Mutex getMutexForKey(String key) {
+    _all[key] ??= _Mutex();
+    return _all[key]!;
   }
 }