<!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>[185843] trunk/Source/WebKit2</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/185843">185843</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-06-22 14:11:25 -0700 (Mon, 22 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simplify Connection::SyncMessageState
https://bugs.webkit.org/show_bug.cgi?id=146213
Reviewed by Andreas Kling.
Since we no longer support Connections dispatching to multiple threads, we can make SyncMessageState
into a singleton and get rid of the RunLoop -> SyncMessageState hash map.
* Platform/IPC/Connection.cpp:
(IPC::Connection::SyncMessageState::singleton):
(IPC::Connection::SyncMessageState::SyncMessageState):
(IPC::Connection::SyncMessageState::processIncomingMessage):
(IPC::Connection::SyncMessageState::dispatchMessages):
(IPC::Connection::waitForSyncReply):
(IPC::Connection::processIncomingSyncReply):
(IPC::Connection::processIncomingMessage):
(IPC::Connection::connectionDidClose):
(IPC::Connection::SyncMessageState::syncMessageStateMap): Deleted.
(IPC::Connection::SyncMessageState::syncMessageStateMapMutex): Deleted.
(IPC::Connection::SyncMessageState::getOrCreate): Deleted.
(IPC::Connection::SyncMessageState::~SyncMessageState): Deleted.
(IPC::Connection::Connection): Deleted.
* Platform/IPC/Connection.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCConnectioncpp">trunk/Source/WebKit2/Platform/IPC/Connection.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCConnectionh">trunk/Source/WebKit2/Platform/IPC/Connection.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185842 => 185843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-06-22 20:53:26 UTC (rev 185842)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-22 21:11:25 UTC (rev 185843)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-06-22 Anders Carlsson <andersca@apple.com>
+
+ Simplify Connection::SyncMessageState
+ https://bugs.webkit.org/show_bug.cgi?id=146213
+
+ Reviewed by Andreas Kling.
+
+ Since we no longer support Connections dispatching to multiple threads, we can make SyncMessageState
+ into a singleton and get rid of the RunLoop -> SyncMessageState hash map.
+
+ * Platform/IPC/Connection.cpp:
+ (IPC::Connection::SyncMessageState::singleton):
+ (IPC::Connection::SyncMessageState::SyncMessageState):
+ (IPC::Connection::SyncMessageState::processIncomingMessage):
+ (IPC::Connection::SyncMessageState::dispatchMessages):
+ (IPC::Connection::waitForSyncReply):
+ (IPC::Connection::processIncomingSyncReply):
+ (IPC::Connection::processIncomingMessage):
+ (IPC::Connection::connectionDidClose):
+ (IPC::Connection::SyncMessageState::syncMessageStateMap): Deleted.
+ (IPC::Connection::SyncMessageState::syncMessageStateMapMutex): Deleted.
+ (IPC::Connection::SyncMessageState::getOrCreate): Deleted.
+ (IPC::Connection::SyncMessageState::~SyncMessageState): Deleted.
+ (IPC::Connection::Connection): Deleted.
+ * Platform/IPC/Connection.h:
+
</ins><span class="cx"> 2015-06-20 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> [Content Extensions] Add SPI to reload without content blocking.
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/Connection.cpp (185842 => 185843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/Connection.cpp 2015-06-22 20:53:26 UTC (rev 185842)
+++ trunk/Source/WebKit2/Platform/IPC/Connection.cpp 2015-06-22 21:11:25 UTC (rev 185843)
</span><span class="lines">@@ -55,11 +55,13 @@
</span><span class="cx"> std::unique_ptr<MessageDecoder> decoder;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class Connection::SyncMessageState : public ThreadSafeRefCounted<Connection::SyncMessageState> {
</del><ins>+class Connection::SyncMessageState {
</ins><span class="cx"> public:
</span><del>- static Ref<SyncMessageState> getOrCreate(RunLoop&);
- ~SyncMessageState();
</del><ins>+ static SyncMessageState& singleton();
</ins><span class="cx">
</span><ins>+ SyncMessageState();
+ ~SyncMessageState() = delete;
+
</ins><span class="cx"> void wakeUpClientRunLoop()
</span><span class="cx"> {
</span><span class="cx"> m_waitForSyncReplySemaphore.signal();
</span><span class="lines">@@ -79,29 +81,8 @@
</span><span class="cx"> void dispatchMessages(Connection* allowedConnection);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- explicit SyncMessageState(RunLoop&);
-
- typedef HashMap<RunLoop*, SyncMessageState*> SyncMessageStateMap;
- static SyncMessageStateMap& syncMessageStateMap()
- {
- static NeverDestroyed<SyncMessageStateMap> syncMessageStateMap;
- return syncMessageStateMap;
- }
-
- static std::mutex& syncMessageStateMapMutex()
- {
- static LazyNeverDestroyed<std::mutex> syncMessageStateMapMutex;
- static std::once_flag onceFlag;
- std::call_once(onceFlag, [] {
- syncMessageStateMapMutex.construct();
- });
-
- return syncMessageStateMapMutex;
- }
-
</del><span class="cx"> void dispatchMessageAndResetDidScheduleDispatchMessagesForConnection(Connection&);
</span><span class="cx">
</span><del>- RunLoop& m_runLoop;
</del><span class="cx"> BinarySemaphore m_waitForSyncReplySemaphore;
</span><span class="cx">
</span><span class="cx"> // Protects m_didScheduleDispatchMessagesWorkSet and m_messagesToDispatchWhileWaitingForSyncReply.
</span><span class="lines">@@ -126,35 +107,22 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span><del>-Ref<Connection::SyncMessageState> Connection::SyncMessageState::getOrCreate(RunLoop& runLoop)
</del><ins>+Connection::SyncMessageState& Connection::SyncMessageState::singleton()
</ins><span class="cx"> {
</span><del>- std::lock_guard<std::mutex> lock(syncMessageStateMapMutex());
</del><ins>+ static std::once_flag onceFlag;
+ static LazyNeverDestroyed<SyncMessageState> syncMessageState;
</ins><span class="cx">
</span><del>- auto& slot = syncMessageStateMap().add(&runLoop, nullptr).iterator->value;
- if (slot)
- return *slot;
</del><ins>+ std::call_once(onceFlag, [] {
+ syncMessageState.construct();
+ });
</ins><span class="cx">
</span><del>- Ref<SyncMessageState> syncMessageState = adoptRef(*new SyncMessageState(runLoop));
- slot = syncMessageState.ptr();
-
</del><span class="cx"> return syncMessageState;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Connection::SyncMessageState::SyncMessageState(RunLoop& runLoop)
- : m_runLoop(runLoop)
</del><ins>+Connection::SyncMessageState::SyncMessageState()
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Connection::SyncMessageState::~SyncMessageState()
-{
- std::lock_guard<std::mutex> lock(syncMessageStateMapMutex());
-
- ASSERT(syncMessageStateMap().contains(&m_runLoop));
- syncMessageStateMap().remove(&m_runLoop);
-
- ASSERT(m_messagesToDispatchWhileWaitingForSyncReply.isEmpty());
-}
-
</del><span class="cx"> bool Connection::SyncMessageState::processIncomingMessage(Connection& connection, std::unique_ptr<MessageDecoder>& message)
</span><span class="cx"> {
</span><span class="cx"> if (!message->shouldDispatchMessageWhenWaitingForSyncReply())
</span><span class="lines">@@ -167,7 +135,7 @@
</span><span class="cx">
</span><span class="cx"> if (m_didScheduleDispatchMessagesWorkSet.add(&connection).isNewEntry) {
</span><span class="cx"> RefPtr<Connection> protectedConnection(&connection);
</span><del>- m_runLoop.dispatch([this, protectedConnection] {
</del><ins>+ RunLoop::main().dispatch([this, protectedConnection] {
</ins><span class="cx"> dispatchMessageAndResetDidScheduleDispatchMessagesForConnection(*protectedConnection);
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -182,7 +150,7 @@
</span><span class="cx">
</span><span class="cx"> void Connection::SyncMessageState::dispatchMessages(Connection* allowedConnection)
</span><span class="cx"> {
</span><del>- ASSERT(&m_runLoop == &RunLoop::current());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> Vector<ConnectionAndIncomingMessage> messagesToDispatchWhileWaitingForSyncReply;
</span><span class="cx">
</span><span class="lines">@@ -249,7 +217,6 @@
</span><span class="cx"> , m_inDispatchMessageMarkedDispatchWhenWaitingForSyncReplyCount(0)
</span><span class="cx"> , m_didReceiveInvalidMessage(false)
</span><span class="cx"> , m_waitingForMessage(nullptr)
</span><del>- , m_syncMessageState(SyncMessageState::getOrCreate(RunLoop::main()))
</del><span class="cx"> , m_shouldWaitForSyncReplies(true)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="lines">@@ -576,7 +543,7 @@
</span><span class="cx"> bool timedOut = false;
</span><span class="cx"> while (!timedOut) {
</span><span class="cx"> // First, check if we have any messages that we need to process.
</span><del>- m_syncMessageState->dispatchMessages(nullptr);
</del><ins>+ SyncMessageState::singleton().dispatchMessages(nullptr);
</ins><span class="cx">
</span><span class="cx"> {
</span><span class="cx"> MutexLocker locker(m_syncReplyStateMutex);
</span><span class="lines">@@ -614,7 +581,7 @@
</span><span class="cx"> timedOut = currentTime() >= absoluteTime;
</span><span class="cx"> #endif
</span><span class="cx"> } else
</span><del>- timedOut = !m_syncMessageState->wait(absoluteTime);
</del><ins>+ timedOut = !SyncMessageState::singleton().wait(absoluteTime);
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -642,7 +609,7 @@
</span><span class="cx">
</span><span class="cx"> // We got a reply to the last send message, wake up the client run loop so it can be processed.
</span><span class="cx"> if (i == m_pendingSyncReplies.size())
</span><del>- m_syncMessageState->wakeUpClientRunLoop();
</del><ins>+ SyncMessageState::singleton().wakeUpClientRunLoop();
</ins><span class="cx">
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -705,7 +672,7 @@
</span><span class="cx"> // Check if this is a sync message or if it's a message that should be dispatched even when waiting for
</span><span class="cx"> // a sync reply. If it is, and we're waiting for a sync reply this message needs to be dispatched.
</span><span class="cx"> // If we don't we'll end up with a deadlock where both sync message senders are stuck waiting for a reply.
</span><del>- if (m_syncMessageState->processIncomingMessage(*this, message))
</del><ins>+ if (SyncMessageState::singleton().processIncomingMessage(*this, message))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Check if we're waiting for this message.
</span><span class="lines">@@ -748,7 +715,7 @@
</span><span class="cx"> m_shouldWaitForSyncReplies = false;
</span><span class="cx">
</span><span class="cx"> if (!m_pendingSyncReplies.isEmpty())
</span><del>- m_syncMessageState->wakeUpClientRunLoop();
</del><ins>+ SyncMessageState::singleton().wakeUpClientRunLoop();
</ins><span class="cx">
</span><span class="cx"> for (SecondaryThreadPendingSyncReplyMap::iterator iter = m_secondaryThreadPendingSyncReplyMap.begin(); iter != m_secondaryThreadPendingSyncReplyMap.end(); ++iter)
</span><span class="cx"> iter->value->semaphore.signal();
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/Connection.h (185842 => 185843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/Connection.h 2015-06-22 20:53:26 UTC (rev 185842)
+++ trunk/Source/WebKit2/Platform/IPC/Connection.h 2015-06-22 21:11:25 UTC (rev 185843)
</span><span class="lines">@@ -293,7 +293,6 @@
</span><span class="cx">
</span><span class="cx"> class SyncMessageState;
</span><span class="cx"> friend class SyncMessageState;
</span><del>- RefPtr<SyncMessageState> m_syncMessageState;
</del><span class="cx">
</span><span class="cx"> Mutex m_syncReplyStateMutex;
</span><span class="cx"> bool m_shouldWaitForSyncReplies;
</span></span></pre>
</div>
</div>
</body>
</html>