Changeset 67146 in webkit for trunk/JavaScriptCore/runtime/RegExp.cpp

Timestamp:

Sep 9, 2010, 7:10:37 PM (15 years ago)

Author:

[email protected]

Message:

2010-09-09 Michael Saboff <​[email protected]>

Reviewed by Gavin Barraclough.

Added a regular expression tracing facility. This tracing is connected
to jsc. Every compiled regular expression object is added to a list.
When the process exits, each regular expression dumps its pattern,
JIT address, number of times it was executed and the number of matches.
This tracing is controlled by the macro ENABLE_REGEXP_TRACING in
wtf/Platform.h.
​https://bugs.webkit.org/show_bug.cgi?id=45401

• JavaScriptCore.exp:
• jsc.cpp: (runWithScripts):
• runtime/JSGlobalData.cpp: (JSC::JSGlobalData::JSGlobalData): (JSC::JSGlobalData::~JSGlobalData): (JSC::JSGlobalData::addRegExpToTrace): (JSC::JSGlobalData::dumpRegExpTrace):
• runtime/JSGlobalData.h:
• runtime/RegExp.cpp: (JSC::RegExp::RegExp): (JSC::RegExp::create): (JSC::RegExp::match):
• runtime/RegExp.h:
• wtf/Platform.h:
• yarr/RegexJIT.h: (JSC::Yarr::RegexCodeBlock::getAddr):

2010-09-09 Michael Saboff <​[email protected]>

Reviewed by Gavin Barraclough.

Added ListHashSet.h as an exported header in support of RegExp tracing.
​https://bugs.webkit.org/show_bug.cgi?id=45401

• ForwardingHeaders/wtf/ListHashSet.h: Added.

File:

• trunk/JavaScriptCore/runtime/RegExp.cpp (modified) (7 diffs)

trunk/JavaScriptCore/runtime/RegExp.cpp

@@ -69 +69 @@
     , m_constructionError(0)
     , m_numSubpatterns(0)
+#if ENABLE(REGEXP_TRACING)
+    , m_rtMatchCallCount(0)
+    , m_rtMatchFoundCount(0)
+#endif
     , m_representation(adoptPtr(new RegExpRepresentation))
 {
@@ -90 +94 @@
 PassRefPtr<RegExp> RegExp::create(JSGlobalData* globalData, const UString& pattern, const UString& flags)
 {
-    return adoptRef(new RegExp(globalData, pattern, flags));
+    RefPtr<RegExp> res = adoptRef(new RegExp(globalData, pattern, flags));
+#if ENABLE(REGEXP_TRACING)
+    globalData->addRegExpToTrace(res);
+#endif
+    return res.release();
 }
 
@@ -110 +118 @@
     if (ovector)
         ovector->resize(0);
+    
+#if ENABLE(REGEXP_TRACING)
+    m_rtMatchCallCount++;
+#endif
 
     if (static_cast<unsigned>(startOffset) > s.length() || s.isNull())
@@ -150 +162 @@
         }
         
+#if ENABLE(REGEXP_TRACING)
+        if (result != -1)
+            m_rtMatchFoundCount++;
+#endif
+
         return result;
     }
@@ -168 +185 @@
 int RegExp::match(const UString& s, int startOffset, Vector<int, 32>* ovector)
 {
+#if ENABLE(REGEXP_TRACING)
+    m_rtMatchCallCount++;
+#endif
+    
     if (startOffset < 0)
         startOffset = 0;
@@ -203 +224 @@
         }
 
+#if ENABLE(REGEXP_TRACING)
+        m_rtMatchFoundCount++;
+#endif
+        
         return offsetVector[0];
     }
@@ -208 +233 @@
     return -1;
 }
-
-#endif
-
+    
+#endif
+
+#if ENABLE(REGEXP_TRACING)
+    void RegExp::printTraceData()
+    {
+        char formattedPattern[41];
+        char rawPattern[41];
+        
+        strncpy(rawPattern, m_pattern.utf8().data(), 40);
+        rawPattern[40]= '\0';
+        
+        int pattLen = strlen(rawPattern);
+        
+        snprintf(formattedPattern, 41, (pattLen <= 38) ? "/%.38s/" : "/%.36s...", rawPattern);
+
+#if ENABLE(YARR_JIT)
+        Yarr::RegexCodeBlock& codeBlock = m_representation->m_regExpJITCode;
+
+        char jitAddr[20];
+        if (codeBlock.getFallback())
+            sprintf(jitAddr, "fallback");
+        else
+            sprintf(jitAddr, "0x%014lx", (uintptr_t)codeBlock.getAddr());
+#else
+        const char* jitAddr = "JIT Off";
+#endif
+        
+        printf("%-40.40s %16.16s %10d %10d\n", formattedPattern, jitAddr, m_rtMatchCallCount, m_rtMatchFoundCount);
+    }
+#endif
+    
 } // namespace JSC