<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"

"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">

<html xmlns="http://www.w3.org/1999/xhtml">

<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />

<title>[195652] trunk</title>

</head>

<body>

<style type="text/css"><!--

#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }

#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }

#msg dt:after { content:':';}

#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }

#msg dl a { font-weight: bold}

#msg dl a:link    { color:#fc3; }

#msg dl a:active  { color:#ff0; }

#msg dl a:visited { color:#cc6; }

h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }

#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }

#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }

#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }

#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }

#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }

#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }

#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }

#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }

#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }

#logmsg pre { background: #eee; padding: 1em; }

#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}

#logmsg dl { margin: 0; }

#logmsg dt { font-weight: bold; }

#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }

#logmsg dd:before { content:'\00bb';}

#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }

#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }

#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }

#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }

#logmsg table th.Corner { text-align: left; }

#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }

#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }

#patch { width: 100%; }

#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}

#patch .propset h4, #patch .binary h4 {margin:0;}

#patch pre {padding:0;line-height:1.2em;margin:0;}

#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}

#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}

#patch span {display:block;padding:0 10px;}

#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}

#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}

#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}

#patch .lines, .info {color:#888;background:#fff;}

--></style>

<div id="msg">

<dl class="meta">

<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/195652">195652</a></dd>

<dt>Author</dt> <dd>cdumez@apple.com</dd>

<dt>Date</dt> <dd>2016-01-26 19:45:09 -0800 (Tue, 26 Jan 2016)</dd>

</dl>

<h3>Log Message</h3>

<pre>fast/history/page-cache-webdatabase-no-transaction-db.html flakily crashes

https://bugs.webkit.org/show_bug.cgi?id=153525

Reviewed by Andreas Kling.

Source/WebCore:

The test was crashing because DatabaseThread::hasPendingDatabaseActivity()

was accessing m_openDatabaseSet from the main thread without any locking

mechanism. This is an issue because m_openDatabaseSet is altered by the

database thread.

No new tests, already covered by fast/history/page-cache-webdatabase-no-transaction-db.html.

* Modules/webdatabase/DatabaseThread.cpp:

(WebCore::DatabaseThread::databaseThread):

(WebCore::DatabaseThread::recordDatabaseOpen):

(WebCore::DatabaseThread::recordDatabaseClosed):

(WebCore::DatabaseThread::hasPendingDatabaseActivity):

* Modules/webdatabase/DatabaseThread.h:

LayoutTests:

Unskip fast/history/page-cache-webdatabase-no-transaction-db.html now

that it no longer crashes.

* TestExpectations:</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>

<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>

<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>

<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseThreadcpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseThread.cpp</a></li>

<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseThreadh">trunk/Source/WebCore/Modules/webdatabase/DatabaseThread.h</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkLayoutTestsChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (195651 => 195652)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/ChangeLog        2016-01-27 03:16:06 UTC (rev 195651)

+++ trunk/LayoutTests/ChangeLog        2016-01-27 03:45:09 UTC (rev 195652)

</span><span class="lines">@@ -1,3 +1,15 @@

</span><ins>+2016-01-26  Chris Dumez  &lt;cdumez@apple.com&gt;

+

+        fast/history/page-cache-webdatabase-no-transaction-db.html flakily crashes

+        https://bugs.webkit.org/show_bug.cgi?id=153525

+

+        Reviewed by Andreas Kling.

+

+        Unskip fast/history/page-cache-webdatabase-no-transaction-db.html now

+        that it no longer crashes.

+

+        * TestExpectations:

+

</ins><span class="cx"> 2016-01-26  Brady Eidson  &lt;beidson@apple.com&gt;

</span><span class="cx"> 

<span class="cx">         Modern IDB: Key generator support for SQLite backend.

</span></span></pre></div>

<a id="trunkLayoutTestsTestExpectations"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (195651 => 195652)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/TestExpectations        2016-01-27 03:16:06 UTC (rev 195651)

+++ trunk/LayoutTests/TestExpectations        2016-01-27 03:45:09 UTC (rev 195652)

</span><span class="lines">@@ -848,9 +848,6 @@

<span class="cx"> http/tests/security/contentSecurityPolicy/1.1/scripthash-default-src.html # Needs expected file.

<span class="cx"> http/tests/security/contentSecurityPolicy/1.1/stylehash-default-src.html # Needs expected file.

</span><span class="cx"> 

<del>-# This test flakily crashes, skip it until the crash is fixed.

-webkit.org/b/153525 fast/history/page-cache-webdatabase-no-transaction-db.html [ Skip ]

-

</del><span class="cx"> # These state object tests purposefully stress a resource limit, and take multiple seconds to run.

</span><span class="cx"> loader/stateobjects/pushstate-size-iframe.html [ Slow ]

</span><span class="cx"> loader/stateobjects/pushstate-size.html [ Slow ]

</span></span></pre></div>

<a id="trunkSourceWebCoreChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195651 => 195652)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-01-27 03:16:06 UTC (rev 195651)

+++ trunk/Source/WebCore/ChangeLog        2016-01-27 03:45:09 UTC (rev 195652)

</span><span class="lines">@@ -1,3 +1,24 @@

</span><ins>+2016-01-26  Chris Dumez  &lt;cdumez@apple.com&gt;

+

+        fast/history/page-cache-webdatabase-no-transaction-db.html flakily crashes

+        https://bugs.webkit.org/show_bug.cgi?id=153525

+

+        Reviewed by Andreas Kling.

+

+        The test was crashing because DatabaseThread::hasPendingDatabaseActivity()

+        was accessing m_openDatabaseSet from the main thread without any locking

+        mechanism. This is an issue because m_openDatabaseSet is altered by the

+        database thread.

+

+        No new tests, already covered by fast/history/page-cache-webdatabase-no-transaction-db.html.

+

+        * Modules/webdatabase/DatabaseThread.cpp:

+        (WebCore::DatabaseThread::databaseThread):

+        (WebCore::DatabaseThread::recordDatabaseOpen):

+        (WebCore::DatabaseThread::recordDatabaseClosed):

+        (WebCore::DatabaseThread::hasPendingDatabaseActivity):

+        * Modules/webdatabase/DatabaseThread.h:

+

</ins><span class="cx"> 2016-01-26  Joseph Pecoraro  &lt;pecoraro@apple.com&gt;

</span><span class="cx"> 

<span class="cx">         Unreviewed CMake build fix after r195644.

</span></span></pre></div>

<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseThreadcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseThread.cpp (195651 => 195652)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseThread.cpp        2016-01-27 03:16:06 UTC (rev 195651)

+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseThread.cpp        2016-01-27 03:45:09 UTC (rev 195652)

</span><span class="lines">@@ -117,14 +117,18 @@

</span><span class="cx"> 

</span><span class="cx">     // Close the databases that we ran transactions on. This ensures that if any transactions are still open, they are rolled back and we don't leave the database in an

<span class="cx">     // inconsistent or locked state.

</span><del>-    if (m_openDatabaseSet.size() &gt; 0) {

-        // As the call to close will modify the original set, we must take a copy to iterate over.

-        DatabaseSet openSetCopy;

-        openSetCopy.swap(m_openDatabaseSet);

-        for (auto&amp; openDatabase : openSetCopy)

-            openDatabase-&gt;close();

</del><ins>+    DatabaseSet openSetCopy;

+    {

+        LockHolder lock(m_openDatabaseSetMutex);

+        if (m_openDatabaseSet.size() &gt; 0) {

+            // As the call to close will modify the original set, we must take a copy to iterate over.

+            openSetCopy.swap(m_openDatabaseSet);

+        }

</ins><span class="cx">     }

</span><span class="cx"> 

</span><ins>+    for (auto&amp; openDatabase : openSetCopy)

+        openDatabase-&gt;close();

+

</ins><span class="cx">     // Detach the thread so its resources are no longer of any concern to anyone else

</span><span class="cx">     detachThread(m_threadID);

</span><span class="cx"> 

</span><span class="lines">@@ -139,6 +143,8 @@

</span><span class="cx"> 

</span><span class="cx"> void DatabaseThread::recordDatabaseOpen(Database* database)

</span><span class="cx"> {

</span><ins>+    LockHolder lock(m_openDatabaseSetMutex);

+

</ins><span class="cx">     ASSERT(currentThread() == m_threadID);

</span><span class="cx">     ASSERT(database);

</span><span class="cx">     ASSERT(!m_openDatabaseSet.contains(database));

</span><span class="lines">@@ -147,6 +153,8 @@

</span><span class="cx"> 

</span><span class="cx"> void DatabaseThread::recordDatabaseClosed(Database* database)

</span><span class="cx"> {

</span><ins>+    LockHolder lock(m_openDatabaseSetMutex);

+

</ins><span class="cx">     ASSERT(currentThread() == m_threadID);

</span><span class="cx">     ASSERT(database);

</span><span class="cx">     ASSERT(m_queue.killed() || m_openDatabaseSet.contains(database));

</span><span class="lines">@@ -183,6 +191,7 @@

</span><span class="cx"> 

</span><span class="cx"> bool DatabaseThread::hasPendingDatabaseActivity() const

</span><span class="cx"> {

</span><ins>+    LockHolder lock(m_openDatabaseSetMutex);

</ins><span class="cx">     for (auto&amp; database : m_openDatabaseSet) {

</span><span class="cx">         if (database-&gt;hasPendingCreationEvent() || database-&gt;hasPendingTransaction())

</span><span class="cx">             return true;

</span></span></pre></div>

<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseThreadh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseThread.h (195651 => 195652)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseThread.h        2016-01-27 03:16:06 UTC (rev 195651)

+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseThread.h        2016-01-27 03:45:09 UTC (rev 195652)

</span><span class="lines">@@ -80,6 +80,7 @@

</span><span class="cx"> 

<span class="cx">     // This set keeps track of the open databases that have been used on this thread.

</span><span class="cx">     typedef HashSet&lt;RefPtr&lt;Database&gt;&gt; DatabaseSet;

</span><ins>+    mutable Lock m_openDatabaseSetMutex;

</ins><span class="cx">     DatabaseSet m_openDatabaseSet;

</span><span class="cx"> 

</span><span class="cx">     std::unique_ptr&lt;SQLTransactionClient&gt; m_transactionClient;

</span></span></pre>

</div>

</div>

</body>

</html>