[webkit-changes] [106025] trunk/Source/WebCore

Thu, 26 Jan 2012 12:09:48 -0800

Title: [106025] trunk/Source/WebCore
Revision
106025
Author
benja...@webkit.org
Date
2012-01-26 12:09:40 -0800 (Thu, 26 Jan 2012)

Log Message

Using strncmp() for comparing scheme and port numbers is inefficient
https://bugs.webkit.org/show_bug.cgi?id=75821

Reviewed by Darin Adler.

Replace the equal() function comparing 2 arbitrary strings by a template
comparing the string to an array, character by character.

This is only used for small strings: the schemes and the ports.

* platform/KURL.cpp:
(WebCore::equal):
(WebCore::isDefaultPortForScheme):
(WebCore::isNonFileHierarchicalScheme):
(WebCore::isCanonicalHostnameLowercaseForScheme):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (106024 => 106025)


--- trunk/Source/WebCore/ChangeLog	2012-01-26 20:02:54 UTC (rev 106024)
+++ trunk/Source/WebCore/ChangeLog	2012-01-26 20:09:40 UTC (rev 106025)
@@ -1,3 +1,21 @@
+2012-01-26  Benjamin Poulain  <benja...@webkit.org>
+
+        Using strncmp() for comparing scheme and port numbers is inefficient
+        https://bugs.webkit.org/show_bug.cgi?id=75821
+
+        Reviewed by Darin Adler.
+
+        Replace the equal() function comparing 2 arbitrary strings by a template
+        comparing the string to an array, character by character.
+
+        This is only used for small strings: the schemes and the ports.
+
+        * platform/KURL.cpp:
+        (WebCore::equal):
+        (WebCore::isDefaultPortForScheme):
+        (WebCore::isNonFileHierarchicalScheme):
+        (WebCore::isCanonicalHostnameLowercaseForScheme):
+
 2012-01-26  Anders Carlsson  <ander...@apple.com>
 
         WebWheelEvent::Phase and PlatformWheelEvent::Phase declarations should match AppKit

Modified: trunk/Source/WebCore/platform/KURL.cpp (106024 => 106025)


--- trunk/Source/WebCore/platform/KURL.cpp	2012-01-26 20:02:54 UTC (rev 106024)
+++ trunk/Source/WebCore/platform/KURL.cpp	2012-01-26 20:09:40 UTC (rev 106025)
@@ -68,6 +68,18 @@
 
 #if !USE(GOOGLEURL)
 
+static const char wsScheme[] = {'w', 's'};
+static const char ftpScheme[] = {'f', 't', 'p'};
+static const char ftpPort[] = {'2', '1'};
+static const char wssScheme[] = {'w', 's', 's'};
+static const char fileScheme[] = {'f', 'i', 'l', 'e'};
+static const char httpScheme[] = {'h', 't', 't', 'p'};
+static const char httpPort[] = {'8', '0'};
+static const char httpsScheme[] = {'h', 't', 't', 'p', 's'};
+static const char httpsPort[] = {'4', '4', '3'};
+static const char gopherScheme[] = {'g', 'o', 'p', 'h', 'e', 'r'};
+static const char gopherPort[] = {'7', '0'};
+
 static inline bool isLetterMatchIgnoringCase(char character, char lowercaseLetter)
 {
     ASSERT(isASCIILower(lowercaseLetter));
@@ -1050,15 +1062,22 @@
     parse(buffer.data(), &string);
 }
 
-// FIXME: (lenA != lenB) is never true in the way this function is used.
-// FIXME: This is only used for short string, we should replace equal() by a recursive template comparing the strings without loop.
-static inline bool equal(const char* a, size_t lenA, const char* b, size_t lenB)
+template<size_t length>
+static inline bool equal(const char* a, const char (&b)[length])
 {
-    if (lenA != lenB)
-        return false;
-    return !strncmp(a, b, lenA);
+    for (size_t i = 0; i < length; ++i) {
+        if (a[i] != b[i])
+            return false;
+    }
+    return true;
 }
 
+template<size_t lengthB>
+static inline bool equal(const char* stringA, size_t lengthA, const char (&stringB)[lengthB])
+{
+    return lengthA == lengthB && equal(stringA, stringB);
+}
+
 // List of default schemes is taken from google-url:
 // http://code.google.com/p/google-url/source/browse/trunk/src/url_canon_stdurl.cc#120
 static inline bool isDefaultPortForScheme(const char* port, size_t portLength, const char* scheme, size_t schemeLength)
@@ -1067,19 +1086,19 @@
     // the code was moved from google-url, but may be removed later.
     switch (schemeLength) {
     case 2:
-        return equal("ws", 2, scheme, schemeLength) && equal("80", 2, port, portLength);
+        return equal(scheme, wsScheme) && equal(port, portLength, httpPort);
     case 3:
-        if (equal("ftp", 3, scheme, schemeLength))
-            return equal("21", 2, port, portLength);
-        if (equal("wss", 3, scheme, schemeLength))
-            return equal("443", 3, port, portLength);
+        if (equal(scheme, ftpScheme))
+            return equal(port, portLength, ftpPort);
+        if (equal(scheme, wssScheme))
+            return equal(port, portLength, httpsPort);
         break;
     case 4:
-        return equal("http", 4, scheme, schemeLength) && equal("80", 2, port, portLength);
+        return equal(scheme, httpScheme) && equal(port, portLength, httpPort);
     case 5:
-        return equal("https", 5, scheme, schemeLength) && equal("443", 3, port, portLength);
+        return equal(scheme, httpsScheme) && equal(port, portLength, httpsPort);
     case 6:
-        return equal("gopher", 6, scheme, schemeLength) && equal("70", 2, port, portLength);
+        return equal(scheme, gopherScheme) && equal(port, portLength, gopherPort);
     }
     return false;
 }
@@ -1093,15 +1112,15 @@
 {
     switch (schemeLength) {
     case 2:
-        return equal("ws", 2, scheme, schemeLength);
+        return equal(scheme, wsScheme);
     case 3:
-        return equal("ftp", 3, scheme, schemeLength) || equal("wss", 3, scheme, schemeLength);
+        return equal(scheme, ftpScheme) || equal(scheme, wssScheme);
     case 4:
-        return equal("http", 4, scheme, schemeLength);
+        return equal(scheme, httpScheme);
     case 5:
-        return equal("https", 5, scheme, schemeLength);
+        return equal(scheme, httpsScheme);
     case 6:
-        return equal("gopher", 6, scheme, schemeLength);
+        return equal(scheme, gopherScheme);
     }
     return false;
 }
@@ -1110,15 +1129,15 @@
 {
     switch (schemeLength) {
     case 2:
-        return equal("ws", 2, scheme, schemeLength);
+        return equal(scheme, wsScheme);
     case 3:
-        return equal("ftp", 3, scheme, schemeLength) || equal("wss", 3, scheme, schemeLength);
+        return equal(scheme, ftpScheme) || equal(scheme, wssScheme);
     case 4:
-        return equal("http", 4, scheme, schemeLength) || equal("file", 4, scheme, schemeLength);
+        return equal(scheme, httpScheme) || equal(scheme, fileScheme);
     case 5:
-        return equal("https", 5, scheme, schemeLength);
+        return equal(scheme, httpsScheme);
     case 6:
-        return equal("gopher", 6, scheme, schemeLength);
+        return equal(scheme, gopherScheme);
     }
     return false;
 }

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to