Cleanup from code review feedback

sharwell · sharwell · commit 9c28f4adc548 · 2018-03-20T13:19:11.000-05:00
diff --git a/src/Features/Core/Portable/SolutionCrawler/WorkCoordinator.SemanticChangeProcessor.cs b/src/Features/Core/Portable/SolutionCrawler/WorkCoordinator.SemanticChangeProcessor.cs
@@ -49,16 +49,10 @@ public SemanticChangeProcessor(
 
                     Start();
 
+                    // Register a clean-up task to ensure pending work items are flushed from the queue if they will
+                    // never be processed.
                     AsyncProcessorTask.ContinueWith(
-                        _ =>
-                        {
-                            foreach (var (documentId, data) in _pendingWork)
-                            {
-                                data.AsyncToken.Dispose();
-                            }
-
-                            _pendingWork.Clear();
-                        },
+                        _ => ClearQueueWorker(_workGate, _pendingWork, data => data.AsyncToken),
                         CancellationToken.None,
                         TaskContinuationOptions.ExecuteSynchronously,
                         TaskScheduler.Default);
@@ -296,6 +290,19 @@ private static TValue DequeueWorker<TKey, TValue>(NonReentrantLock gate, Diction
                     }
                 }
 
+                private static void ClearQueueWorker<TKey, TValue>(NonReentrantLock gate, Dictionary<TKey, TValue> map, Func<TValue, IDisposable> disposerSelector)
+                {
+                    using (gate.DisposableWait(CancellationToken.None))
+                    {
+                        foreach (var (_, data) in map)
+                        {
+                            disposerSelector?.Invoke(data)?.Dispose();
+                        }
+
+                        map.Clear();
+                    }
+                }
+
                 private static IEnumerable<ProjectId> GetProjectsToAnalyze(Solution solution, ProjectId projectId)
                 {
                     var graph = solution.GetProjectDependencyGraph();
@@ -354,16 +361,10 @@ public ProjectProcessor(
 
                         Start();
 
+                        // Register a clean-up task to ensure pending work items are flushed from the queue if they will
+                        // never be processed.
                         AsyncProcessorTask.ContinueWith(
-                            _ =>
-                            {
-                                foreach (var (projectId, data) in _pendingWork)
-                                {
-                                    data.AsyncToken.Dispose();
-                                }
-
-                                _pendingWork.Clear();
-                            },
+                            _ => ClearQueueWorker(_workGate, _pendingWork, data => data.AsyncToken),
                             CancellationToken.None,
                             TaskContinuationOptions.ExecuteSynchronously,
                             TaskScheduler.Default);
diff --git a/src/Workspaces/Core/Portable/Workspace/PrimaryWorkspace.cs b/src/Workspaces/Core/Portable/Workspace/PrimaryWorkspace.cs
@@ -10,8 +10,8 @@ namespace Microsoft.CodeAnalysis
     [Export(typeof(PrimaryWorkspace)), Shared]
     internal sealed class PrimaryWorkspace
     {
-        private readonly ReaderWriterLockSlim s_registryGate = new ReaderWriterLockSlim(LockRecursionPolicy.NoRecursion);
-        private Workspace s_primaryWorkspace;
+        private readonly ReaderWriterLockSlim _registryGate = new ReaderWriterLockSlim(LockRecursionPolicy.NoRecursion);
+        private Workspace _primaryWorkspace;
 
         [ImportingConstructor]
         public PrimaryWorkspace()
@@ -25,9 +25,9 @@ public Workspace Workspace
         {
             get
             {
-                using (s_registryGate.DisposableRead())
+                using (_registryGate.DisposableRead())
                 {
-                    return s_primaryWorkspace;
+                    return _primaryWorkspace;
                 }
             }
         }
@@ -42,9 +42,9 @@ public void Register(Workspace workspace)
                 throw new ArgumentNullException(nameof(workspace));
             }
 
-            using (s_registryGate.DisposableWrite())
+            using (_registryGate.DisposableWrite())
             {
-                s_primaryWorkspace = workspace;
+                _primaryWorkspace = workspace;
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ namespace Microsoft.CodeAnalysis`
`10`	`10`	`[Export(typeof(PrimaryWorkspace)), Shared]`
`11`	`11`	`internal sealed class PrimaryWorkspace`
`12`	`12`	`{`
`13`		`- private readonly ReaderWriterLockSlim s_registryGate = new ReaderWriterLockSlim(LockRecursionPolicy.NoRecursion);`
`14`		`- private Workspace s_primaryWorkspace;`
	`13`	`+ private readonly ReaderWriterLockSlim _registryGate = new ReaderWriterLockSlim(LockRecursionPolicy.NoRecursion);`
	`14`	`+ private Workspace _primaryWorkspace;`
`15`	`15`
`16`	`16`	`[ImportingConstructor]`
`17`	`17`	`public PrimaryWorkspace()`
`@@ -25,9 +25,9 @@ public Workspace Workspace`
`25`	`25`	`{`
`26`	`26`	`get`
`27`	`27`	`{`
`28`		`- using (s_registryGate.DisposableRead())`
	`28`	`+ using (_registryGate.DisposableRead())`
`29`	`29`	`{`
`30`		`- return s_primaryWorkspace;`
	`30`	`+ return _primaryWorkspace;`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`	`}`
`@@ -42,9 +42,9 @@ public void Register(Workspace workspace)`
`42`	`42`	`throw new ArgumentNullException(nameof(workspace));`
`43`	`43`	`}`
`44`	`44`
`45`		`- using (s_registryGate.DisposableWrite())`
	`45`	`+ using (_registryGate.DisposableWrite())`
`46`	`46`	`{`
`47`		`- s_primaryWorkspace = workspace;`
	`47`	`+ _primaryWorkspace = workspace;`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`	`}`