Changeset 34858 in webkit for trunk/JavaScriptCore/pcre/pcre_compile.cpp

Timestamp:

Jun 28, 2008, 3:21:20 PM (17 years ago)

Author:

Darin Adler

Message:

2008-06-28 Darin Adler <Darin Adler>

Reviewed by Oliver.

• ​https://bugs.webkit.org/show_bug.cgi?id=19801 add a feature so we can tell what regular expressions are taking time

• pcre/pcre_compile.cpp: (jsRegExpCompile): Compile in the string if REGEXP_HISTOGRAM is on.

• pcre/pcre_exec.cpp: (jsRegExpExecute): Add hook to time execution. (Histogram::~Histogram): Print a sorted list of what took time. (Histogram::add): Accumulate records of what took time. (HistogramTimeLogger::~HistogramTimeLogger): Hook that calls Histogram::add at the right moment and creates the global histogram object.

• pcre/pcre_internal.h: Define REGEXP_HISTOGRAM.

• pcre/pcre_tables.cpp: Added missing include of "config.h". Not needed any more, but an omissions an earlier version of this patch detected.
• pcre/pcre_ucp_searchfuncs.cpp: Ditto.
• pcre/pcre_xclass.cpp: Ditto.

File:

• trunk/JavaScriptCore/pcre/pcre_compile.cpp (modified) (2 diffs)

trunk/JavaScriptCore/pcre/pcre_compile.cpp

@@ -2565 +2565 @@
     
     size_t size = length + sizeof(JSRegExp);
+#if REGEXP_HISTOGRAM
+    size_t stringOffset = (size + sizeof(UChar) - 1) / sizeof(UChar) * sizeof(UChar);
+    size = stringOffset + patternLength * sizeof(UChar);
+#endif
     JSRegExp* re = reinterpret_cast<JSRegExp*>(new char[size]);
     
@@ -2665 +2669 @@
     }
     
+#if REGEXP_HISTOGRAM
+    re->stringOffset = stringOffset;
+    re->stringLength = patternLength;
+    memcpy(reinterpret_cast<char*>(re) + stringOffset, pattern, patternLength * 2);
+#endif
+
     if (numSubpatterns)
         *numSubpatterns = re->topBracket;