Changeset 90165 in webkit

Timestamp:

Jun 30, 2011, 2:49:42 PM (15 years ago)

Author:

Adam Roben

Message:

Make TestFaiulres only load old-results directories as needed

Fixes <​http://webkit.org/b/63752> Tester pages on TestFailures page load very slowly

Reviewed by Anders Carlsson.

• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/Builder.js:

(Builder.prototype.getBuildNames): Moved up into the API section of the class. Now just
calls through to _getBuildNamesFromResultsDirectory.
(Builder.prototype.getOldBuildNames): Added. Just calls through to
_getBuildNamesFromResultsDirectory.
(Builder.prototype._getBuildNamesFromResultsDirectory): Renamed from getBuildNames. Now
takes the directory URL as an argument and only fetches that single URL.

• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/LayoutTestHistoryAnalyzer.js:

(LayoutTestHistoryAnalyzer.prototype.start): Moved most logic to _analyzeBuilds. First
analyzes builds from Builder.getBuildNames, then from Builder.getOldBuildNames if needed.
(LayoutTestHistoryAnalyzer.prototype._analyzeBuilds): Moved logic here from start. (Most
changes are just indentation.) Now takes a callback to call when we've finished analyzing
all builds in buildNames so that we can try to fetch more build names if needed.

Location:

trunk/Tools

Files:

• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/Builder.js (modified) (4 diffs)
• BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/LayoutTestHistoryAnalyzer.js (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/Builder.js

@@ -58 +58 @@
     },
 
+    getBuildNames: function(callback) {
+        this._getBuildNamesFromResultsDirectory(this.buildbot.baseURL + 'results/' + this.name, callback);
+    },
+
     getMostRecentCompletedBuildNumber: function(callback) {
         var cacheKey = 'getMostRecentCompletedBuildNumber';
@@ -147 +151 @@
     },
 
+    getOldBuildNames: function(callback) {
+        this._getBuildNamesFromResultsDirectory(this.buildbot.baseURL + 'old-results/' + this.name, callback);
+    },
+
     resultsDirectoryURL: function(buildName) {
         return this.buildbot.resultsDirectoryURL(this.name, buildName);
@@ -170 +178 @@
     },
 
-    getBuildNames: function(callback) {
-        var cacheKey = '_getBuildNames';
+    _getBuildNamesFromResultsDirectory: function(directoryURL, callback) {
+        var cacheKey = '_getBuildNamesFromResultsDirectory.' + directoryURL;
         if (cacheKey in this._cache) {
             callback(this._cache[cacheKey]);
@@ -193 +201 @@
         }
 
-        getResource(self.buildbot.baseURL + 'results/' + self.name, function(xhr) {
-            // FIXME: It would be better for performance if we could avoid loading old-results until needed.
-            getResource(self.buildbot.baseURL + 'old-results/' + self.name, function(oldXHR) {
-                var buildNames = buildNamesFromDirectoryXHR(xhr).concat(buildNamesFromDirectoryXHR(oldXHR));
-                self._cache[cacheKey] = buildNames;
-                callback(buildNames);
-            });
+        getResource(directoryURL, function(xhr) {
+            var buildNames = buildNamesFromDirectoryXHR(xhr);
+            self._cache[cacheKey] = buildNames;
+            callback(buildNames);
         });
     },

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/LayoutTestHistoryAnalyzer.js

@@ -70 +70 @@
         var self = this;
         self._builder.getBuildNames(function(buildNames) {
-            function inner(buildIndex) {
-                self._incorporateBuildHistory(buildNames, buildIndex, function(callAgain) {
-                    var nextIndex = buildIndex + 1;
-                    if (nextIndex >= buildNames.length)
-                        callAgain = false;
-                    var data = {
-                        history: self._history,
-                        possiblyFlaky: {},
-                    };
-                    self._flakinessDetector.possiblyFlakyTests.forEach(function(testName) {
-                        data.possiblyFlaky[testName] = self._flakinessDetector.flakinessExamples(testName);
-                    });
-                    var callbackRequestedStop = !callback(data, callAgain);
-                    if (callbackRequestedStop || !callAgain)
-                        return;
-                    setTimeout(function() { inner(nextIndex) }, 0);
+            self._analyzeBuilds(buildNames, callback, function() {
+                self._builder.getOldBuildNames(function(oldBuildNames) {
+                    self._analyzeBuilds(oldBuildNames, callback);
                 });
-            }
-            inner(0);
+            });
         });
+    },
+
+    _analyzeBuilds: function(buildNames, callback, analyzedAllBuildsCallback) {
+        var self = this;
+        function inner(buildIndex) {
+            self._incorporateBuildHistory(buildNames, buildIndex, function(callAgain) {
+                var data = {
+                    history: self._history,
+                    possiblyFlaky: {},
+                };
+                self._flakinessDetector.possiblyFlakyTests.forEach(function(testName) {
+                    data.possiblyFlaky[testName] = self._flakinessDetector.flakinessExamples(testName);
+                });
+
+                var nextIndex = buildIndex + 1;
+                var analyzedAllBuilds = nextIndex >= buildNames.length;
+                var haveMoreDataToFetch = !analyzedAllBuilds || analyzedAllBuildsCallback;
+
+                var callbackRequestedStop = !callback(data, haveMoreDataToFetch);
+                if (callbackRequestedStop)
+                    return;
+
+                if (analyzedAllBuilds) {
+                    if (analyzedAllBuildsCallback)
+                        analyzedAllBuildsCallback();
+                    return;
+                }
+
+                setTimeout(function() { inner(nextIndex) }, 0);
+            });
+        }
+        inner(0);
     },
 

trunk/Tools/ChangeLog

@@ +1 @@
+2011-06-30  Adam Roben  <aroben@apple.com>
+
+        Make TestFaiulres only load old-results directories as needed
+
+        Fixes <http://webkit.org/b/63752> Tester pages on TestFailures page load very slowly
+
+        Reviewed by Anders Carlsson.
+
+        * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/Builder.js:
+        (Builder.prototype.getBuildNames): Moved up into the API section of the class. Now just
+        calls through to _getBuildNamesFromResultsDirectory.
+        (Builder.prototype.getOldBuildNames): Added. Just calls through to
+        _getBuildNamesFromResultsDirectory.
+        (Builder.prototype._getBuildNamesFromResultsDirectory): Renamed from getBuildNames. Now
+        takes the directory URL as an argument and only fetches that single URL.
+
+        * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/LayoutTestHistoryAnalyzer.js:
+        (LayoutTestHistoryAnalyzer.prototype.start): Moved most logic to _analyzeBuilds. First
+        analyzes builds from Builder.getBuildNames, then from Builder.getOldBuildNames if needed.
+        (LayoutTestHistoryAnalyzer.prototype._analyzeBuilds): Moved logic here from start. (Most
+        changes are just indentation.) Now takes a callback to call when we've finished analyzing
+        all builds in buildNames so that we can try to fetch more build names if needed.
+
 2011-06-30  Mark Rowe  <mrowe@apple.com>