wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 938689: Structured comparison of add-on directory state; r=Unfocused

Browse Source
This commit is contained in:
Irving Reid 2013-11-19 10:27:18 -05:00
parent 51ab56ef96
commit 26d635a3b6
1 changed files with 51 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
toolkit/mozapps/extensions/XPIProvider.jsm
View File

@ -1638,6 +1638,49 @@ var Prefs = {
}
}
// Helper function to compare JSON saved version of the directory state
// with the new state returned by getInstallLocationStates()
// Structure is: ordered array of {'name':?, 'addons': {addonID: {'descriptor':?, 'mtime':?} ...}}
function directoryStateDiffers(aState, aCache)
{
// check equality of an object full of addons; fortunately we can destroy the 'aOld' object
function addonsMismatch(aNew, aOld) {
for (let [id, val] of aNew) {
if (!id in aOld)
return true;
if (val.descriptor != aOld[id].descriptor ||
val.mtime != aOld[id].mtime)
return true;
delete aOld[id];
}
// make sure aOld doesn't have any extra entries
for (let id in aOld)
return true;
return false;
}
if (!aCache)
return true;
try {
let old = JSON.parse(aCache);
if (aState.length != old.length)
return true;
for (let i = 0; i < aState.length; i++) {
// conveniently, any missing fields would require a 'true' return, which is
// handled by our catch wrapper
if (aState[i].name != old[i].name)
return true;
if (addonsMismatch(aState[i].addons, old[i].addons))
return true;
}
}
catch (e) {
return true;
}
return false;
}
var XPIProvider = {
// An array of known install locations
installLocations: null,
@ -3372,8 +3415,15 @@ var XPIProvider = {
// If the install directory state has changed then we must update the database
let cache = Prefs.getCharPref(PREF_INSTALL_CACHE, null);
// For a little while, gather telemetry on whether the deep comparison
// makes a difference
if (cache != JSON.stringify(state)) {
updateReasons.push("directoryState");
if (directoryStateDiffers(state, cache)) {
updateReasons.push("directoryState");
}
else {
AddonManagerPrivate.recordSimpleMeasure("XPIDB_startup_state_badCompare", 1);
}
}
// If the database doesn't exist and there are add-ons installed then we