Changeset 43395 in webkit for trunk/JavaScriptCore/bytecode

Timestamp:

May 8, 2009, 3:18:34 AM (16 years ago)

Author:

[email protected]

Message:

2009-05-08 Gavin Barraclough <​[email protected]>

Reviewed by Oliver "I see lots of ifdefs" Hunt.

Fix (kinda) for sampling tool breakage. The codeblock sampling tool has become
b0rked due to recent changes in native function calling. The initialization of
a ScopeNode appears to now occur before the sampling tool (or possibly the
interpreter has been brought into existence, wihich leads to crashyness).

This patch doesn't fix the problem. The crash occurs when tracking a Scope, but
we shouldn't need to track scopes when we're just sampling opcodes, not
codeblocks. Not retaining Scopes when just opcode sampling will reduce sampling
overhead reducing any instrumentation skew, which is a good thing. As a side
benefit this patch also gets the opcode sampling going again, albeit in a bit of
a lame way. Will come back later with a proper fix from codeblock sampling.

• JavaScriptCore.exp:
• bytecode/SamplingTool.cpp: (JSC::compareLineCountInfoSampling): (JSC::SamplingTool::dump):
• bytecode/SamplingTool.h: (JSC::SamplingTool::SamplingTool):
• parser/Nodes.cpp: (JSC::ScopeNode::ScopeNode):

Location:

trunk/JavaScriptCore/bytecode

Files:

• SamplingTool.cpp (modified) (7 diffs)
• SamplingTool.h (modified) (3 diffs)

trunk/JavaScriptCore/bytecode/SamplingTool.cpp

@@ -210 +210 @@
 }
 
+#if ENABLE(CODEBLOCK_SAMPLING)
 void SamplingTool::notifyOfScope(ScopeNode* scope)
 {
@@ -215 +216 @@
     m_scopeSampleMap->set(scope, new ScopeSampleRecord(scope));
 }
+#endif
 
 void SamplingTool::setup()
@@ -234 +236 @@
 };
 
+static int compareOpcodeIndicesSampling(const void* left, const void* right)
+{
+    const OpcodeSampleInfo* leftSampleInfo = reinterpret_cast<const OpcodeSampleInfo*>(left);
+    const OpcodeSampleInfo* rightSampleInfo = reinterpret_cast<const OpcodeSampleInfo*>(right);
+
+    return (leftSampleInfo->count < rightSampleInfo->count) ? 1 : (leftSampleInfo->count > rightSampleInfo->count) ? -1 : 0;
+}
+
+#if ENABLE(CODEBLOCK_SAMPLING)
 static int compareLineCountInfoSampling(const void* left, const void* right)
 {
@@ -242 +253 @@
 }
 
-static int compareOpcodeIndicesSampling(const void* left, const void* right)
-{
-    const OpcodeSampleInfo* leftSampleInfo = reinterpret_cast<const OpcodeSampleInfo*>(left);
-    const OpcodeSampleInfo* rightSampleInfo = reinterpret_cast<const OpcodeSampleInfo*>(right);
-
-    return (leftSampleInfo->count < rightSampleInfo->count) ? 1 : (leftSampleInfo->count > rightSampleInfo->count) ? -1 : 0;
-}
-
 static int compareScopeSampleRecords(const void* left, const void* right)
 {
@@ -257 +260 @@
     return (leftValue->m_sampleCount < rightValue->m_sampleCount) ? 1 : (leftValue->m_sampleCount > rightValue->m_sampleCount) ? -1 : 0;
 }
+#endif
 
 void SamplingTool::dump(ExecState* exec)
@@ -308 +312 @@
     printf("\tcti %% of self:\tcti count / sample count\n");
     
+#if ENABLE(CODEBLOCK_SAMPLING)
+
     // (3) Build and sort 'codeBlockSamples' array.
 
@@ -366 +372 @@
         }
     }
-}
-
 #else
+    UNUSED_PARAM(exec);
+#endif
+}
+
+#else
 
 void SamplingTool::dump(ExecState*)

trunk/JavaScriptCore/bytecode/SamplingTool.h

@@ -192 +192 @@
             , m_sampleCount(0)
             , m_opcodeSampleCount(0)
+#if ENABLE(CODEBLOCK_SAMPLING)
             , m_scopeSampleMap(new ScopeSampleRecordMap())
+#endif
         {
             memset(m_opcodeSamples, 0, sizeof(m_opcodeSamples));
@@ -198 +200 @@
         }
 
+#if ENABLE(CODEBLOCK_SAMPLING)
         ~SamplingTool()
         {
             deleteAllValues(*m_scopeSampleMap);
         }
+
+        void notifyOfScope(ScopeNode* scope);
+#endif
 
         void setup();
         void dump(ExecState*);
-
-        void notifyOfScope(ScopeNode* scope);
 
         void sample(CodeBlock* codeBlock, Instruction* vPC)
@@ -261 +265 @@
         unsigned m_opcodeSamplesInCTIFunctions[numOpcodeIDs];
         
+#if ENABLE(CODEBLOCK_SAMPLING)
         Mutex m_scopeSampleMapMutex;
         OwnPtr<ScopeSampleRecordMap> m_scopeSampleMap;
+#endif
     };