Changeset 206924 in webkit

Timestamp:

Oct 7, 2016, 12:03:13 PM (9 years ago)

Author:

achristensen@apple.com

Message:

Disable URLParser logs by default in all builds
​https://bugs.webkit.org/show_bug.cgi?id=163135

Reviewed by Brady Eidson.

In debug builds with the URLParser enabled, some tests time out because
parameters to generate log strings are being evaluated for each character of each URL
and then not being used if URLParser logs are disabled. Generating these unused parameters
is too slow even for debug builds. Let's only generate them if they are to be used.

No change in behaviour.

• platform/URLParser.cpp:

(WebCore::URLParser::parse):
(WebCore::URLParser::allValuesEqual):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/URLParser.cpp (modified) (7 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-07  Alex Christensen  <achristensen@webkit.org>
+
+        Disable URLParser logs by default in all builds
+        https://bugs.webkit.org/show_bug.cgi?id=163135
+
+        Reviewed by Brady Eidson.
+
+        In debug builds with the URLParser enabled, some tests time out because
+        parameters to generate log strings are being evaluated for each character of each URL
+        and then not being used if URLParser logs are disabled.  Generating these unused parameters
+        is too slow even for debug builds.  Let's only generate them if they are to be used.
+
+        No change in behaviour.
+
+        * platform/URLParser.cpp:
+        (WebCore::URLParser::parse):
+        (WebCore::URLParser::allValuesEqual):
+
 2016-10-07  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/platform/URLParser.cpp

@@ -34 +34 @@
 namespace WebCore {
 
+#define URL_PARSER_DEBUGGING 0
+    
+#if URL_PARSER_DEBUGGING
+#define URL_PARSER_LOG(...) LOG(URLParser, __VA_ARGS__)
+#else
+#define URL_PARSER_LOG(...)
+#endif
+    
 template<typename CharacterType>
 class CodePointIterator {
@@ -1151 +1159 @@
 void URLParser::parse(const CharacterType* input, const unsigned length, const URL& base, const TextEncoding& encoding)
 {
-    LOG(URLParser, "Parsing URL <%s> base <%s> encoding <%s>", String(input, length).utf8().data(), base.string().utf8().data(), encoding.name());
+    URL_PARSER_LOG("Parsing URL <%s> base <%s> encoding <%s>", String(input, length).utf8().data(), base.string().utf8().data(), encoding.name());
     m_url = { };
     ASSERT(m_asciiBuffer.isEmpty());
@@ -1196 +1204 @@
     };
 
-#define LOG_STATE(x) LOG(URLParser, "State %s, code point %c, parsed data <%s> size %zu", x, *c, parsedDataView(0, currentPosition(c)).utf8().data(), currentPosition(c))
-#define LOG_FINAL_STATE(x) LOG(URLParser, "Final State: %s", x)
+#define LOG_STATE(x) URL_PARSER_LOG("State %s, code point %c, parsed data <%s> size %zu", x, *c, parsedDataView(0, currentPosition(c)).utf8().data(), currentPosition(c))
+#define LOG_FINAL_STATE(x) URL_PARSER_LOG("Final State: %s", x)
 
     State state = State::SchemeStart;
@@ -1444 +1452 @@
                     auto findLastAt = c;
                     while (!findLastAt.atEnd()) {
-                        LOG(URLParser, "Finding last @: %c", *findLastAt);
+                        URL_PARSER_LOG("Finding last @: %c", *findLastAt);
                         if (*findLastAt == '@')
                             lastAt = findLastAt;
@@ -1806 +1814 @@
         case State::Fragment:
             do {
-                LOG(URLParser, "State Fragment");
+                URL_PARSER_LOG("State Fragment");
                 if (!m_didSeeUnicodeFragmentCodePoint && isASCII(*c))
                     appendToASCIIBuffer(*c);
@@ -2050 +2058 @@
     }
     m_url.m_isValid = true;
-    LOG(URLParser, "Parsed URL <%s>", m_url.m_string.utf8().data());
+    URL_PARSER_LOG("Parsed URL <%s>", m_url.m_string.utf8().data());
 }
 
@@ -2780 +2788 @@
     // FIXME: m_cannotBeABaseURL is not compared because the old URL::parse did not use it,
     // but once we get rid of URL::parse its value should be tested.
-    LOG(URLParser, "%d %d %d %d %d %d %d %d %d %d %d %d %s\n%d %d %d %d %d %d %d %d %d %d %d %d %s",
+    URL_PARSER_LOG("%d %d %d %d %d %d %d %d %d %d %d %d %s\n%d %d %d %d %d %d %d %d %d %d %d %d %s",
         a.m_isValid,
         a.m_protocolIsInHTTPFamily,