Move cache consistency validation into Analysis Server.

pkg/analyzer/lib/src/generated/engine.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 // This code was auto-generated, is not intended to be edited, and is subject to
 // significant change. Please see the README file for more information.
 
 library engine;
 
 import 'dart:async';
@@ skipping 1194 matching lines @@
 //          DartEntry dartEntry = (DartEntry) sourceEntry;
 //          if (dartEntry.getValue(DartEntry.IS_LAUNCHABLE) && dartEntry.getValue(DartEntry.IS_CLIENT)) {
         sources.add(source);
 //          }
       }
     }
     return sources;
   }
 
   @override
+  bool validateSourceCacheConsistency(Source source) {
+    SourceEntry entry = _cache.get(source);
+    if (entry != null) {
+      int sourceTime = getModificationStamp(source);
+      if (sourceTime != entry.modificationTime) {
+        _sourceChanged(source);
+        return true;
+      }
+      if (entry.exception != null) {
+        if (!exists(source)) {
+          if (getLibrariesContaining(source).isEmpty &&
+              getLibrariesDependingOn(source).isEmpty) {
+            _cache.remove(source);
+          }
+        }
+      }
+    }
+    return false;
+  }
+
+  @override
   List<Source> get launchableServerLibrarySources {
     // TODO(brianwilkerson) This needs to filter out libraries that reference
     // dart:html, either directly or indirectly.
     List<Source> sources = new List<Source>();
     MapIterator<Source, SourceEntry> iterator = _cache.iterator();
     while (iterator.moveNext()) {
       Source source = iterator.key;
       SourceEntry sourceEntry = iterator.value;
       if (sourceEntry.kind == SourceKind.LIBRARY && !source.isInSystemLibrary) {
 //          DartEntry dartEntry = (DartEntry) sourceEntry;
@@ skipping 1037 matching lines @@
   @override
   AnalysisResult performAnalysisTask() {
     if (_TRACE_PERFORM_TASK) {
       print("----------------------------------------");
     }
     return PerformanceStatistics.performAnaysis.makeCurrentWhile(() {
       int getStart = JavaSystem.currentTimeMillis();
       AnalysisTask task = PerformanceStatistics.nextTask
           .makeCurrentWhile(() => nextAnalysisTask);
       int getEnd = JavaSystem.currentTimeMillis();
-      if (task == null && _validateCacheConsistency()) {
-        task = nextAnalysisTask;
-      }
       if (task == null) {
         _validateLastIncrementalResolutionResult();
         if (_performAnalysisTaskStopwatch != null) {
           AnalysisEngine.instance.instrumentationService.logPerformance(
               AnalysisPerformanceKind.FULL, _performAnalysisTaskStopwatch,
               'context_id=$_id');
           _performAnalysisTaskStopwatch = null;
         }
         return new AnalysisResult(
             _getChangeNotices(true), getEnd - getStart, null, -1);
@@ skipping 1734 matching lines @@
         return true;
       }
     }
     return false;
   }
 
   bool _isTooBigHtmlSourceEntry(Source source, SourceEntry sourceEntry) =>
       false;
 
   /**
-   * Log the given debugging [message].
-   */
-  void _logInformation(String message) {
-    AnalysisEngine.instance.logger.logInformation(message);
-  }
-
-  /**
    * Notify all of the analysis listeners that a task is about to be performed.
    */
   void _notifyAboutToPerformTask(String taskDescription) {
     int count = _listeners.length;
     for (int i = 0; i < count; i++) {
       _listeners[i].aboutToPerformTask(this, taskDescription);
     }
   }
 
 //  /**
@@ skipping 678 matching lines @@
         LineInfo lineInfo = getLineInfo(unitSource);
         ChangeNoticeImpl notice = getNotice(unitSource);
         notice.resolvedDartUnit = oldUnit;
         notice.setErrors(dartEntry.allErrors, lineInfo);
       }
       // OK
       return true;
     });
   }
 
-  /**
-   * Check the cache for any invalid entries (entries whose modification time
-   * does not match the modification time of the source associated with the
-   * entry). Invalid entries will be marked as invalid so that the source will
-   * be re-analyzed. Return `true` if at least one entry was invalid.
-   */
-  bool _validateCacheConsistency() {
-    int consistencyCheckStart = JavaSystem.nanoTime();
-    List<Source> changedSources = new List<Source>();
-    List<Source> missingSources = new List<Source>();
-    MapIterator<Source, SourceEntry> iterator = _cache.iterator();
-    while (iterator.moveNext()) {
-      Source source = iterator.key;
-      SourceEntry sourceEntry = iterator.value;
-      int sourceTime = getModificationStamp(source);
-      if (sourceTime != sourceEntry.modificationTime) {
-        changedSources.add(source);
-      }
-      if (sourceEntry.exception != null) {
-        if (!exists(source)) {
-          missingSources.add(source);
-        }
-      }
-    }
-    int count = changedSources.length;
-    for (int i = 0; i < count; i++) {
-      _sourceChanged(changedSources[i]);
-    }
-    int removalCount = 0;
-    for (Source source in missingSources) {
-      if (getLibrariesContaining(source).isEmpty &&
-          getLibrariesDependingOn(source).isEmpty) {
-        _cache.remove(source);
-        removalCount++;
-      }
-    }
-    int consistencyCheckEnd = JavaSystem.nanoTime();
-    if (changedSources.length > 0 || missingSources.length > 0) {
-      StringBuffer buffer = new StringBuffer();
-      buffer.write("Consistency check took ");
-      buffer.write((consistencyCheckEnd - consistencyCheckStart) / 1000000.0);
-      buffer.writeln(" ms and found");
-      buffer.write("  ");
-      buffer.write(changedSources.length);
-      buffer.writeln(" inconsistent entries");
-      buffer.write("  ");
-      buffer.write(missingSources.length);
-      buffer.write(" missing sources (");
-      buffer.write(removalCount);
-      buffer.writeln(" removed");
-      for (Source source in missingSources) {
-        buffer.write("    ");
-        buffer.writeln(source.fullName);
-      }
-      _logInformation(buffer.toString());
-    }
-    return changedSources.length > 0;
-  }
-
   void _validateLastIncrementalResolutionResult() {
     if (incrementalResolutionValidation_lastUnitSource == null ||
         incrementalResolutionValidation_lastLibrarySource == null ||
         incrementalResolutionValidation_lastUnit == null) {
       return;
     }
     CompilationUnit fullUnit = getResolvedCompilationUnit2(
         incrementalResolutionValidation_lastUnitSource,
         incrementalResolutionValidation_lastLibrarySource);
     if (fullUnit != null) {
@@ skipping 4382 matching lines @@
    * Returns a statistics about this context.
    */
   AnalysisContextStatistics get statistics;
 
   /**
    * Sets the [TypeProvider] for this context.
    */
   void set typeProvider(TypeProvider typeProvider);
 
   /**
+   * Check whether the cache entry for the given [source] is valid, i.e. the
+   * entry modification time matches the modification time of the [source].
+   * If not, the entry is marked as invalid so that the source will be
+   * re-analyzed, and `true` is returned.
+   */
+  bool validateSourceCacheConsistency(Source source);
+
+  /**
    * A factory to override how [TypeResolverVisitor] is created.
    */
   TypeResolverVisitorFactory get typeResolverVisitorFactory;
 
   /**
    * Return a list containing the sources of the libraries that are exported by
    * the library with the given [source]. The list will be empty if the given
    * source is invalid, if the given source does not represent a library, or if
    * the library does not export any other libraries.
    *
@@ skipping 2615 matching lines @@
     PendingFuture pendingFuture =
         new PendingFuture<T>(_context, source, computeValue);
     if (!pendingFuture.evaluate(sourceEntry)) {
       _context._pendingFutureSources
           .putIfAbsent(source, () => <PendingFuture>[])
           .add(pendingFuture);
     }
     return pendingFuture.future;
   }
 }