Use ThreadSafeBox

Author: yim-lee

Sources/Basics/ConcurrencyHelpers.swift

@@ -67,7 +67,7 @@ public final class ThreadSafeKeyValueStore<Key, Value> where Key: Hashable {
     }
 }
 
-/// Thread-safe value boxing  structure
+/// Thread-safe value boxing structure
 public final class ThreadSafeBox<Value> {
     private var underlying: Value?
     private let lock = Lock()

Sources/PackageCollections/Storage/SQLitePackageCollectionsStorage.swift

@@ -44,8 +44,7 @@ final class SQLitePackageCollectionsStorage: PackageCollectionsStorage, Closable
     private let ftsLock = Lock()
 
     private let targetTrie = Trie<CollectionPackage>()
-    private var targetTrieReady = false
-    private let targetTrieReadyLock = Lock()
+    private var targetTrieReady = ThreadSafeBox<Bool>(false)
 
     init(location: SQLite.Location? = nil, diagnosticsEngine: DiagnosticsEngine? = nil) {
         self.location = location ?? .path(localFileSystem.swiftPMCacheDirectory.appending(components: "package-collection.db"))
@@ -433,7 +432,7 @@ final class SQLitePackageCollectionsStorage: PackageCollectionsStorage, Closable
             case .success(let collections):
                 var matches = [(collection: Model.CollectionIdentifier, package: PackageIdentity, targetName: String)]()
                 // Trie is more performant for target search; use it if available
-                if self.targetTrieReadyLock.withLock({ self.targetTrieReady }) {
+                if self.targetTrieReady.get() ?? false {
                     do {
                         switch type {
                         case .exactMatch:
@@ -657,10 +656,10 @@ final class SQLitePackageCollectionsStorage: PackageCollectionsStorage, Closable
                         }
                     }
                 }
-                self.targetTrieReadyLock.withLock { self.targetTrieReady = true }
+                self.targetTrieReady.put(true)
                 callback(.success(()))
             } catch {
-                self.targetTrieReadyLock.withLock { self.targetTrieReady = false }
+                self.targetTrieReady.put(false)
                 callback(.failure(error))
             }
         }