Remove locking overhead during serial analysis phase

peripheryapp · Aug 20, 2024 · 531b0aa · 531b0aa
1 parent 35dfcdb
commit 531b0aa
Show file tree

Hide file tree

Showing 10 changed files with 145 additions and 123 deletions.
diff --git a/Sources/Frontend/Scan.swift b/Sources/Frontend/Scan.swift
@@ -70,7 +70,8 @@ final class Scan {
 
         let indexLogger = logger.contextualized(with: "index")
         let plan = try driver.plan(logger: indexLogger)
-        let pipeline = IndexPipeline(plan: plan, graph: graph, logger: indexLogger)
+        let syncSourceGraph = SynchronizedSourceGraph(graph: graph)
+        let pipeline = IndexPipeline(plan: plan, graph: syncSourceGraph, logger: indexLogger)
         try pipeline.perform()
         logger.endInterval(indexInterval)
     }

diff --git a/Sources/Indexer/IndexPipeline.swift b/Sources/Indexer/IndexPipeline.swift
@@ -4,10 +4,10 @@ import SourceGraph
 
 public struct IndexPipeline {
     private let plan: IndexPlan
-    private let graph: SourceGraph
+    private let graph: SynchronizedSourceGraph
     private let logger: ContextualLogger
 
-    public init(plan: IndexPlan, graph: SourceGraph, logger: ContextualLogger) {
+    public init(plan: IndexPlan, graph: SynchronizedSourceGraph, logger: ContextualLogger) {
         self.plan = plan
         self.graph = graph
         self.logger = logger

diff --git a/Sources/Indexer/InfoPlistIndexer.swift b/Sources/Indexer/InfoPlistIndexer.swift
@@ -4,10 +4,10 @@ import SystemPackage
 
 final class InfoPlistIndexer: Indexer {
     private let infoPlistFiles: Set<FilePath>
-    private let graph: SourceGraph
+    private let graph: SynchronizedSourceGraph
     private let logger: ContextualLogger
 
-    required init(infoPlistFiles: Set<FilePath>, graph: SourceGraph, logger: Logger = .init(), configuration: Configuration = .shared) {
+    required init(infoPlistFiles: Set<FilePath>, graph: SynchronizedSourceGraph, logger: Logger = .init(), configuration: Configuration = .shared) {
         self.infoPlistFiles = infoPlistFiles
         self.graph = graph
         self.logger = logger.contextualized(with: "index:infoplist")

diff --git a/Sources/Indexer/SwiftIndexer.swift b/Sources/Indexer/SwiftIndexer.swift
@@ -12,13 +12,13 @@ public struct IndexUnit {
 
 final class SwiftIndexer: Indexer {
     private let sourceFiles: [SourceFile: [IndexUnit]]
-    private let graph: SourceGraph
+    private let graph: SynchronizedSourceGraph
     private let logger: ContextualLogger
     private let configuration: Configuration
 
     required init(
         sourceFiles: [SourceFile: [IndexUnit]],
-        graph: SourceGraph,
+        graph: SynchronizedSourceGraph,
         logger: ContextualLogger,
         configuration: Configuration = .shared
     ) {
@@ -82,7 +82,7 @@ final class SwiftIndexer: Indexer {
         let sourceFile: SourceFile
 
         private let units: [IndexUnit]
-        private let graph: SourceGraph
+        private let graph: SynchronizedSourceGraph
         private let logger: ContextualLogger
         private let configuration: Configuration
         private var retainAllDeclarations: Bool
@@ -91,7 +91,7 @@ final class SwiftIndexer: Indexer {
             sourceFile: SourceFile,
             units: [IndexUnit],
             retainAllDeclarations: Bool,
-            graph: SourceGraph,
+            graph: SynchronizedSourceGraph,
             logger: ContextualLogger,
             configuration: Configuration
         ) {
@@ -202,11 +202,11 @@ final class SwiftIndexer: Indexer {
             }
 
             graph.withLock {
-                graph.addUnsafe(references)
-                graph.addUnsafe(newDeclarations)
+                graph.addWithoutLock(references)
+                graph.addWithoutLock(newDeclarations)
 
                 if retainAllDeclarations {
-                    graph.markRetainedUnsafe(newDeclarations)
+                    graph.markRetainedWithoutLock(newDeclarations)
                 }
             }
 
@@ -252,10 +252,10 @@ final class SwiftIndexer: Indexer {
         private func establishDeclarationHierarchy() {
             graph.withLock {
                 for (parent, decls) in childDeclsByParentUsr {
-                    guard let parentDecl = graph.explicitDeclaration(withUsr: parent) else {
+                    guard let parentDecl = graph.explicitDeclarationWithoutLock(withUsr: parent) else {
                         if varParameterUsrs.contains(parent) {
                             // These declarations are children of a parameter and are redundant.
-                            decls.forEach { graph.removeUnsafe($0) }
+                            decls.forEach { graph.removeWithoutLock($0) }
                         }
 
                         continue
@@ -273,7 +273,7 @@ final class SwiftIndexer: Indexer {
         private func associateLatentReferences() {
             for (usr, refs) in referencesByUsr {
                 graph.withLock {
-                    if let decl = graph.explicitDeclaration(withUsr: usr) {
+                    if let decl = graph.explicitDeclarationWithoutLock(withUsr: usr) {
                         for ref in refs {
                             associateUnsafe(ref, with: decl)
                         }
@@ -454,14 +454,14 @@ final class SwiftIndexer: Indexer {
                     for param in params {
                         let paramDecl = param.makeDeclaration(withParent: functionDecl)
                         functionDecl.unusedParameters.insert(paramDecl)
-                        graph.addUnsafe(paramDecl)
+                        graph.addWithoutLock(paramDecl)
 
                         if retainAllDeclarations {
-                            graph.markRetainedUnsafe(paramDecl)
+                            graph.markRetainedWithoutLock(paramDecl)
                         }
 
                         if (functionDecl.isObjcAccessible && configuration.retainObjcAccessible) || ignoredParamNames.contains(param.name) {
-                            graph.markRetainedUnsafe(paramDecl)
+                            graph.markRetainedWithoutLock(paramDecl)
                         }
                     }
                 }

diff --git a/Sources/Indexer/XCDataModelIndexer.swift b/Sources/Indexer/XCDataModelIndexer.swift
@@ -4,10 +4,10 @@ import SystemPackage
 
 final class XCDataModelIndexer: Indexer {
     private let files: Set<FilePath>
-    private let graph: SourceGraph
+    private let graph: SynchronizedSourceGraph
     private let logger: ContextualLogger
 
-    required init(files: Set<FilePath>, graph: SourceGraph, logger: Logger = .init(), configuration: Configuration = .shared) {
+    required init(files: Set<FilePath>, graph: SynchronizedSourceGraph, logger: Logger = .init(), configuration: Configuration = .shared) {
         self.files = files
         self.graph = graph
         self.logger = logger.contextualized(with: "index:xcdatamodel")

diff --git a/Sources/Indexer/XCMappingModelIndexer.swift b/Sources/Indexer/XCMappingModelIndexer.swift
@@ -4,10 +4,10 @@ import SystemPackage
 
 final class XCMappingModelIndexer: Indexer {
     private let files: Set<FilePath>
-    private let graph: SourceGraph
+    private let graph: SynchronizedSourceGraph
     private let logger: ContextualLogger
 
-    required init(files: Set<FilePath>, graph: SourceGraph, logger: Logger = .init(), configuration: Configuration = .shared) {
+    required init(files: Set<FilePath>, graph: SynchronizedSourceGraph, logger: Logger = .init(), configuration: Configuration = .shared) {
         self.files = files
         self.graph = graph
         self.logger = logger.contextualized(with: "index:xcmappingmodel")

diff --git a/Sources/Indexer/XibIndexer.swift b/Sources/Indexer/XibIndexer.swift
@@ -4,10 +4,10 @@ import SystemPackage
 
 final class XibIndexer: Indexer {
     private let xibFiles: Set<FilePath>
-    private let graph: SourceGraph
+    private let graph: SynchronizedSourceGraph
     private let logger: ContextualLogger
 
-    required init(xibFiles: Set<FilePath>, graph: SourceGraph, logger: Logger = .init(), configuration: Configuration = .shared) {
+    required init(xibFiles: Set<FilePath>, graph: SynchronizedSourceGraph, logger: Logger = .init(), configuration: Configuration = .shared) {
         self.xibFiles = xibFiles
         self.graph = graph
         self.logger = logger.contextualized(with: "index:xib")