<!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>[210805] releases/WebKitGTK/webkit-2.14/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/210805">210805</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-01-17 05:10:39 -0800 (Tue, 17 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/210670">r210670</a> - [GTK] WebKitWebProcess at 100% CPU loading hyphenation dictionaries
https://bugs.webkit.org/show_bug.cgi?id=165601
Reviewed by Carlos Garcia Campos.
In HyphenationLibHyphen, retrieve the canonicalized absolute pathname of the dictionary file
in order to avoid storing symbolic links as the target files for specific locales. libhyphen
distributes its dictionary files by linking a set of similar locales files to a single file.
Not resolving those symbolic links means we'll be opening a single file via multiple
HyphenationDictionary objects, which is far from optimal.
To add insult to injury, these HyphenationDictionary objects were stored in a TinyLRUCache
with a slim capacity of 4. This meant that while already loading one single file through
multiple symlinks, because of continuous eviciton from this LRU cache the same symlinks
continued to be processed, in some cases resulting in opening the same dictionary file
hundreds or thousands of times. The capacity of this TinyLRUCache is increased to 32
to keep the amount of open libhyphen dictionaries capped at some reasonable number.
* platform/text/hyphen/HyphenationLibHyphen.cpp:
(WebCore::scanDirectoryForDicionaries):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreplatformtexthyphenHyphenationLibHyphencpp">releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/text/hyphen/HyphenationLibHyphen.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit214SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (210804 => 210805)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2017-01-17 13:09:39 UTC (rev 210804)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2017-01-17 13:10:39 UTC (rev 210805)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2017-01-12 Zan Dobersek <zdobersek@igalia.com>
+
+ [GTK] WebKitWebProcess at 100% CPU loading hyphenation dictionaries
+ https://bugs.webkit.org/show_bug.cgi?id=165601
+
+ Reviewed by Carlos Garcia Campos.
+
+ In HyphenationLibHyphen, retrieve the canonicalized absolute pathname of the dictionary file
+ in order to avoid storing symbolic links as the target files for specific locales. libhyphen
+ distributes its dictionary files by linking a set of similar locales files to a single file.
+ Not resolving those symbolic links means we'll be opening a single file via multiple
+ HyphenationDictionary objects, which is far from optimal.
+
+ To add insult to injury, these HyphenationDictionary objects were stored in a TinyLRUCache
+ with a slim capacity of 4. This meant that while already loading one single file through
+ multiple symlinks, because of continuous eviciton from this LRU cache the same symlinks
+ continued to be processed, in some cases resulting in opening the same dictionary file
+ hundreds or thousands of times. The capacity of this TinyLRUCache is increased to 32
+ to keep the amount of open libhyphen dictionaries capped at some reasonable number.
+
+ * platform/text/hyphen/HyphenationLibHyphen.cpp:
+ (WebCore::scanDirectoryForDicionaries):
+
</ins><span class="cx"> 2017-01-05 Milan Crha <mcrha@redhat.com>
</span><span class="cx">
</span><span class="cx"> [SOUP] AddressSanitizer: heap-use-after-free under WTF::String::fromUTF8()
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreplatformtexthyphenHyphenationLibHyphencpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/text/hyphen/HyphenationLibHyphen.cpp (210804 => 210805)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/text/hyphen/HyphenationLibHyphen.cpp 2017-01-17 13:09:39 UTC (rev 210804)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/text/hyphen/HyphenationLibHyphen.cpp 2017-01-17 13:10:39 UTC (rev 210805)
</span><span class="lines">@@ -31,6 +31,8 @@
</span><span class="cx">
</span><span class="cx"> #include "FileSystem.h"
</span><span class="cx"> #include <hyphen.h>
</span><ins>+#include <limits>
+#include <stdlib.h>
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx"> #include <wtf/TinyLRUCache.h>
</span><span class="lines">@@ -62,8 +64,14 @@
</span><span class="cx">
</span><span class="cx"> static void scanDirectoryForDicionaries(const char* directoryPath, HashMap<AtomicString, Vector<String>>& availableLocales)
</span><span class="cx"> {
</span><del>- for (const auto& filePath : listDirectory(directoryPath, "hyph_*.dic")) {
</del><ins>+ for (auto& filePath : listDirectory(directoryPath, "hyph_*.dic")) {
</ins><span class="cx"> String locale = extractLocaleFromDictionaryFilePath(filePath).convertToASCIILowercase();
</span><ins>+
+ char normalizedPath[PATH_MAX];
+ if (!realpath(fileSystemRepresentation(filePath).data(), normalizedPath))
+ continue;
+
+ filePath = stringFromFileSystemRepresentation(normalizedPath);
</ins><span class="cx"> availableLocales.add(locale, Vector<String>()).iterator->value.append(filePath);
</span><span class="cx">
</span><span class="cx"> String localeReplacingUnderscores = String(locale);
</span><span class="lines">@@ -174,9 +182,9 @@
</span><span class="cx"> class TinyLRUCachePolicy<AtomicString, RefPtr<WebCore::HyphenationDictionary>>
</span><span class="cx"> {
</span><span class="cx"> public:
</span><del>- static TinyLRUCache<AtomicString, RefPtr<WebCore::HyphenationDictionary>>& cache()
</del><ins>+ static TinyLRUCache<AtomicString, RefPtr<WebCore::HyphenationDictionary>, 32>& cache()
</ins><span class="cx"> {
</span><del>- static NeverDestroyed<TinyLRUCache<AtomicString, RefPtr<WebCore::HyphenationDictionary>>> cache;
</del><ins>+ static NeverDestroyed<TinyLRUCache<AtomicString, RefPtr<WebCore::HyphenationDictionary>, 32>> cache;
</ins><span class="cx"> return cache;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>