<!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>[176398] 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/176398">176398</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2014-11-20 09:32:04 -0800 (Thu, 20 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove alignment code from cache coders
https://bugs.webkit.org/show_bug.cgi?id=138927
Reviewed by Anders Carlsson.
Alignment code doesn't do anything useful, wastes space and produces wrong results
if the encoder and decoder buffers don't have the same 8-byte alignment.
* NetworkProcess/cache/NetworkCacheDecoder.cpp:
(WebKit::NetworkCacheDecoder::NetworkCacheDecoder):
(WebKit::NetworkCacheDecoder::bufferIsLargeEnoughToContain):
(WebKit::NetworkCacheDecoder::decodeFixedLengthData):
(WebKit::NetworkCacheDecoder::decodeNumber):
(WebKit::roundUpToAlignment): Deleted.
(WebKit::alignedBufferIsLargeEnoughToContain): Deleted.
(WebKit::NetworkCacheDecoder::alignBufferPosition): Deleted.
* NetworkProcess/cache/NetworkCacheDecoder.h:
(WebKit::NetworkCacheDecoder::currentOffset):
(WebKit::NetworkCacheDecoder::isInvalid):
(WebKit::NetworkCacheDecoder::markInvalid):
(WebKit::NetworkCacheDecoder::bufferIsLargeEnoughToContain):
* NetworkProcess/cache/NetworkCacheEncoder.cpp:
(WebKit::NetworkCacheEncoder::grow):
(WebKit::NetworkCacheEncoder::encodeFixedLengthData):
(WebKit::NetworkCacheEncoder::encodeNumber):
(WebKit::roundUpToAlignment): Deleted.
* NetworkProcess/cache/NetworkCacheEncoder.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheDecodercpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheDecoder.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheDecoderh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheDecoder.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheEncodercpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheEncoder.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheEncoderh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheEncoder.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (176397 => 176398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-11-20 16:33:41 UTC (rev 176397)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-20 17:32:04 UTC (rev 176398)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2014-11-20 Antti Koivisto <antti@apple.com>
+
+ Remove alignment code from cache coders
+ https://bugs.webkit.org/show_bug.cgi?id=138927
+
+ Reviewed by Anders Carlsson.
+
+ Alignment code doesn't do anything useful, wastes space and produces wrong results
+ if the encoder and decoder buffers don't have the same 8-byte alignment.
+
+ * NetworkProcess/cache/NetworkCacheDecoder.cpp:
+ (WebKit::NetworkCacheDecoder::NetworkCacheDecoder):
+ (WebKit::NetworkCacheDecoder::bufferIsLargeEnoughToContain):
+ (WebKit::NetworkCacheDecoder::decodeFixedLengthData):
+ (WebKit::NetworkCacheDecoder::decodeNumber):
+ (WebKit::roundUpToAlignment): Deleted.
+ (WebKit::alignedBufferIsLargeEnoughToContain): Deleted.
+ (WebKit::NetworkCacheDecoder::alignBufferPosition): Deleted.
+ * NetworkProcess/cache/NetworkCacheDecoder.h:
+ (WebKit::NetworkCacheDecoder::currentOffset):
+ (WebKit::NetworkCacheDecoder::isInvalid):
+ (WebKit::NetworkCacheDecoder::markInvalid):
+ (WebKit::NetworkCacheDecoder::bufferIsLargeEnoughToContain):
+ * NetworkProcess/cache/NetworkCacheEncoder.cpp:
+ (WebKit::NetworkCacheEncoder::grow):
+ (WebKit::NetworkCacheEncoder::encodeFixedLengthData):
+ (WebKit::NetworkCacheEncoder::encodeNumber):
+ (WebKit::roundUpToAlignment): Deleted.
+ * NetworkProcess/cache/NetworkCacheEncoder.h:
+
</ins><span class="cx"> 2014-11-20 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> [GTK] URTBF after r176363.
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheDecodercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheDecoder.cpp (176397 => 176398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheDecoder.cpp 2014-11-20 16:33:41 UTC (rev 176397)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheDecoder.cpp 2014-11-20 17:32:04 UTC (rev 176398)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> NetworkCacheDecoder::NetworkCacheDecoder(const uint8_t* buffer, size_t bufferSize)
</span><span class="cx"> : m_buffer(buffer)
</span><del>- , m_bufferPos(buffer)
</del><ins>+ , m_bufferPosition(buffer)
</ins><span class="cx"> , m_bufferEnd(buffer + bufferSize)
</span><span class="cx"> , m_checksum(0)
</span><span class="cx"> {
</span><span class="lines">@@ -44,46 +44,19 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline uint8_t* roundUpToAlignment(const uint8_t* ptr, unsigned alignment)
</del><ins>+bool NetworkCacheDecoder::bufferIsLargeEnoughToContain(size_t size) const
</ins><span class="cx"> {
</span><del>- // Assert that the alignment is a power of 2.
- ASSERT(alignment && !(alignment & (alignment - 1)));
-
- uintptr_t alignmentMask = alignment - 1;
- return reinterpret_cast<uint8_t*>((reinterpret_cast<uintptr_t>(ptr) + alignmentMask) & ~alignmentMask);
</del><ins>+ return m_bufferPosition + size <= m_bufferEnd;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static inline bool alignedBufferIsLargeEnoughToContain(const uint8_t* alignedPosition, const uint8_t* bufferEnd, size_t size)
</del><ins>+bool NetworkCacheDecoder::decodeFixedLengthData(uint8_t* data, size_t size)
</ins><span class="cx"> {
</span><del>- return bufferEnd >= alignedPosition && static_cast<size_t>(bufferEnd - alignedPosition) >= size;
-}
-
-bool NetworkCacheDecoder::alignBufferPosition(unsigned alignment, size_t size)
-{
- uint8_t* alignedPosition = roundUpToAlignment(m_bufferPos, alignment);
- if (!alignedBufferIsLargeEnoughToContain(alignedPosition, m_bufferEnd, size)) {
- // We've walked off the end of this buffer.
- markInvalid();
</del><ins>+ if (!bufferIsLargeEnoughToContain(size))
</ins><span class="cx"> return false;
</span><del>- }
-
- m_bufferPos = alignedPosition;
- return true;
-}
</del><span class="cx">
</span><del>-bool NetworkCacheDecoder::bufferIsLargeEnoughToContain(unsigned alignment, size_t size) const
-{
- return alignedBufferIsLargeEnoughToContain(roundUpToAlignment(m_bufferPos, alignment), m_bufferEnd, size);
-}
</del><ins>+ memcpy(data, m_bufferPosition, size);
+ m_bufferPosition += size;
</ins><span class="cx">
</span><del>-bool NetworkCacheDecoder::decodeFixedLengthData(uint8_t* data, size_t size, unsigned alignment)
-{
- if (!alignBufferPosition(alignment, size))
- return false;
-
- memcpy(data, m_bufferPos, size);
- m_bufferPos += size;
-
</del><span class="cx"> NetworkCacheEncoder::updateChecksumForData(m_checksum, data, size);
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -91,11 +64,11 @@
</span><span class="cx"> template<typename Type>
</span><span class="cx"> bool NetworkCacheDecoder::decodeNumber(Type& value)
</span><span class="cx"> {
</span><del>- if (!alignBufferPosition(sizeof(value), sizeof(value)))
</del><ins>+ if (!bufferIsLargeEnoughToContain(sizeof(value)))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- memcpy(&value, m_bufferPos, sizeof(value));
- m_bufferPos += sizeof(Type);
</del><ins>+ memcpy(&value, m_bufferPosition, sizeof(value));
+ m_bufferPosition += sizeof(Type);
</ins><span class="cx">
</span><span class="cx"> NetworkCacheEncoder::updateChecksumForNumber(m_checksum, value);
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheDecoderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheDecoder.h (176397 => 176398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheDecoder.h 2014-11-20 16:33:41 UTC (rev 176397)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheDecoder.h 2014-11-20 17:32:04 UTC (rev 176398)
</span><span class="lines">@@ -39,14 +39,14 @@
</span><span class="cx"> virtual ~NetworkCacheDecoder();
</span><span class="cx">
</span><span class="cx"> size_t length() const { return m_bufferEnd - m_buffer; }
</span><del>- size_t currentOffset() const { return m_bufferPos - m_buffer; }
</del><ins>+ size_t currentOffset() const { return m_bufferPosition - m_buffer; }
</ins><span class="cx">
</span><del>- bool isInvalid() const { return m_bufferPos > m_bufferEnd; }
- void markInvalid() { m_bufferPos = m_bufferEnd + 1; }
</del><ins>+ bool isInvalid() const { return m_bufferPosition > m_bufferEnd; }
+ void markInvalid() { m_bufferPosition = m_bufferEnd + 1; }
</ins><span class="cx">
</span><span class="cx"> bool verifyChecksum();
</span><span class="cx">
</span><del>- bool decodeFixedLengthData(uint8_t*, size_t, unsigned alignment);
</del><ins>+ bool decodeFixedLengthData(uint8_t*, size_t);
</ins><span class="cx">
</span><span class="cx"> bool decode(bool&);
</span><span class="cx"> bool decode(uint8_t&);
</span><span class="lines">@@ -83,16 +83,15 @@
</span><span class="cx"> if (numElements > std::numeric_limits<size_t>::max() / sizeof(T))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- return bufferIsLargeEnoughToContain(alignof(T), numElements * sizeof(T));
</del><ins>+ return bufferIsLargeEnoughToContain(numElements * sizeof(T));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- bool alignBufferPosition(unsigned alignment, size_t);
- bool bufferIsLargeEnoughToContain(unsigned alignment, size_t) const;
</del><ins>+ bool bufferIsLargeEnoughToContain(size_t) const;
</ins><span class="cx"> template<typename Type> bool decodeNumber(Type&);
</span><span class="cx">
</span><span class="cx"> const uint8_t* m_buffer;
</span><del>- const uint8_t* m_bufferPos;
</del><ins>+ const uint8_t* m_bufferPosition;
</ins><span class="cx"> const uint8_t* m_bufferEnd;
</span><span class="cx">
</span><span class="cx"> unsigned m_checksum;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheEncodercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheEncoder.cpp (176397 => 176398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheEncoder.cpp 2014-11-20 16:33:41 UTC (rev 176397)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheEncoder.cpp 2014-11-20 17:32:04 UTC (rev 176398)
</span><span class="lines">@@ -39,20 +39,13 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline size_t roundUpToAlignment(size_t value, unsigned alignment)
</del><ins>+uint8_t* NetworkCacheEncoder::grow(size_t size)
</ins><span class="cx"> {
</span><del>- return ((value + alignment - 1) / alignment) * alignment;
</del><ins>+ uint8_t* position = m_buffer.data() + m_buffer.size();
+ m_buffer.grow(m_buffer.size() + size);
+ return position;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-uint8_t* NetworkCacheEncoder::grow(unsigned alignment, size_t size)
-{
- size_t alignedSize = roundUpToAlignment(m_buffer.size(), alignment);
-
- m_buffer.grow(alignedSize + size);
-
- return m_buffer.data() + alignedSize;
-}
-
</del><span class="cx"> void NetworkCacheEncoder::updateChecksumForData(unsigned& checksum, const uint8_t* data, size_t size)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: hashMemory should not require alignment.
</span><span class="lines">@@ -61,23 +54,20 @@
</span><span class="cx"> checksum = WTF::pairIntHash(checksum, hash);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkCacheEncoder::encodeFixedLengthData(const uint8_t* data, size_t size, unsigned alignment)
</del><ins>+void NetworkCacheEncoder::encodeFixedLengthData(const uint8_t* data, size_t size)
</ins><span class="cx"> {
</span><del>- ASSERT(!(reinterpret_cast<uintptr_t>(data) % alignment));
-
</del><span class="cx"> updateChecksumForData(m_checksum, data, size);
</span><span class="cx">
</span><del>- uint8_t* buffer = grow(alignment, size);
</del><ins>+ uint8_t* buffer = grow(size);
</ins><span class="cx"> memcpy(buffer, data, size);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename Type>
</span><span class="cx"> void NetworkCacheEncoder::encodeNumber(Type value)
</span><span class="cx"> {
</span><del>- uint8_t* buffer = grow(sizeof(Type), sizeof(Type));
-
</del><span class="cx"> NetworkCacheEncoder::updateChecksumForNumber(m_checksum, value);
</span><span class="cx">
</span><ins>+ uint8_t* buffer = grow(sizeof(Type));
</ins><span class="cx"> memcpy(buffer, &value, sizeof(Type));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheEncoderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheEncoder.h (176397 => 176398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheEncoder.h 2014-11-20 16:33:41 UTC (rev 176397)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheEncoder.h 2014-11-20 17:32:04 UTC (rev 176398)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> virtual ~NetworkCacheEncoder();
</span><span class="cx">
</span><span class="cx"> void encodeChecksum();
</span><del>- void encodeFixedLengthData(const uint8_t*, size_t, unsigned alignment);
</del><ins>+ void encodeFixedLengthData(const uint8_t*, size_t);
</ins><span class="cx">
</span><span class="cx"> template<typename T> void encodeEnum(T t)
</span><span class="cx"> {
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx">
</span><span class="cx"> template<typename Type> void encodeNumber(Type);
</span><span class="cx">
</span><del>- uint8_t* grow(unsigned alignment, size_t);
</del><ins>+ uint8_t* grow(size_t);
</ins><span class="cx">
</span><span class="cx"> template <typename Type> struct Salt;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>