<!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>[161157] 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/161157">161157</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2013-12-30 15:46:31 -0800 (Mon, 30 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move more of Connection over to STL threading primitives
https://bugs.webkit.org/show_bug.cgi?id=126308
Reviewed by Andreas Kling.
* Platform/IPC/Connection.cpp:
(IPC::BinarySemaphore::BinarySemaphore):
(IPC::BinarySemaphore::~BinarySemaphore):
(IPC::BinarySemaphore::signal):
(IPC::BinarySemaphore::wait):
Add a new BinarySemaphore class that uses STL threading primitives.
(IPC::Connection::SyncMessageState::wait):
Change this to take a std::chrono::steady_clock::time_point.
(IPC::absoluteTimeoutTime):
Add a new helper function that returns a time point from the a given timeout duration,
correctly handling the max duration.
(IPC::Connection::sendSyncMessageFromSecondaryThread):
Pass a time point to SyncMessageState::wait.
(IPC::Connection::waitForSyncReply):
Ditto.</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="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (161156 => 161157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-30 23:34:33 UTC (rev 161156)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-30 23:46:31 UTC (rev 161157)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2013-12-30 Anders Carlsson <andersca@apple.com>
+
+ Move more of Connection over to STL threading primitives
+ https://bugs.webkit.org/show_bug.cgi?id=126308
+
+ Reviewed by Andreas Kling.
+
+ * Platform/IPC/Connection.cpp:
+ (IPC::BinarySemaphore::BinarySemaphore):
+ (IPC::BinarySemaphore::~BinarySemaphore):
+ (IPC::BinarySemaphore::signal):
+ (IPC::BinarySemaphore::wait):
+ Add a new BinarySemaphore class that uses STL threading primitives.
+
+ (IPC::Connection::SyncMessageState::wait):
+ Change this to take a std::chrono::steady_clock::time_point.
+
+ (IPC::absoluteTimeoutTime):
+ Add a new helper function that returns a time point from the a given timeout duration,
+ correctly handling the max duration.
+
+ (IPC::Connection::sendSyncMessageFromSecondaryThread):
+ Pass a time point to SyncMessageState::wait.
+
+ (IPC::Connection::waitForSyncReply):
+ Ditto.
+
</ins><span class="cx"> 2013-12-30 Ryuan Choi <ryuan.choi@samsung.com>
</span><span class="cx">
</span><span class="cx"> Replace remaning CoreIPC namespace to IPC
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/Connection.cpp (161156 => 161157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/Connection.cpp 2013-12-30 23:34:33 UTC (rev 161156)
+++ trunk/Source/WebKit2/Platform/IPC/Connection.cpp 2013-12-30 23:46:31 UTC (rev 161157)
</span><span class="lines">@@ -31,10 +31,44 @@
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><del>-#include <wtf/threads/BinarySemaphore.h>
</del><span class="cx">
</span><span class="cx"> namespace IPC {
</span><span class="cx">
</span><ins>+class BinarySemaphore {
+public:
+ BinarySemaphore()
+ : m_isSet(false)
+ {
+ }
+
+ ~BinarySemaphore()
+ {
+ }
+
+ void signal()
+ {
+ std::lock_guard<std::mutex> lock(m_mutex);
+
+ m_isSet = true;
+ m_conditionVariable.notify_all();
+ }
+
+ bool wait(std::chrono::steady_clock::time_point absoluteTime)
+ {
+ std::unique_lock<std::mutex> lock(m_mutex);
+
+ bool value = m_conditionVariable.wait_until(lock, absoluteTime, [this] { return m_isSet; });
+
+ return value;
+ }
+
+private:
+ bool m_isSet;
+
+ std::mutex m_mutex;
+ std::condition_variable m_conditionVariable;
+};
+
</ins><span class="cx"> class Connection::SyncMessageState : public ThreadSafeRefCounted<Connection::SyncMessageState> {
</span><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<SyncMessageState> getOrCreate(RunLoop*);
</span><span class="lines">@@ -45,7 +79,7 @@
</span><span class="cx"> m_waitForSyncReplySemaphore.signal();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool wait(double absoluteTime)
</del><ins>+ bool wait(std::chrono::steady_clock::time_point absoluteTime)
</ins><span class="cx"> {
</span><span class="cx"> return m_waitForSyncReplySemaphore.wait(absoluteTime);
</span><span class="cx"> }
</span><span class="lines">@@ -376,6 +410,15 @@
</span><span class="cx"> return sendMessage(std::move(encoder));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static std::chrono::steady_clock::time_point absoluteTimeoutTime(std::chrono::milliseconds timeout)
+{
+ // We use std::chrono::milliseconds::max() to mean no timeout.
+ if (timeout == std::chrono::milliseconds::max())
+ return std::chrono::steady_clock::time_point::max();
+
+ return std::chrono::steady_clock::now() + timeout;
+}
+
</ins><span class="cx"> std::unique_ptr<MessageDecoder> Connection::waitForMessage(StringReference messageReceiverName, StringReference messageName, uint64_t destinationID, std::chrono::milliseconds timeout)
</span><span class="cx"> {
</span><span class="cx"> // First, check if this message is already in the incoming messages queue.
</span><span class="lines">@@ -500,7 +543,8 @@
</span><span class="cx">
</span><span class="cx"> sendMessage(std::move(encoder), 0);
</span><span class="cx">
</span><del>- pendingReply.semaphore.wait(currentTime() + (timeout.count() / 1000.0));
</del><ins>+ auto timeoutTime = absoluteTimeoutTime(timeout);
+ pendingReply.semaphore.wait(timeoutTime);
</ins><span class="cx">
</span><span class="cx"> // Finally, pop the pending sync reply information.
</span><span class="cx"> {
</span><span class="lines">@@ -514,7 +558,7 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<MessageDecoder> Connection::waitForSyncReply(uint64_t syncRequestID, std::chrono::milliseconds timeout, unsigned syncSendFlags)
</span><span class="cx"> {
</span><del>- double absoluteTime = currentTime() + (timeout.count() / 1000.0);
</del><ins>+ auto timeoutTime = absoluteTimeoutTime(timeout);
</ins><span class="cx">
</span><span class="cx"> bool timedOut = false;
</span><span class="cx"> while (!timedOut) {
</span><span class="lines">@@ -550,10 +594,10 @@
</span><span class="cx"> // FIXME: Although we run forever, any events incoming will cause us to drop out and exit out. This however doesn't
</span><span class="cx"> // account for a timeout value passed in. Timeout is always NoTimeout in these cases, but that could change.
</span><span class="cx"> RunLoop::current()->runForDuration(1e10);
</span><del>- timedOut = currentTime() >= absoluteTime;
</del><ins>+ timedOut = std::chrono::steady_clock::now() >= timeoutTime;
</ins><span class="cx"> #endif
</span><span class="cx"> } else
</span><del>- timedOut = !m_syncMessageState->wait(absoluteTime);
</del><ins>+ timedOut = !m_syncMessageState->wait(timeoutTime);
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (161156 => 161157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2013-12-30 23:34:33 UTC (rev 161156)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2013-12-30 23:46:31 UTC (rev 161157)
</span><span class="lines">@@ -821,7 +821,7 @@
</span><span class="cx"> // comes back from the parent process. Temporarily add this hash to the list with a thirty
</span><span class="cx"> // second timeout. That way, even if the parent decides not to add it, we'll only be
</span><span class="cx"> // incorrect for a little while.
</span><del>- m_plugInAutoStartOriginHashes.set(plugInOriginHash, currentTime() + 30 * 1000);
</del><ins>+ m_plugInAutoStartOriginHashes.set(plugIn OriginHash, currentTime() + 30 * 1000);
</ins><span class="cx">
</span><span class="cx"> parentProcessConnection()->send(Messages::WebContext::AddPlugInAutoStartOriginHash(pageOrigin, plugInOriginHash), 0);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>