зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1356826: Part 3 - Get rid of recursive last modified scan. r=rhelmer
This scan no longer serves a useful purpose in production, now that mandatory extension signing requires manifest changes after update. MozReview-Commit-ID: 817qRuyzL5P --HG-- extra : rebase_source : bb85ac3c5da99e60e6b91267aea6779ad85f8c1b
This commit is contained in:
Kris Maglione
Родитель
eb1fb3c686
Коммит
019432d333
|
|
@ -2062,46 +2062,6 @@ function recursiveRemove(aFile) {
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the timestamp and leaf file name of the most recently modified
|
||||
* entry in a directory,
|
||||
* or simply the file's own timestamp if it is not a directory.
|
||||
* Also returns the total number of items (directories and files) visited in the scan
|
||||
*
|
||||
* @param aFile
|
||||
* A non-null nsIFile object
|
||||
* @return [File Name, Epoch time, items visited], as described above.
|
||||
*/
|
||||
function recursiveLastModifiedTime(aFile) {
|
||||
try {
|
||||
let modTime = aFile.lastModifiedTime;
|
||||
let fileName = aFile.leafName;
|
||||
if (aFile.isFile())
|
||||
return [fileName, modTime, 1];
|
||||
|
||||
if (aFile.isDirectory()) {
|
||||
let entries = aFile.directoryEntries.QueryInterface(Ci.nsIDirectoryEnumerator);
|
||||
let entry;
|
||||
let totalItems = 1;
|
||||
while ((entry = entries.nextFile)) {
|
||||
let [subName, subTime, items] = recursiveLastModifiedTime(entry);
|
||||
totalItems += items;
|
||||
if (subTime > modTime) {
|
||||
modTime = subTime;
|
||||
fileName = subName;
|
||||
}
|
||||
}
|
||||
entries.close();
|
||||
return [fileName, modTime, totalItems];
|
||||
}
|
||||
} catch (e) {
|
||||
logger.warn("Problem getting last modified time for " + aFile.path, e);
|
||||
}
|
||||
|
||||
// If the file is something else, just ignore it.
|
||||
return ["", 0, 0];
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets a snapshot of directory entries.
|
||||
*
|
||||
|
|
@ -2197,29 +2157,16 @@ XPIState.prototype = {
|
|||
getModTime(aFile, aId) {
|
||||
let changed = false;
|
||||
let scanStarted = Cu.now();
|
||||
// For an unknown or enabled add-on, we do a full recursive scan.
|
||||
if (!("scanTime" in this) || this.enabled) {
|
||||
logger.debug("getModTime: Recursive scan of " + aId);
|
||||
let [modFile, modTime, items] = recursiveLastModifiedTime(aFile);
|
||||
XPIProvider._mostRecentlyModifiedFile[aId] = modFile;
|
||||
XPIProvider.setTelemetry(aId, "scan_items", items);
|
||||
if (modTime != this.scanTime) {
|
||||
this.scanTime = modTime;
|
||||
changed = true;
|
||||
}
|
||||
}
|
||||
// if the add-on is disabled, modified time is the install manifest time, if
|
||||
// any. If no manifest exists, we assume this is a packed .xpi and use
|
||||
// the time stamp of {path}
|
||||
// Modified time is the install manifest time, if any. If no manifest
|
||||
// exists, we assume this is a packed .xpi and use the time stamp of
|
||||
// {path}
|
||||
try {
|
||||
// Get the install manifest update time, if any.
|
||||
let maniFile = getManifestFileForDir(aFile);
|
||||
if (!(aId in XPIProvider._mostRecentlyModifiedFile)) {
|
||||
XPIProvider._mostRecentlyModifiedFile[aId] = maniFile.leafName;
|
||||
}
|
||||
let maniTime = maniFile.lastModifiedTime;
|
||||
if (maniTime != this.manifestTime) {
|
||||
this.manifestTime = maniTime;
|
||||
this.scanTime = maniTime;
|
||||
changed = true;
|
||||
}
|
||||
} catch (e) {
|
||||
|
|
@ -2543,9 +2490,6 @@ this.XPIProvider = {
|
|||
enabledAddons: null,
|
||||
// Keep track of startup phases for telemetry
|
||||
runPhase: XPI_STARTING,
|
||||
// Keep track of the newest file in each add-on, in case we want to
|
||||
// report it to telemetry.
|
||||
_mostRecentlyModifiedFile: {},
|
||||
// Per-addon telemetry information
|
||||
_telemetryDetails: {},
|
||||
// A Map from an add-on install to its ID
|
||||
|
|
|
|||
|
|
@ -1957,13 +1957,9 @@ this.XPIDatabaseReconcile = {
|
|||
// Did time change in the wrong direction?
|
||||
if (xpiState.mtime < oldAddon.updateDate) {
|
||||
XPIProvider.setTelemetry(oldAddon.id, "olderFile", {
|
||||
name: XPIProvider._mostRecentlyModifiedFile[id],
|
||||
mtime: xpiState.mtime,
|
||||
oldtime: oldAddon.updateDate
|
||||
});
|
||||
} else {
|
||||
XPIProvider.setTelemetry(oldAddon.id, "modifiedFile",
|
||||
XPIProvider._mostRecentlyModifiedFile[id]);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
<?xml version="1.0"?>
|
||||
|
||||
<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:em="http://www.mozilla.org/2004/em-rdf#">
|
||||
|
||||
<Description about="urn:mozilla:install-manifest">
|
||||
<em:id>bug594058@tests.mozilla.org</em:id>
|
||||
<em:version>1.0</em:version>
|
||||
|
||||
<em:targetApplication>
|
||||
<Description>
|
||||
<em:id>xpcshell@tests.mozilla.org</em:id>
|
||||
<em:minVersion>1</em:minVersion>
|
||||
<em:maxVersion>2</em:maxVersion>
|
||||
</Description>
|
||||
</em:targetApplication>
|
||||
<em:name>bug 594058</em:name>
|
||||
<em:description>stat-based invalidation</em:description>
|
||||
<em:unpack>true</em:unpack>
|
||||
</Description>
|
||||
</RDF>
|
||||
|
|
@ -148,10 +148,6 @@ add_task(function* detect_touches() {
|
|||
let manifest = ueDir.clone();
|
||||
manifest.append("install.rdf");
|
||||
checkChange(XS, manifest, true);
|
||||
// We also notice changing another file for enabled unpacked add-on.
|
||||
let otherFile = ueDir.clone();
|
||||
otherFile.append("extraFile.js");
|
||||
checkChange(XS, otherFile, true);
|
||||
|
||||
// We notice changing install.rdf for a *disabled* unpacked add-on.
|
||||
let udDir = profileDir.clone();
|
||||
|
|
@ -161,7 +157,7 @@ add_task(function* detect_touches() {
|
|||
checkChange(XS, manifest, true);
|
||||
// Finally, the case we actually care about...
|
||||
// We *don't* notice changing another file for disabled unpacked add-on.
|
||||
otherFile = udDir.clone();
|
||||
let otherFile = udDir.clone();
|
||||
otherFile.append("extraFile.js");
|
||||
checkChange(XS, otherFile, false);
|
||||
|
||||
|
|
|
|||
|
|
@ -1053,6 +1053,8 @@ function run_test_22() {
|
|||
|
||||
let file = manuallyInstall(do_get_addon("test_bootstrap1_1"), profileDir,
|
||||
ID1);
|
||||
if (file.isDirectory())
|
||||
file.append("install.rdf");
|
||||
|
||||
// Make it look old so changes are detected
|
||||
setExtensionModifiedTime(file, file.lastModifiedTime - 5000);
|
||||
|
|
|
|||
|
|
@ -1,88 +0,0 @@
|
|||
/* Any copyright is dedicated to the Public Domain.
|
||||
* http://creativecommons.org/publicdomain/zero/1.0/
|
||||
*/
|
||||
|
||||
// This tests is modifying a file in an unpacked extension
|
||||
// causes cache invalidation.
|
||||
|
||||
// Disables security checking our updates which haven't been signed
|
||||
Services.prefs.setBoolPref("extensions.checkUpdateSecurity", false);
|
||||
// Allow the mismatch UI to show
|
||||
Services.prefs.setBoolPref("extensions.showMismatchUI", true);
|
||||
|
||||
Components.utils.import("resource://testing-common/MockRegistrar.jsm");
|
||||
|
||||
var Ci = Components.interfaces;
|
||||
const extDir = gProfD.clone();
|
||||
extDir.append("extensions");
|
||||
|
||||
var gCachePurged = false;
|
||||
|
||||
// Override the window watcher
|
||||
var WindowWatcher = {
|
||||
openWindow(parent, url, name, features, args) {
|
||||
do_check_false(gCachePurged);
|
||||
},
|
||||
|
||||
QueryInterface(iid) {
|
||||
if (iid.equals(Ci.nsIWindowWatcher)
|
||||
|| iid.equals(Ci.nsISupports))
|
||||
return this;
|
||||
|
||||
throw Components.results.NS_ERROR_NO_INTERFACE;
|
||||
}
|
||||
}
|
||||
|
||||
MockRegistrar.register("@mozilla.org/embedcomp/window-watcher;1", WindowWatcher);
|
||||
|
||||
/**
|
||||
* Start the test by installing extensions.
|
||||
*/
|
||||
function run_test() {
|
||||
do_test_pending();
|
||||
gCachePurged = false;
|
||||
|
||||
let obs = AM_Cc["@mozilla.org/observer-service;1"].
|
||||
getService(AM_Ci.nsIObserverService);
|
||||
obs.addObserver({
|
||||
observe(aSubject, aTopic, aData) {
|
||||
gCachePurged = true;
|
||||
}
|
||||
}, "startupcache-invalidate");
|
||||
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1");
|
||||
|
||||
startupManager();
|
||||
// nsAppRunner takes care of clearing this when a new app is installed
|
||||
do_check_false(gCachePurged);
|
||||
|
||||
installAllFiles([do_get_addon("test_bug594058")], function() {
|
||||
restartManager();
|
||||
do_check_true(gCachePurged);
|
||||
gCachePurged = false;
|
||||
|
||||
// Now, make it look like we've updated the file. First, start the EM
|
||||
// so it records the bogus old time, then update the file and restart.
|
||||
let extFile = extDir.clone();
|
||||
let pastTime = extFile.lastModifiedTime - 5000;
|
||||
extFile.append("bug594058@tests.mozilla.org");
|
||||
setExtensionModifiedTime(extFile, pastTime);
|
||||
let otherFile = extFile.clone();
|
||||
otherFile.append("directory");
|
||||
otherFile.lastModifiedTime = pastTime;
|
||||
otherFile.append("file1");
|
||||
otherFile.lastModifiedTime = pastTime;
|
||||
|
||||
restartManager();
|
||||
gCachePurged = false;
|
||||
|
||||
otherFile.lastModifiedTime = pastTime + 5000;
|
||||
restartManager();
|
||||
do_check_true(gCachePurged);
|
||||
gCachePurged = false;
|
||||
|
||||
restartManager();
|
||||
do_check_false(gCachePurged);
|
||||
|
||||
do_test_finished();
|
||||
});
|
||||
}
|
||||
|
|
@ -25,8 +25,13 @@ profileDir.append("extensions");
|
|||
// Deletes a file from the test add-on in the profile
|
||||
function breakAddon(file) {
|
||||
if (TEST_UNPACKED) {
|
||||
file.append("test.txt");
|
||||
file.remove(true);
|
||||
let f = file.clone();
|
||||
f.append("test.txt");
|
||||
f.remove(true);
|
||||
|
||||
f = file.clone();
|
||||
f.append("install.rdf");
|
||||
f.lastModifiedTime = Date.now();
|
||||
} else {
|
||||
var zipW = AM_Cc["@mozilla.org/zipwriter;1"].
|
||||
createInstance(AM_Ci.nsIZipWriter);
|
||||
|
|
|
|||
|
|
@ -151,7 +151,6 @@ fail-if = os == "android"
|
|||
[test_bug570173.js]
|
||||
[test_bug576735.js]
|
||||
[test_bug587088.js]
|
||||
[test_bug594058.js]
|
||||
[test_bug595081.js]
|
||||
[test_bug595573.js]
|
||||
[test_bug596607.js]
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче