Changeset 237357 in webkit

Timestamp:

Oct 23, 2018 11:02:32 AM (6 years ago)

Author:

Antti Koivisto

Message:

topPrivatelyControlledDomain is slow
​https://bugs.webkit.org/show_bug.cgi?id=190792

Reviewed by Alex Christensen.

It calls into some slowish CFNetwork code and ends up showing up in profiles.

• platform/mac/PublicSuffixMac.mm:

(WebCore::topPrivatelyControlledDomain):

Add a cache that avoids calls into frameworks.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/mac/PublicSuffixMac.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-10-23  Antti Koivisto  <antti@apple.com>
+
+        topPrivatelyControlledDomain is slow
+        https://bugs.webkit.org/show_bug.cgi?id=190792
+
+        Reviewed by Alex Christensen.
+
+        It calls into some slowish CFNetwork code and ends up showing up in profiles.
+
+        * platform/mac/PublicSuffixMac.mm:
+        (WebCore::topPrivatelyControlledDomain):
+
+        Add a cache that avoids calls into frameworks.
+
 2018-10-23  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/platform/mac/PublicSuffixMac.mm

@@ -32 +32 @@
 #import "WebCoreNSURLExtras.h"
 #import <pal/spi/cf/CFNetworkSPI.h>
+#import <wtf/HashMap.h>
+#import <wtf/text/StringHash.h>
 
 namespace WebCore {
@@ -44 +46 @@
 String topPrivatelyControlledDomain(const String& domain)
 {
-    if (URL::hostIsIPAddress(domain))
+    if (domain.isEmpty() || !domain.isAllASCII())
         return domain;
 
-    if (!domain.isAllASCII())
-        return domain;
-    
-    const auto& lowercaseDomain = domain.convertToASCIILowercase();
-    if (lowercaseDomain == "localhost")
-        return lowercaseDomain;
+    static NeverDestroyed<HashMap<String, String, ASCIICaseInsensitiveHash>> cache;
+    static Lock cacheLock;
 
-    size_t separatorPosition;
-    for (unsigned labelStart = 0; (separatorPosition = lowercaseDomain.find('.', labelStart)) != notFound; labelStart = separatorPosition + 1) {
-        if (isPublicSuffix(lowercaseDomain.substring(separatorPosition + 1)))
-            return lowercaseDomain.substring(labelStart);
-    }
-    return String();
+    auto isolatedDomain = domain.isolatedCopy();
+
+    auto locker = holdLock(cacheLock);
+
+    constexpr auto maximumSizeToPreventUnlimitedGrowth = 128;
+    if (cache.get().size() == maximumSizeToPreventUnlimitedGrowth)
+        cache.get().clear();
+
+    return cache.get().ensure(isolatedDomain, [&isolatedDomain] {
+        const auto lowercaseDomain = isolatedDomain.convertToASCIILowercase();
+        if (lowercaseDomain == "localhost")
+            return lowercaseDomain;
+
+        if (URL::hostIsIPAddress(lowercaseDomain))
+            return lowercaseDomain;
+
+        size_t separatorPosition;
+        for (unsigned labelStart = 0; (separatorPosition = lowercaseDomain.find('.', labelStart)) != notFound; labelStart = separatorPosition + 1) {
+            if (isPublicSuffix(lowercaseDomain.substring(separatorPosition + 1)))
+                return lowercaseDomain.substring(labelStart);
+        }
+        return String();
+    }).iterator->value.isolatedCopy();
 }