<!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>[183433] 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/183433">183433</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-04-27 15:34:47 -0700 (Mon, 27 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Reduce allocations and memory usage when compiling content extensions.
https://bugs.webkit.org/show_bug.cgi?id=144277
Reviewed by Benjamin Poulain.
Covered by existing tests.
* contentextensions/Term.h:
(WebCore::ContentExtensions::Term::CharacterSet::set):
(WebCore::ContentExtensions::Term::CharacterSet::get):
(WebCore::ContentExtensions::Term::CharacterSet::invert):
(WebCore::ContentExtensions::Term::CharacterSet::inverted):
(WebCore::ContentExtensions::Term::CharacterSet::bitCount):
(WebCore::ContentExtensions::Term::CharacterSet::operator==):
(WebCore::ContentExtensions::Term::CharacterSet::hash):
(WebCore::ContentExtensions::Term::Term):
(WebCore::ContentExtensions::Term::addCharacter):
(WebCore::ContentExtensions::Term::isEndOfLineAssertion):
(WebCore::ContentExtensions::Term::isUniversalTransition):
(WebCore::ContentExtensions::Term::generateSubgraphForAtom):
Use two uint64_t's instead of a BitVector with a capacity of 128 bits.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsTermh">trunk/Source/WebCore/contentextensions/Term.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183432 => 183433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-27 22:30:47 UTC (rev 183432)
+++ trunk/Source/WebCore/ChangeLog 2015-04-27 22:34:47 UTC (rev 183433)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-04-27 Alex Christensen <achristensen@webkit.org>
+
+ Reduce allocations and memory usage when compiling content extensions.
+ https://bugs.webkit.org/show_bug.cgi?id=144277
+
+ Reviewed by Benjamin Poulain.
+
+ Covered by existing tests.
+
+ * contentextensions/Term.h:
+ (WebCore::ContentExtensions::Term::CharacterSet::set):
+ (WebCore::ContentExtensions::Term::CharacterSet::get):
+ (WebCore::ContentExtensions::Term::CharacterSet::invert):
+ (WebCore::ContentExtensions::Term::CharacterSet::inverted):
+ (WebCore::ContentExtensions::Term::CharacterSet::bitCount):
+ (WebCore::ContentExtensions::Term::CharacterSet::operator==):
+ (WebCore::ContentExtensions::Term::CharacterSet::hash):
+ (WebCore::ContentExtensions::Term::Term):
+ (WebCore::ContentExtensions::Term::addCharacter):
+ (WebCore::ContentExtensions::Term::isEndOfLineAssertion):
+ (WebCore::ContentExtensions::Term::isUniversalTransition):
+ (WebCore::ContentExtensions::Term::generateSubgraphForAtom):
+ Use two uint64_t's instead of a BitVector with a capacity of 128 bits.
+
</ins><span class="cx"> 2015-04-27 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> Rename WTF_USE_3D_GRAPHICS to ENABLE_GRAPHICS_CONTEXT_3D
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsTermh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/Term.h (183432 => 183433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/Term.h 2015-04-27 22:30:47 UTC (rev 183432)
+++ trunk/Source/WebCore/contentextensions/Term.h 2015-04-27 22:34:47 UTC (rev 183433)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> #include "NFA.h"
</span><span class="cx"> #include <unicode/utypes.h>
</span><span class="cx"> #include <wtf/ASCIICType.h>
</span><del>-#include <wtf/BitVector.h>
</del><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="lines">@@ -126,19 +125,47 @@
</span><span class="cx"> TermType m_termType { TermType::Empty };
</span><span class="cx"> AtomQuantifier m_quantifier { AtomQuantifier::One };
</span><span class="cx">
</span><del>- struct CharacterSet {
- bool inverted { false };
- BitVector characters { 128 };
-
</del><ins>+ class CharacterSet {
+ public:
+ void set(UChar character)
+ {
+ RELEASE_ASSERT(character < 128);
+ m_characters[character / 64] |= (uint64_t(1) << (character % 64));
+ }
+
+ bool get(UChar character) const
+ {
+ RELEASE_ASSERT(character < 128);
+ return m_characters[character / 64] & (uint64_t(1) << (character % 64));
+ }
+
+ void invert()
+ {
+ ASSERT(!m_inverted);
+ m_inverted = true;
+ }
+
+ bool inverted() const { return m_inverted; }
+
+ unsigned bitCount() const
+ {
+ return WTF::bitCount(m_characters[0]) + WTF::bitCount(m_characters[1]);
+ }
+
</ins><span class="cx"> bool operator==(const CharacterSet& other) const
</span><span class="cx"> {
</span><del>- return other.inverted == inverted && other.characters == characters;
</del><ins>+ return other.m_inverted == m_inverted
+ && other.m_characters[0] == m_characters[0]
+ && other.m_characters[1] == m_characters[1];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned hash() const
</span><span class="cx"> {
</span><del>- return WTF::pairIntHash(inverted, characters.hash());
</del><ins>+ return WTF::pairIntHash(WTF::pairIntHash(WTF::intHash(m_characters[0]), WTF::intHash(m_characters[1])), m_inverted);
</ins><span class="cx"> }
</span><ins>+ private:
+ bool m_inverted { false };
+ uint64_t m_characters[2] { 0, 0 };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> struct Group {
</span><span class="lines">@@ -195,20 +222,20 @@
</span><span class="cx"> addCharacter(character, isCaseSensitive);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-enum UniversalTransitionTag { UniversalTransition };
</del><span class="cx"> inline Term::Term(UniversalTransitionTag)
</span><span class="cx"> : m_termType(TermType::CharacterSet)
</span><span class="cx"> {
</span><span class="cx"> new (NotNull, &m_atomData.characterSet) CharacterSet();
</span><del>- for (unsigned i = 0; i < 128; ++i)
- m_atomData.characterSet.characters.set(i);
</del><ins>+ for (UChar i = 0; i < 128; ++i)
+ m_atomData.characterSet.set(i);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline Term::Term(CharacterSetTermTag, bool isInverted)
</span><span class="cx"> : m_termType(TermType::CharacterSet)
</span><span class="cx"> {
</span><span class="cx"> new (NotNull, &m_atomData.characterSet) CharacterSet();
</span><del>- m_atomData.characterSet.inverted = isInverted;
</del><ins>+ if (isInverted)
+ m_atomData.characterSet.invert();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline Term::Term(GroupTermTag)
</span><span class="lines">@@ -220,7 +247,7 @@
</span><span class="cx"> inline Term::Term(EndOfLineAssertionTermTag)
</span><span class="cx"> : Term(CharacterSetTerm, false)
</span><span class="cx"> {
</span><del>- m_atomData.characterSet.characters.set(0);
</del><ins>+ m_atomData.characterSet.set(0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline Term::Term(const Term& other)
</span><span class="lines">@@ -287,10 +314,10 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (isCaseSensitive || !isASCIIAlpha(character))
</span><del>- m_atomData.characterSet.characters.set(character);
</del><ins>+ m_atomData.characterSet.set(character);
</ins><span class="cx"> else {
</span><del>- m_atomData.characterSet.characters.set(toASCIIUpper(character));
- m_atomData.characterSet.characters.set(toASCIILower(character));
</del><ins>+ m_atomData.characterSet.set(toASCIIUpper(character));
+ m_atomData.characterSet.set(toASCIILower(character));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -356,7 +383,7 @@
</span><span class="cx">
</span><span class="cx"> inline bool Term::isEndOfLineAssertion() const
</span><span class="cx"> {
</span><del>- return m_termType == TermType::CharacterSet && m_atomData.characterSet.characters.bitCount() == 1 && m_atomData.characterSet.characters.get(0);
</del><ins>+ return m_termType == TermType::CharacterSet && m_atomData.characterSet.bitCount() == 1 && m_atomData.characterSet.get(0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline bool Term::matchesAtLeastOneCharacter() const
</span><span class="lines">@@ -517,8 +544,8 @@
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> break;
</span><span class="cx"> case TermType::CharacterSet:
</span><del>- return (m_atomData.characterSet.inverted && !m_atomData.characterSet.characters.bitCount())
- || (!m_atomData.characterSet.inverted && m_atomData.characterSet.characters.bitCount() == 128);
</del><ins>+ return (m_atomData.characterSet.inverted() && !m_atomData.characterSet.bitCount())
+ || (!m_atomData.characterSet.inverted() && m_atomData.characterSet.bitCount() == 128);
</ins><span class="cx"> case TermType::Group:
</span><span class="cx"> return m_atomData.group.terms.size() == 1 && m_atomData.group.terms.first().isUniversalTransition();
</span><span class="cx"> }
</span><span class="lines">@@ -537,14 +564,15 @@
</span><span class="cx"> if (isUniversalTransition())
</span><span class="cx"> nfa.addTransitionsOnAnyCharacter(source, target);
</span><span class="cx"> else {
</span><del>- if (!m_atomData.characterSet.inverted) {
- for (const auto& characterIterator : m_atomData.characterSet.characters.setBits())
- nfa.addTransition(source, target, static_cast<char>(characterIterator));
</del><ins>+ if (!m_atomData.characterSet.inverted()) {
+ for (UChar i = 0; i < 128; ++i) {
+ if (m_atomData.characterSet.get(i))
+ nfa.addTransition(source, target, static_cast<char>(i));
+ }
</ins><span class="cx"> } else {
</span><del>- for (unsigned i = 1; i < m_atomData.characterSet.characters.size(); ++i) {
- if (m_atomData.characterSet.characters.get(i))
- continue;
- nfa.addTransition(source, target, static_cast<char>(i));
</del><ins>+ for (UChar i = 1; i < 128; ++i) {
+ if (!m_atomData.characterSet.get(i))
+ nfa.addTransition(source, target, static_cast<char>(i));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>