<!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>[184501] trunk/Source/JavaScriptCore</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/184501">184501</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2015-05-18 10:46:43 -0700 (Mon, 18 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[JSC] Speed up URL encode/decode by using bitmaps instead of strchr().
<https://webkit.org/b/145115>
Reviewed by Anders Carlsson.
We were calling strchr() for every character when doing URL encoding/decoding and it stood out
like a sore O(n) thumb in Instruments. Optimize this by using a Bitmap<256> instead.
5.5% progression on Kraken/stanford-crypto-sha256-iterative.
* runtime/JSGlobalObjectFunctions.cpp:
(JSC::makeCharacterBitmap):
(JSC::encode):
(JSC::decode):
(JSC::globalFuncDecodeURI):
(JSC::globalFuncDecodeURIComponent):
(JSC::globalFuncEncodeURI):
(JSC::globalFuncEncodeURIComponent):
(JSC::globalFuncEscape):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjectFunctionscpp">trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (184500 => 184501)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-05-18 17:01:46 UTC (rev 184500)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-05-18 17:46:43 UTC (rev 184501)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-05-18 Andreas Kling <akling@apple.com>
+
+ [JSC] Speed up URL encode/decode by using bitmaps instead of strchr().
+ <https://webkit.org/b/145115>
+
+ Reviewed by Anders Carlsson.
+
+ We were calling strchr() for every character when doing URL encoding/decoding and it stood out
+ like a sore O(n) thumb in Instruments. Optimize this by using a Bitmap<256> instead.
+
+ 5.5% progression on Kraken/stanford-crypto-sha256-iterative.
+
+ * runtime/JSGlobalObjectFunctions.cpp:
+ (JSC::makeCharacterBitmap):
+ (JSC::encode):
+ (JSC::decode):
+ (JSC::globalFuncDecodeURI):
+ (JSC::globalFuncDecodeURIComponent):
+ (JSC::globalFuncEncodeURI):
+ (JSC::globalFuncEncodeURIComponent):
+ (JSC::globalFuncEscape):
+
</ins><span class="cx"> 2015-05-17 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><span class="cx"> Do not use fastMallocGoodSize anywhere
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjectFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp (184500 => 184501)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp 2015-05-18 17:01:46 UTC (rev 184500)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp 2015-05-18 17:46:43 UTC (rev 184501)
</span><span class="lines">@@ -53,8 +53,17 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-static JSValue encode(ExecState* exec, const char* doNotEscape)
</del><ins>+template<unsigned charactersCount>
+static Bitmap<256> makeCharacterBitmap(const char (&characters)[charactersCount])
</ins><span class="cx"> {
</span><ins>+ Bitmap<256> bitmap;
+ for (unsigned i = 0; i < charactersCount; ++i)
+ bitmap.set(characters[i]);
+ return bitmap;
+}
+
+static JSValue encode(ExecState* exec, const Bitmap<256>& doNotEscape)
+{
</ins><span class="cx"> CString cstr = exec->argument(0).toString(exec)->value(exec).utf8(StrictConversion);
</span><span class="cx"> if (!cstr.data())
</span><span class="cx"> return exec->vm().throwException(exec, createURIError(exec, ASCIILiteral("String contained an illegal UTF-16 sequence.")));
</span><span class="lines">@@ -63,7 +72,7 @@
</span><span class="cx"> const char* p = cstr.data();
</span><span class="cx"> for (size_t k = 0; k < cstr.length(); k++, p++) {
</span><span class="cx"> char c = *p;
</span><del>- if (c && strchr(doNotEscape, c))
</del><ins>+ if (c && doNotEscape.get(static_cast<LChar>(c)))
</ins><span class="cx"> builder.append(static_cast<LChar>(c));
</span><span class="cx"> else {
</span><span class="cx"> builder.append(static_cast<LChar>('%'));
</span><span class="lines">@@ -75,7 +84,7 @@
</span><span class="cx">
</span><span class="cx"> template <typename CharType>
</span><span class="cx"> ALWAYS_INLINE
</span><del>-static JSValue decode(ExecState* exec, const CharType* characters, int length, const char* doNotUnescape, bool strict)
</del><ins>+static JSValue decode(ExecState* exec, const CharType* characters, int length, const Bitmap<256>& doNotUnescape, bool strict)
</ins><span class="cx"> {
</span><span class="cx"> JSStringBuilder builder;
</span><span class="cx"> int k = 0;
</span><span class="lines">@@ -127,7 +136,7 @@
</span><span class="cx"> u = Lexer<UChar>::convertUnicode(p[2], p[3], p[4], p[5]);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- if (charLen && (u == 0 || u >= 128 || !strchr(doNotUnescape, u))) {
</del><ins>+ if (charLen && (u == 0 || u >= 128 || !doNotUnescape.get(static_cast<LChar>(u)))) {
</ins><span class="cx"> builder.append(u);
</span><span class="cx"> k += charLen;
</span><span class="cx"> continue;
</span><span class="lines">@@ -139,7 +148,7 @@
</span><span class="cx"> return builder.build(exec);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static JSValue decode(ExecState* exec, const char* doNotUnescape, bool strict)
</del><ins>+static JSValue decode(ExecState* exec, const Bitmap<256>& doNotUnescape, bool strict)
</ins><span class="cx"> {
</span><span class="cx"> String str = exec->argument(0).toString(exec)->value(exec);
</span><span class="cx">
</span><span class="lines">@@ -626,46 +635,51 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL globalFuncDecodeURI(ExecState* exec)
</span><span class="cx"> {
</span><del>- static const char do_not_unescape_when_decoding_URI[] =
- "#$&+,/:;=?@";
</del><ins>+ static Bitmap<256> doNotUnescapeWhenDecodingURI = makeCharacterBitmap(
+ "#$&+,/:;=?@"
+ );
</ins><span class="cx">
</span><del>- return JSValue::encode(decode(exec, do_not_unescape_when_decoding_URI, true));
</del><ins>+ return JSValue::encode(decode(exec, doNotUnescapeWhenDecodingURI, true));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL globalFuncDecodeURIComponent(ExecState* exec)
</span><span class="cx"> {
</span><del>- return JSValue::encode(decode(exec, "", true));
</del><ins>+ static Bitmap<256> emptyBitmap;
+ return JSValue::encode(decode(exec, emptyBitmap, true));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL globalFuncEncodeURI(ExecState* exec)
</span><span class="cx"> {
</span><del>- static const char do_not_escape_when_encoding_URI[] =
</del><ins>+ static Bitmap<256> doNotEscapeWhenEncodingURI = makeCharacterBitmap(
</ins><span class="cx"> "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
</span><span class="cx"> "abcdefghijklmnopqrstuvwxyz"
</span><span class="cx"> "0123456789"
</span><del>- "!#$&'()*+,-./:;=?@_~";
</del><ins>+ "!#$&'()*+,-./:;=?@_~"
+ );
</ins><span class="cx">
</span><del>- return JSValue::encode(encode(exec, do_not_escape_when_encoding_URI));
</del><ins>+ return JSValue::encode(encode(exec, doNotEscapeWhenEncodingURI));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL globalFuncEncodeURIComponent(ExecState* exec)
</span><span class="cx"> {
</span><del>- static const char do_not_escape_when_encoding_URI_component[] =
</del><ins>+ static Bitmap<256> doNotEscapeWhenEncodingURIComponent = makeCharacterBitmap(
</ins><span class="cx"> "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
</span><span class="cx"> "abcdefghijklmnopqrstuvwxyz"
</span><span class="cx"> "0123456789"
</span><del>- "!'()*-._~";
</del><ins>+ "!'()*-._~"
+ );
</ins><span class="cx">
</span><del>- return JSValue::encode(encode(exec, do_not_escape_when_encoding_URI_component));
</del><ins>+ return JSValue::encode(encode(exec, doNotEscapeWhenEncodingURIComponent));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL globalFuncEscape(ExecState* exec)
</span><span class="cx"> {
</span><del>- static const char do_not_escape[] =
</del><ins>+ static Bitmap<256> doNotEscape = makeCharacterBitmap(
</ins><span class="cx"> "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
</span><span class="cx"> "abcdefghijklmnopqrstuvwxyz"
</span><span class="cx"> "0123456789"
</span><del>- "*+-./@_";
</del><ins>+ "*+-./@_"
+ );
</ins><span class="cx">
</span><span class="cx"> JSStringBuilder builder;
</span><span class="cx"> String str = exec->argument(0).toString(exec)->value(exec);
</span><span class="lines">@@ -673,7 +687,7 @@
</span><span class="cx"> const LChar* c = str.characters8();
</span><span class="cx"> for (unsigned k = 0; k < str.length(); k++, c++) {
</span><span class="cx"> int u = c[0];
</span><del>- if (u && strchr(do_not_escape, static_cast<char>(u)))
</del><ins>+ if (u && doNotEscape.get(static_cast<LChar>(u)))
</ins><span class="cx"> builder.append(*c);
</span><span class="cx"> else {
</span><span class="cx"> builder.append(static_cast<LChar>('%'));
</span><span class="lines">@@ -692,7 +706,7 @@
</span><span class="cx"> builder.append(static_cast<LChar>('u'));
</span><span class="cx"> appendByteAsHex(u >> 8, builder);
</span><span class="cx"> appendByteAsHex(u & 0xFF, builder);
</span><del>- } else if (u != 0 && strchr(do_not_escape, static_cast<char>(u)))
</del><ins>+ } else if (u != 0 && doNotEscape.get(static_cast<LChar>(u)))
</ins><span class="cx"> builder.append(*c);
</span><span class="cx"> else {
</span><span class="cx"> builder.append(static_cast<LChar>('%'));
</span></span></pre>
</div>
</div>
</body>
</html>