<!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>[161654] trunk/Source/WebCore</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/161654">161654</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-01-10 11:02:43 -0800 (Fri, 10 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use STL threading primitives in DatabaseDetails and DatabaseManager
https://bugs.webkit.org/show_bug.cgi?id=126759
Reviewed by Geoffrey Garen.
* Modules/webdatabase/DatabaseDetails.h:
(WebCore::DatabaseDetails::DatabaseDetails):
(WebCore::DatabaseDetails::threadID):
* Modules/webdatabase/DatabaseManager.cpp:
(WebCore::DatabaseManager::existingDatabaseContextFor):
(WebCore::DatabaseManager::registerDatabaseContext):
(WebCore::DatabaseManager::unregisterDatabaseContext):
(WebCore::DatabaseManager::didConstructDatabaseContext):
(WebCore::DatabaseManager::didDestructDatabaseContext):
(WebCore::DatabaseManager::addProposedDatabase):
(WebCore::DatabaseManager::removeProposedDatabase):
(WebCore::DatabaseManager::fullPathForDatabase):
(WebCore::DatabaseManager::detailsForNameAndOrigin):
* Modules/webdatabase/DatabaseManager.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseDetailsh">trunk/Source/WebCore/Modules/webdatabase/DatabaseDetails.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseManagercpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseManagerh">trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161653 => 161654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-10 18:59:28 UTC (rev 161653)
+++ trunk/Source/WebCore/ChangeLog 2014-01-10 19:02:43 UTC (rev 161654)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-01-10 Anders Carlsson <andersca@apple.com>
+
+ Use STL threading primitives in DatabaseDetails and DatabaseManager
+ https://bugs.webkit.org/show_bug.cgi?id=126759
+
+ Reviewed by Geoffrey Garen.
+
+ * Modules/webdatabase/DatabaseDetails.h:
+ (WebCore::DatabaseDetails::DatabaseDetails):
+ (WebCore::DatabaseDetails::threadID):
+ * Modules/webdatabase/DatabaseManager.cpp:
+ (WebCore::DatabaseManager::existingDatabaseContextFor):
+ (WebCore::DatabaseManager::registerDatabaseContext):
+ (WebCore::DatabaseManager::unregisterDatabaseContext):
+ (WebCore::DatabaseManager::didConstructDatabaseContext):
+ (WebCore::DatabaseManager::didDestructDatabaseContext):
+ (WebCore::DatabaseManager::addProposedDatabase):
+ (WebCore::DatabaseManager::removeProposedDatabase):
+ (WebCore::DatabaseManager::fullPathForDatabase):
+ (WebCore::DatabaseManager::detailsForNameAndOrigin):
+ * Modules/webdatabase/DatabaseManager.h:
+
</ins><span class="cx"> 2014-01-10 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r161629.
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseDetailsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseDetails.h (161653 => 161654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseDetails.h 2014-01-10 18:59:28 UTC (rev 161653)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseDetails.h 2014-01-10 19:02:43 UTC (rev 161654)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><span class="cx">
</span><del>-#include <wtf/Threading.h>
</del><ins>+#include <thread>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -41,10 +41,10 @@
</span><span class="cx"> DatabaseDetails()
</span><span class="cx"> : m_expectedUsage(0)
</span><span class="cx"> , m_currentUsage(0)
</span><del>- {
</del><span class="cx"> #ifndef NDEBUG
</span><del>- m_thread = currentThread();
</del><ins>+ , m_threadID(std::this_thread::get_id())
</ins><span class="cx"> #endif
</span><ins>+ {
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DatabaseDetails(const String& databaseName, const String& displayName, unsigned long long expectedUsage, unsigned long long currentUsage)
</span><span class="lines">@@ -52,10 +52,10 @@
</span><span class="cx"> , m_displayName(displayName)
</span><span class="cx"> , m_expectedUsage(expectedUsage)
</span><span class="cx"> , m_currentUsage(currentUsage)
</span><del>- {
</del><span class="cx"> #ifndef NDEBUG
</span><del>- m_thread = currentThread();
</del><ins>+ , m_threadID(std::this_thread::get_id())
</ins><span class="cx"> #endif
</span><ins>+ {
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const String& name() const { return m_name; }
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> uint64_t expectedUsage() const { return m_expectedUsage; }
</span><span class="cx"> uint64_t currentUsage() const { return m_currentUsage; }
</span><span class="cx"> #ifndef NDEBUG
</span><del>- ThreadIdentifier thread() const { return m_thread; }
</del><ins>+ std::thread::id threadID() const { return m_threadID; }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> uint64_t m_expectedUsage;
</span><span class="cx"> uint64_t m_currentUsage;
</span><span class="cx"> #ifndef NDEBUG
</span><del>- ThreadIdentifier m_thread;
</del><ins>+ std::thread::id m_threadID;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp (161653 => 161654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp 2014-01-10 18:59:28 UTC (rev 161653)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp 2014-01-10 19:02:43 UTC (rev 161654)
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<DatabaseContext> DatabaseManager::existingDatabaseContextFor(ScriptExecutionContext* context)
</span><span class="cx"> {
</span><del>- MutexLocker locker(m_lock);
</del><ins>+ std::lock_guard<std::mutex> lock(m_mutex);
</ins><span class="cx">
</span><span class="cx"> ASSERT(m_databaseContextRegisteredCount >= 0);
</span><span class="cx"> ASSERT(m_databaseContextInstanceCount >= 0);
</span><span class="lines">@@ -173,7 +173,8 @@
</span><span class="cx">
</span><span class="cx"> void DatabaseManager::registerDatabaseContext(DatabaseContext* databaseContext)
</span><span class="cx"> {
</span><del>- MutexLocker locker(m_lock);
</del><ins>+ std::lock_guard<std::mutex> lock(m_mutex);
+
</ins><span class="cx"> ScriptExecutionContext* context = databaseContext->scriptExecutionContext();
</span><span class="cx"> m_contextMap.set(context, databaseContext);
</span><span class="cx"> #if !ASSERT_DISABLED
</span><span class="lines">@@ -183,7 +184,8 @@
</span><span class="cx">
</span><span class="cx"> void DatabaseManager::unregisterDatabaseContext(DatabaseContext* databaseContext)
</span><span class="cx"> {
</span><del>- MutexLocker locker(m_lock);
</del><ins>+ std::lock_guard<std::mutex> lock(m_mutex);
+
</ins><span class="cx"> ScriptExecutionContext* context = databaseContext->scriptExecutionContext();
</span><span class="cx"> ASSERT(m_contextMap.get(context));
</span><span class="cx"> #if !ASSERT_DISABLED
</span><span class="lines">@@ -195,13 +197,15 @@
</span><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx"> void DatabaseManager::didConstructDatabaseContext()
</span><span class="cx"> {
</span><del>- MutexLocker lock(m_lock);
</del><ins>+ std::lock_guard<std::mutex> lock(m_mutex);
+
</ins><span class="cx"> m_databaseContextInstanceCount++;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DatabaseManager::didDestructDatabaseContext()
</span><span class="cx"> {
</span><del>- MutexLocker lock(m_lock);
</del><ins>+ std::lock_guard<std::mutex> lock(m_mutex);
+
</ins><span class="cx"> m_databaseContextInstanceCount--;
</span><span class="cx"> ASSERT(m_databaseContextRegisteredCount <= m_databaseContextInstanceCount);
</span><span class="cx"> }
</span><span class="lines">@@ -296,13 +300,15 @@
</span><span class="cx">
</span><span class="cx"> void DatabaseManager::addProposedDatabase(ProposedDatabase* proposedDb)
</span><span class="cx"> {
</span><del>- MutexLocker locker(m_lock);
</del><ins>+ std::lock_guard<std::mutex> lock(m_mutex);
+
</ins><span class="cx"> m_proposedDatabases.add(proposedDb);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DatabaseManager::removeProposedDatabase(ProposedDatabase* proposedDb)
</span><span class="cx"> {
</span><del>- MutexLocker locker(m_lock);
</del><ins>+ std::lock_guard<std::mutex> lock(m_mutex);
+
</ins><span class="cx"> m_proposedDatabases.remove(proposedDb);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -380,11 +386,14 @@
</span><span class="cx"> String DatabaseManager::fullPathForDatabase(SecurityOrigin* origin, const String& name, bool createIfDoesNotExist)
</span><span class="cx"> {
</span><span class="cx"> {
</span><del>- MutexLocker locker(m_lock);
- for (HashSet<ProposedDatabase*>::iterator iter = m_proposedDatabases.begin(); iter != m_proposedDatabases.end(); ++iter)
- if ((*iter)->details().name() == name && (*iter)->origin()->equal(origin))
</del><ins>+ std::lock_guard<std::mutex> lock(m_mutex);
+
+ for (auto* proposedDatabase : m_proposedDatabases) {
+ if (proposedDatabase->details().name() == name && proposedDatabase->origin()->equal(origin))
</ins><span class="cx"> return String();
</span><ins>+ }
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> return m_server->fullPathForDatabase(origin, name, createIfDoesNotExist);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -406,13 +415,17 @@
</span><span class="cx"> DatabaseDetails DatabaseManager::detailsForNameAndOrigin(const String& name, SecurityOrigin* origin)
</span><span class="cx"> {
</span><span class="cx"> {
</span><del>- MutexLocker locker(m_lock);
- for (HashSet<ProposedDatabase*>::iterator iter = m_proposedDatabases.begin(); iter != m_proposedDatabases.end(); ++iter)
- if ((*iter)->details().name() == name && (*iter)->origin()->equal(origin)) {
- ASSERT((*iter)->details().thread() == currentThread() || isMainThread());
- return (*iter)->details();
</del><ins>+ std::lock_guard<std::mutex> lock(m_mutex);
+
+ for (auto* proposedDatabase : m_proposedDatabases) {
+ if (proposedDatabase->details().name() == name && proposedDatabase->origin()->equal(origin)) {
+ ASSERT(proposedDatabase->details().threadID() == std::this_thread::get_id() || isMainThread());
+
+ return proposedDatabase->details();
</ins><span class="cx"> }
</span><ins>+ }
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> return m_server->detailsForNameAndOrigin(name, origin);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.h (161653 => 161654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.h 2014-01-10 18:59:28 UTC (rev 161653)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.h 2014-01-10 19:02:43 UTC (rev 161654)
</span><span class="lines">@@ -151,8 +151,8 @@
</span><span class="cx"> #endif
</span><span class="cx"> HashSet<ProposedDatabase*> m_proposedDatabases;
</span><span class="cx">
</span><del>- // This lock protects m_contextMap, and m_proposedDatabases.
- Mutex m_lock;
</del><ins>+ // This mutex protects m_contextMap, and m_proposedDatabases.
+ std::mutex m_mutex;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>