corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1089695 - Fixing wrong dependency in Places shutdown. r=mak

Browse Source
This commit is contained in:
David Rajchenbach-Teller
2015-08-10 11:07:54 +02:00
parent 7b1614acf4
commit cb15aec7a6
3 changed files with 56 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
toolkit/components/places/PlacesUtils.jsm
View File

@@ -2075,6 +2075,19 @@ XPCOMUtils.defineLazyGetter(this, "bundle", function() {
createBundle(PLACES_STRING_BUNDLE_URI);
});
// A promise resolved once the Sqlite.jsm connections
// can be closed.
let promiseCanCloseConnection = function() {
let TOPIC = "places-will-close-connection";
return new Promise(resolve => {
let observer = function() {
Services.obs.removeObserver(observer, TOPIC);
resolve();
}
Services.obs.addObserver(observer, TOPIC, false)
});
};
XPCOMUtils.defineLazyGetter(this, "gAsyncDBConnPromised",
() => new Promise((resolve) => {
Sqlite.cloneStorageConnection({
@@ -2082,12 +2095,23 @@ XPCOMUtils.defineLazyGetter(this, "gAsyncDBConnPromised",
readOnly: true
}).then(conn => {
try {
Sqlite.shutdown.addBlocker(
"PlacesUtils read-only connection closing",
conn.close.bind(conn));
PlacesUtils.history.shutdownClient.jsclient.addBlocker(
"PlacesUtils read-only connection closing",
conn.close.bind(conn));
let state = "0. not started";
let promiseReady = promiseCanCloseConnection();
let promiseShutdownComplete = Task.async(function*() {
// Don't close the connection as long as it might be used.
state = "1. waiting for `places-will-close-connection`";
yield promiseReady;
// But close the connection before Sqlite shutdown.
state = "2. closing the connection";
yield conn.close();
state = "3. done";
})();
Sqlite.shutdown.addBlocker("PlacesUtils read-only connection closing",
promiseShutdownComplete,
() => state);
} catch(ex) {
// It's too late to block shutdown, just close the connection.
conn.close();
@@ -2104,12 +2128,23 @@ XPCOMUtils.defineLazyGetter(this, "gAsyncDBWrapperPromised",
connection: PlacesUtils.history.DBConnection,
}).then(conn => {
try {
Sqlite.shutdown.addBlocker(
"PlacesUtils wrapped connection closing",
conn.close.bind(conn));
PlacesUtils.history.shutdownClient.jsclient.addBlocker(
"PlacesUtils wrapped connection closing",
conn.close.bind(conn));
let state = "0. not started";
let promiseReady = promiseCanCloseConnection();
let promiseShutdownComplete = Task.async(function*() {
// Don't close the connection as long as it might be used.
state = "1. waiting for `places-will-close-connection`";
yield promiseReady;
// But close the connection before Sqlite shutdown.
state = "2. closing the connection";
yield conn.close();
state = "3. done";
})();
Sqlite.shutdown.addBlocker("PlacesUtils wrapped connection closing",
promiseShutdownComplete,
() => state);
} catch(ex) {
// It's too late to block shutdown, just close the connection.
conn.close();