Speed up CancelAnalysis

Author: MikhailArkhipov

src/Analysis/Engine/Impl/Deque.cs

@@ -82,8 +82,6 @@ public void AppendLeft(T x) {
         }
 
         public void Clear() {
-            AssertScope();
-
             _version++;
 
             _head = _tail = 0;

src/Analysis/Engine/Impl/Intellisense/AnalysisQueue.cs

@@ -31,6 +31,7 @@ internal sealed class AnalysisQueue : IDisposable {
         private static readonly AsyncLocal<AnalysisQueue> _current = new AsyncLocal<AnalysisQueue>();
         public static AnalysisQueue Current => _current.Value;
 
+        private readonly DisposeToken _disposeToken = DisposeToken.Create<AnalysisQueue>();
         private readonly HashSet<IGroupableAnalysisProject> _enqueuedGroups;
         private readonly PriorityProducerConsumer<QueueItem> _ppc;
         private readonly Task _consumerTask;
@@ -160,6 +161,7 @@ public void Dispose() {
                     Trace.TraceWarning("Failed to wait for worker thread to terminate");
                 }
             }
+            _disposeToken.TryMarkDisposed();
         }
 
         private struct QueueItem {

src/Analysis/Engine/Impl/PythonAnalyzer.cs

@@ -985,6 +985,7 @@ public void Dispose() {
 
         protected virtual void Dispose(bool disposing) {
             if (disposing) {
+                Queue.Clear();
                 IDisposable interpreter = _interpreter as IDisposable;
                 if (_disposeInterpreter && interpreter != null) {
                     interpreter.Dispose();

src/Analysis/Engine/Test/AnalysisTest.cs

@@ -5341,7 +5341,7 @@ public async Task CancelAnalysis() {
 
             var files = Directory.GetFiles(Path.Combine(configuration.PrefixPath, "Lib"), "*.py", SearchOption.AllDirectories);
             Trace.TraceInformation($"Files count: {files}");
-            var contentTasks = files.Select(f => File.ReadAllTextAsync(f)).ToArray();
+            var contentTasks = files.Take(Math.Min(50, files.Length)).Select(f => File.ReadAllTextAsync(f)).ToArray();
 
             await Task.WhenAll(contentTasks);
 
@@ -5350,15 +5350,15 @@ public async Task CancelAnalysis() {
             var analysisCompleteTask = Task.CompletedTask;
             try {
                 server = await CreateServerAsync(configuration);
-                for (var i = 0; i < files.Length && server.AnalysisQueue.Count < 50; i++) {
+                for (var i = 0; i < contentTasks.Length && server.AnalysisQueue.Count < 50; i++) {
                     await server.SendDidOpenTextDocument(new Uri(files[i]), contentTasks[i].Result);
                 }
 
                 server.AnalysisQueue.Count.Should().NotBe(0);
             } finally {
                 if (server != null) {
                     analysisCompleteTask = EventTaskSources.AnalysisQueue.AnalysisComplete.Create(server.AnalysisQueue, new CancellationTokenSource(10000).Token);
-                    serverDisposeTask = Task.WhenAny(Task.Run(() => server.Dispose()), Task.Delay(1000));
+                    serverDisposeTask = Task.WhenAny(Task.Run(() => server.Dispose()), Task.Delay(5000));
                 }
             }
 

src/LanguageServer/Impl/Implementation/ParseQueue.cs

@@ -29,7 +29,7 @@
 using Microsoft.PythonTools.Parsing.Ast;
 
 namespace Microsoft.Python.LanguageServer.Implementation {
-    class ParseQueue {
+    class ParseQueue: IDisposable {
         public const string PythonParserSource = "Python (parser)";
         private const string TaskCommentSource = "Task comment";
 
@@ -41,6 +41,8 @@ public ParseQueue() {
             _parsing = new ConcurrentDictionary<Uri, ParseTask>();
         }
 
+        public void Dispose() => _parsing.Clear();
+
         public int Count => _parsingInProgress.Count;
 
         public Task WaitForAllAsync() => _parsingInProgress.WaitForZeroAsync();

src/LanguageServer/Impl/Implementation/Server.cs

@@ -96,9 +96,6 @@ public Server() {
 
             _disposableBag
                 .Add(ProjectFiles)
-                .Add(() => Analyzer?.Dispose())
-                .Add(() => _shutdownCts.Cancel())
-                .Add(AnalysisQueue)
                 .Add(() => {
                     foreach (var ext in _extensions.Values) {
                         (ext as IDisposable)?.Dispose();
@@ -121,7 +118,12 @@ private void Analysis_UnhandledException(object sender, UnhandledExceptionEventA
         internal ServerSettings Settings { get; private set; } = new ServerSettings();
         internal ProjectFiles ProjectFiles { get; } = new ProjectFiles();
 
-        public void Dispose() => _disposableBag.TryDispose();
+        public void Dispose() {
+            _shutdownCts.Cancel();
+            AnalysisQueue.Dispose();
+            Analyzer?.Dispose();
+            _disposableBag.TryDispose();
+        }
 
         #region ILogger
         public void TraceMessage(IFormattable message) {
@@ -625,6 +627,7 @@ internal Task EnqueueItemAsync(IDocument doc, AnalysisPriority priority = Analys
                         LogMessage(MessageType.Error, t.Exception.Message);
                         return;
                     }
+                    _shutdownCts.Token.ThrowIfCancellationRequested();
                     await OnDocumentChangeProcessingCompleteAsync(doc, t.Result as VersionCookie, enqueueForAnalysis, priority, pending);
                 });
             } catch {
@@ -635,6 +638,7 @@ internal Task EnqueueItemAsync(IDocument doc, AnalysisPriority priority = Analys
 
         private async Task OnDocumentChangeProcessingCompleteAsync(IDocument doc, VersionCookie vc, bool enqueueForAnalysis, AnalysisPriority priority, IDisposable disposeWhenEnqueued) {
             try {
+                _shutdownCts.Token.ThrowIfCancellationRequested();
                 _disposableBag.ThrowIfDisposed();
                 if (vc != null) {
                     foreach (var kv in vc.GetAllParts(doc.DocumentUri)) {
@@ -645,6 +649,7 @@ private async Task OnDocumentChangeProcessingCompleteAsync(IDocument doc, Versio
                 }
 
                 if (doc is IAnalyzable analyzable && enqueueForAnalysis) {
+                    _shutdownCts.Token.ThrowIfCancellationRequested();
                     AnalysisQueued(doc.DocumentUri);
                     AnalysisQueue.Enqueue(analyzable, priority);
                 }
@@ -658,6 +663,7 @@ private async Task OnDocumentChangeProcessingCompleteAsync(IDocument doc, Versio
                 if (doc is ProjectEntry entry) {
                     var reanalyzeEntries = Analyzer.GetEntriesThatImportModule(entry.ModuleName, false);
                     foreach (var d in reanalyzeEntries.OfType<IDocument>()) {
+                        _shutdownCts.Token.ThrowIfCancellationRequested();
                         await EnqueueItemAsync(d, parse: false);
                     }
                 }