change closed back to atomic<bool>

- revert more closed locking behavior #520
luxonis · Apr 24, 2023 · 45cb91c · 45cb91c
1 parent c9e8062
commit 45cb91c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 15 deletions.
diff --git a/include/depthai/device/DeviceBase.hpp b/include/depthai/device/DeviceBase.hpp
@@ -833,8 +833,7 @@ class DeviceBase {
     std::chrono::steady_clock::time_point lastWatchdogPingTime;
 
     // closed
-    mutable std::mutex closedMtx;
-    bool closed{false};
+    std::atomic<bool> closed{false};
 
     // pimpl
     class Impl;

diff --git a/include/depthai/xlink/XLinkConnection.hpp b/include/depthai/xlink/XLinkConnection.hpp
@@ -133,8 +133,7 @@ class XLinkConnection {
     DeviceInfo deviceInfo;
 
     // closed
-    mutable std::mutex closedMtx;
-    bool closed{false};
+    std::atomic<bool> closed{false};
 
     constexpr static std::chrono::milliseconds WAIT_FOR_BOOTUP_TIMEOUT{15000};
     constexpr static std::chrono::milliseconds WAIT_FOR_CONNECT_TIMEOUT{5000};

diff --git a/src/device/DeviceBase.cpp b/src/device/DeviceBase.cpp
@@ -390,11 +390,10 @@ DeviceBase::DeviceBase(Config config, const DeviceInfo& devInfo) : deviceInfo(de
 }
 
 void DeviceBase::close() {
-    std::unique_lock<std::mutex> lock(closedMtx);
-    if(!closed) {
-        closeImpl();
-        closed = true;
-    }
+    // Only allow to close once
+    if(closed.exchange(true)) return;
+
+    closeImpl();
 }
 
 void DeviceBase::closeImpl() {
@@ -430,7 +429,6 @@ void DeviceBase::closeImpl() {
 // is invalidated during the return by value and continues to degrade in
 // validity to the caller
 bool DeviceBase::isClosed() const {
-    std::unique_lock<std::mutex> lock(closedMtx);
     return closed || !watchdogRunning;
 }
 

diff --git a/src/xlink/XLinkConnection.cpp b/src/xlink/XLinkConnection.cpp
@@ -291,13 +291,11 @@ XLinkConnection::XLinkConnection(const DeviceInfo& deviceDesc, XLinkDeviceState_
 // within the context of the lock_guard. The value is immediately invalid and outdated
 // when it is returned by value to the caller
 bool XLinkConnection::isClosed() const {
-    std::lock_guard<std::mutex> lock(closedMtx);
     return closed;
 }
 
 void XLinkConnection::close() {
-    std::lock_guard<std::mutex> lock(closedMtx);
-    if(closed) return;
+    if(closed.exchange(true)) return;
 
     constexpr auto RESET_TIMEOUT = 2s;
     constexpr auto BOOTUP_SEARCH = 5s;
@@ -332,8 +330,6 @@ void XLinkConnection::close() {
 
         spdlog::debug("XLinkResetRemote of linkId: ({})", previousLinkId);
     }
-
-    closed = true;
 }
 
 XLinkConnection::~XLinkConnection() {