Bug 123313 – DatabaseManager's ProposedDatabases need to be thread-safe

• Status: RESOLVED
• Resolution: FIXED
• Component: DOM

[Simon Fraser (smfr)]

We're seeing some recent crashes in database-related code, e.g.

http://build.webkit.org/results/Apple%20MountainLion%20Debug%20WK2%20(Tests)/r157967%20(13656)/http/tests/security/cross-origin-worker-websql-allowed-crash-log.txt

Thread 30 Crashed:: WebCore: Worker
0   com.apple.JavaScriptCore      	0x000000010d280eba WTFCrash + 42 (Assertions.cpp:342)
1   com.apple.WebCore             	0x000000010e5b58e8 WebCore::DatabaseManager::ProposedDatabase::ProposedDatabase(WebCore::DatabaseManager&, WebCore::SecurityOrigin*, WTF::String const&, WTF::String const&, unsigned long) + 248 (DatabaseManager.cpp:58)
2   com.apple.WebCore             	0x000000010e5b57dd WebCore::DatabaseManager::ProposedDatabase::ProposedDatabase(WebCore::DatabaseManager&, WebCore::SecurityOrigin*, WTF::String const&, WTF::String const&, unsigned long) + 61 (DatabaseManager.cpp:60)
3   com.apple.WebCore             	0x000000010e5b641d WebCore::DatabaseManager::openDatabaseBackend(WebCore::ScriptExecutionContext*, WebCore::DatabaseType, WTF::String const&, WTF::String const&, WTF::String const&, unsigned long, bool, WebCore::DatabaseError&, WTF::String&) + 765 (DatabaseManager.cpp:268)
4   com.apple.WebCore             	0x000000010e5b6929 WebCore::DatabaseManager::openDatabase(WebCore::ScriptExecutionContext*, WTF::String const&, WTF::String const&, WTF::String const&, unsigned long, WTF::PassRefPtr<WebCore::DatabaseCallback>, WebCore::DatabaseError&) + 297 (DatabaseManager.cpp:309)
5   com.apple.WebCore             	0x000000010fc48d78 WebCore::WorkerGlobalScopeWebDatabase::openDatabase(WebCore::WorkerGlobalScope*, WTF::String const&, WTF::String const&, WTF::String const&, unsigned long, WTF::PassRefPtr<WebCore::DatabaseCallback>, int&) + 328 (WorkerGlobalScopeWebDatabase.cpp:49)
6   com.apple.WebCore             	0x000000010f29758d WebCore::jsWorkerGlobalScopePrototypeFunctionOpenDatabase(JSC::ExecState*) + 1629 (JSWorkerGlobalScope.cpp:1167)
7   ???                           	0x00005d6b24a15e25 0 + 102714757439013
8   com.apple.JavaScriptCore      	0x000000010cfb6267 JSC::JITCode::execute(JSC::JSStack*, JSC::ExecState*, JSC::VM*) + 71 (JITCode.cpp:46)
9   com.apple.JavaScriptCore      	0x000000010cf9a01f JSC::Interpreter::executeCall(JSC::ExecState*, JSC::JSObject*, JSC::CallType, JSC::CallData const&, JSC::JSValue, JSC::ArgList const&) + 1455 (Interpreter.cpp:958)

[Simon Fraser (smfr)]

Two more crashes overnight:
http://build.webkit.org/results/Apple%20MountainLion%20Debug%20WK2%20(Tests)/r157999%20(13669)/http/tests/security/cross-origin-worker-websql-allowed-crash-log.txt
http://build.webkit.org/results/Apple%20MountainLion%20Debug%20WK2%20(Tests)/r157998%20(13668)/http/tests/security/cross-origin-worker-websql-allowed-crash-log.txt

[Mark Lam]

Looks like the ProposedDatabases need to be multi-thread safe as well due to Worker threads.  Will fix.

[Radar WebKit Bug Importer]

<rdar://problem/15320813>

[Mark Lam]

Created attachment 215199 [details]
the patch.

Still running layout tests on this patch.

[Mark Lam]

Layout tests look ok.

[Geoffrey Garen]

Comment on attachment 215199 [details]
the patch.

View in context: https://bugs.webkit.org/attachment.cgi?id=215199&action=review

> Source/WebCore/Modules/webdatabase/DatabaseManager.cpp:257
> +                addProposedDatabase(&proposedDb);
>                  databaseContext->databaseExceededQuota(name,
>                      DatabaseDetails(name.isolatedCopy(), displayName.isolatedCopy(), estimatedSize, 0));
> +                removeProposedDatabase(&proposedDb);

Let's move add/remove to the ProposedDatabase constructor/destructor, to make them automatic.

[Mark Lam]

Thanks for the review.  The add and remove calls have been moved into ProposedDatabase's constructor/destructor.

Landed in r158058: <http://trac.webkit.org/r158058>.