<!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>[162022] 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/162022">162022</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-01-14 16:07:19 -0800 (Tue, 14 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up DNSResolveQueue
https://bugs.webkit.org/show_bug.cgi?id=127007
Reviewed by Geoffrey Garen.
Move the shared() getter out of line and make it use NeverDestroyed.
Add a Timer member variable instead of inheriting from TimerBase.
Use std::atomic<int> for the m_requestsInFlight member variable.
* platform/network/DNSResolveQueue.cpp:
(WebCore::DNSResolveQueue::shared):
(WebCore::DNSResolveQueue::DNSResolveQueue):
(WebCore::DNSResolveQueue::add):
(WebCore::DNSResolveQueue::timerFired):
* platform/network/DNSResolveQueue.h:
(WebCore::DNSResolveQueue::decrementRequestCount):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkDNSResolveQueuecpp">trunk/Source/WebCore/platform/network/DNSResolveQueue.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkDNSResolveQueueh">trunk/Source/WebCore/platform/network/DNSResolveQueue.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162021 => 162022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-15 00:00:47 UTC (rev 162021)
+++ trunk/Source/WebCore/ChangeLog 2014-01-15 00:07:19 UTC (rev 162022)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-01-14 Anders Carlsson <andersca@apple.com>
+
+ Clean up DNSResolveQueue
+ https://bugs.webkit.org/show_bug.cgi?id=127007
+
+ Reviewed by Geoffrey Garen.
+
+ Move the shared() getter out of line and make it use NeverDestroyed.
+ Add a Timer member variable instead of inheriting from TimerBase.
+ Use std::atomic<int> for the m_requestsInFlight member variable.
+
+ * platform/network/DNSResolveQueue.cpp:
+ (WebCore::DNSResolveQueue::shared):
+ (WebCore::DNSResolveQueue::DNSResolveQueue):
+ (WebCore::DNSResolveQueue::add):
+ (WebCore::DNSResolveQueue::timerFired):
+ * platform/network/DNSResolveQueue.h:
+ (WebCore::DNSResolveQueue::decrementRequestCount):
+
</ins><span class="cx"> 2014-01-14 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Two more exports for iOS.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkDNSResolveQueuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/DNSResolveQueue.cpp (162021 => 162022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/DNSResolveQueue.cpp 2014-01-15 00:00:47 UTC (rev 162021)
+++ trunk/Source/WebCore/platform/network/DNSResolveQueue.cpp 2014-01-15 00:07:19 UTC (rev 162022)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #include "DNSResolveQueue.h"
</span><span class="cx">
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span><ins>+#include <wtf/NeverDestroyed.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -49,8 +50,16 @@
</span><span class="cx"> // If there were queued names that couldn't be sent simultaneously, check the state of resolvers after this delay.
</span><span class="cx"> static const double gRetryResolvingInSeconds = 0.1;
</span><span class="cx">
</span><ins>+DNSResolveQueue& DNSResolveQueue::shared()
+{
+ static NeverDestroyed<DNSResolveQueue> queue;
+
+ return queue;
+}
+
</ins><span class="cx"> DNSResolveQueue::DNSResolveQueue()
</span><del>- : m_requestsInFlight(0)
</del><ins>+ : m_timer(this, &DNSResolveQueue::timerFired)
+ , m_requestsInFlight(0)
</ins><span class="cx"> , m_cachedProxyEnabledStatus(false)
</span><span class="cx"> , m_lastProxyEnabledStatusCheckTime(0)
</span><span class="cx"> {
</span><span class="lines">@@ -73,23 +82,23 @@
</span><span class="cx"> if (!m_names.size()) {
</span><span class="cx"> if (isUsingProxy())
</span><span class="cx"> return;
</span><del>- if (atomicIncrement(&m_requestsInFlight) <= gNamesToResolveImmediately) {
</del><ins>+ if (++m_requestsInFlight <= gNamesToResolveImmediately) {
</ins><span class="cx"> platformResolve(hostname);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- atomicDecrement(&m_requestsInFlight);
</del><ins>+ --m_requestsInFlight;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // It's better to not prefetch some names than to clog the queue.
</span><span class="cx"> // Dropping the newest names, because on a single page, these are likely to be below oldest ones.
</span><span class="cx"> if (m_names.size() < gMaxRequestsToQueue) {
</span><span class="cx"> m_names.add(hostname);
</span><del>- if (!isActive())
- startOneShot(gCoalesceDelayInSeconds);
</del><ins>+ if (!m_timer.isActive())
+ m_timer.startOneShot(gCoalesceDelayInSeconds);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DNSResolveQueue::fired()
</del><ins>+void DNSResolveQueue::timerFired(Timer<DNSResolveQueue>&)
</ins><span class="cx"> {
</span><span class="cx"> if (isUsingProxy()) {
</span><span class="cx"> m_names.clear();
</span><span class="lines">@@ -99,14 +108,14 @@
</span><span class="cx"> int requestsAllowed = gMaxSimultaneousRequests - m_requestsInFlight;
</span><span class="cx">
</span><span class="cx"> for (; !m_names.isEmpty() && requestsAllowed > 0; --requestsAllowed) {
</span><del>- atomicIncrement(&m_requestsInFlight);
</del><ins>+ ++m_requestsInFlight;
</ins><span class="cx"> HashSet<String>::iterator currentName = m_names.begin();
</span><span class="cx"> platformResolve(*currentName);
</span><span class="cx"> m_names.remove(currentName);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!m_names.isEmpty())
</span><del>- startOneShot(gRetryResolvingInSeconds);
</del><ins>+ m_timer.startOneShot(gRetryResolvingInSeconds);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkDNSResolveQueueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/DNSResolveQueue.h (162021 => 162022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/DNSResolveQueue.h 2014-01-15 00:00:47 UTC (rev 162021)
+++ trunk/Source/WebCore/platform/network/DNSResolveQueue.h 2014-01-15 00:07:19 UTC (rev 162022)
</span><span class="lines">@@ -28,25 +28,23 @@
</span><span class="cx"> #define DNSResolveQueue_h
</span><span class="cx">
</span><span class="cx"> #include "Timer.h"
</span><ins>+#include <atomic>
</ins><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class DNSResolveQueue : public TimerBase {
</del><ins>+class DNSResolveQueue {
+ friend NeverDestroyed<DNSResolveQueue>;
</ins><span class="cx">
</span><span class="cx"> public:
</span><del>- static DNSResolveQueue& shared()
- {
- DEFINE_STATIC_LOCAL(DNSResolveQueue, queue, ());
- return queue;
- }
</del><ins>+ static DNSResolveQueue& shared();
</ins><span class="cx">
</span><span class="cx"> void add(const String& hostname);
</span><span class="cx"> void decrementRequestCount()
</span><span class="cx"> {
</span><del>- atomicDecrement(&m_requestsInFlight);
</del><ins>+ --m_requestsInFlight;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -57,10 +55,12 @@
</span><span class="cx"> bool platformProxyIsEnabledInSystemPreferences();
</span><span class="cx"> void platformResolve(const String&);
</span><span class="cx">
</span><del>- void fired();
</del><ins>+ void timerFired(Timer<DNSResolveQueue>&);
</ins><span class="cx">
</span><ins>+ Timer<DNSResolveQueue> m_timer;
+
</ins><span class="cx"> HashSet<String> m_names;
</span><del>- int m_requestsInFlight;
</del><ins>+ std::atomic<int> m_requestsInFlight;
</ins><span class="cx"> bool m_cachedProxyEnabledStatus;
</span><span class="cx"> double m_lastProxyEnabledStatusCheckTime;
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>