[system] remove unique_lock usage as it brings system_error, locales etc

particle-iot · Jul 20, 2020 · 9630aa8 · 9630aa8
1 parent d46db3f
commit 9630aa8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/system/src/system_cloud_internal.h b/system/src/system_cloud_internal.h
@@ -165,10 +165,11 @@ class CloudConnectionSettings {
 
     CloudDisconnectOptions takePendingDisconnectOptions() {
         CloudDisconnectOptions pending;
-        std::unique_lock<SimpleAtomicFlagMutex> lock(mutex_);
-        using std::swap;
-        swap(pending, pendingDisconnectOptions_);
-        lock.unlock();
+        {
+            std::lock_guard<SimpleAtomicFlagMutex> lock(mutex_);
+            using std::swap;
+            swap(pending, pendingDisconnectOptions_);
+        }
         CloudDisconnectOptions result;
         if (pending.isGracefulSet()) {
             result.graceful(pending.graceful());

diff --git a/system/src/system_setup.cpp b/system/src/system_setup.cpp
@@ -217,7 +217,11 @@ template<typename Config> void SystemSetupConsole<Config>::loop(void)
     }
 #endif
 
-    TRY_LOCK(serial)
+    // FIXME: our TRY_LOCK() implementation uses std::unique_lock, which brings
+    // a lot of unnecessary checks that cause locales and c++ system_error to be
+    // compiled in. Just call try_lock() for now manually.
+    // TRY_LOCK(serial)
+    if (serial.try_lock())
     {
         if (serial.available())
         {
@@ -234,6 +238,7 @@ template<typename Config> void SystemSetupConsole<Config>::loop(void)
                 }
             }
         }
+        serial.unlock();
     }
 }