refactor(mac): lock once for the whole updateUI operation

tearfur · tearfur · commit 641458c9dc4e · 2025-12-17T16:45:07.000+08:00
diff --git a/libtransmission/session.cc b/libtransmission/session.cc
@@ -460,6 +460,13 @@ tr_address tr_session::bind_address(tr_address_type type) const noexcept
 
 // ---
 
+std::unique_lock<std::recursive_mutex> tr_sessionLock(tr_session const* const session)
+{
+    return session->unique_lock();
+}
+
+// ---
+
 tr_variant tr_sessionGetDefaultSettings()
 {
     auto ret = tr_variant::make_map();
diff --git a/libtransmission/transmission.h b/libtransmission/transmission.h
@@ -16,6 +16,7 @@
 
 #ifdef __cplusplus
 #include <functional>
+#include <mutex>
 #include <string>
 #include <string_view>
 #else
@@ -143,6 +144,8 @@ inline auto constexpr TrDefaultPeerLimitGlobal = 200U;
 #define TR_DEFAULT_PEER_LIMIT_TORRENT_STR "50"
 inline auto constexpr TrDefaultPeerLimitTorrent = 50U;
 
+std::unique_lock<std::recursive_mutex> tr_sessionLock(tr_session const* session);
+
 /**
  * Add libtransmission's default settings to the benc dictionary.
  *
diff --git a/macosx/Controller.mm b/macosx/Controller.mm
@@ -2368,16 +2368,20 @@ - (void)updateUI
     BOOL anyCompleted = NO;
     BOOL anyActive = NO;
 
-    for (Torrent* torrent in self.fTorrents)
     {
-        [torrent update];
+        // avoid having to wait for the same lock multiple times in the same operation
+        auto const lock = tr_sessionLock(self.sessionHandle);
+        for (Torrent* torrent in self.fTorrents)
+        {
+            [torrent update];
 
-        //pull the upload and download speeds - most consistent by using current stats
-        dlRate += torrent.downloadRate;
-        ulRate += torrent.uploadRate;
+            //pull the upload and download speeds - most consistent by using current stats
+            dlRate += torrent.downloadRate;
+            ulRate += torrent.uploadRate;
 
-        anyCompleted |= torrent.finishedSeeding;
-        anyActive |= torrent.active && !torrent.stalled && !torrent.error;
+            anyCompleted |= torrent.finishedSeeding;
+            anyActive |= torrent.active && !torrent.stalled && !torrent.error;
+        }
     }
 
     PowerManager.shared.shouldPreventSleep = anyActive && [self.fDefaults boolForKey:@"SleepPrevent"];
