Changeset 99374 in webkit for trunk/Source/JavaScriptCore/heap

Timestamp:

Nov 6, 2011, 3:39:12 AM (14 years ago)

Author:

[email protected]

Message:

JSC should be able to sample itself in a more flexible way than just sampling flags
​https://bugs.webkit.org/show_bug.cgi?id=71522

Source/JavaScriptCore:

Reviewed by Gavin Barraclough.

Added a construct that looks like SamplingRegion samplingRegion("name").

• JavaScriptCore.exp:
• JavaScriptCore.xcodeproj/project.pbxproj:
• bytecode/SamplingTool.cpp:

(JSC::SamplingRegion::Locker::Locker):
(JSC::SamplingRegion::Locker::~Locker):
(JSC::SamplingRegion::sample):
(JSC::SamplingRegion::dump):
(JSC::SamplingRegion::dumpInternal):
(JSC::SamplingThread::threadStartFunc):

• bytecode/SamplingTool.h:

(JSC::SamplingRegion::SamplingRegion):
(JSC::SamplingRegion::~SamplingRegion):
(JSC::SamplingRegion::exchangeCurrent):

• bytecompiler/BytecodeGenerator.cpp:

(JSC::BytecodeGenerator::generate):

• dfg/DFGDriver.cpp:

(JSC::DFG::compile):

• heap/Heap.cpp:

(JSC::Heap::markRoots):
(JSC::Heap::collect):

• heap/VTableSpectrum.cpp:

(JSC::VTableSpectrum::countVPtr):
(JSC::VTableSpectrum::dump):

• heap/VTableSpectrum.h:
• jsc.cpp:

(main):
(runWithScripts):

• parser/Parser.h:

(JSC::parse):

• runtime/Executable.cpp:

(JSC::EvalExecutable::compileInternal):
(JSC::ProgramExecutable::compileInternal):
(JSC::FunctionExecutable::compileForCallInternal):
(JSC::FunctionExecutable::compileForConstructInternal):

• wtf/Atomics.h:

(WTF::weakCompareAndSwap):

• wtf/Platform.h:
• wtf/Spectrum.h: Added.

(WTF::Spectrum::Spectrum):
(WTF::Spectrum::add):
(WTF::Spectrum::get):
(WTF::Spectrum::begin):
(WTF::Spectrum::end):
(WTF::Spectrum::KeyAndCount::KeyAndCount):
(WTF::Spectrum::KeyAndCount::operator<):
(WTF::Spectrum::buildList):

• wtf/wtf.pri:

Source/JavaScriptGlue:

Reviewed by Gavin Barraclough.

• ForwardingHeaders/wtf/Spectrum.h: Added.

Source/WebCore:

Reviewed by Gavin Barraclough.

No new tests, since no functionality changed.

• ForwardingHeaders/wtf/Spectrum.h: Added.

Location:

trunk/Source/JavaScriptCore/heap

Files:

• Heap.cpp (modified) (3 diffs)
• VTableSpectrum.cpp (modified) (3 diffs)
• VTableSpectrum.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/heap/Heap.cpp

@@ -554 +554 @@
 void Heap::markRoots(bool fullGC)
 {
+    SamplingRegion samplingRegion("Garbage Collection: Tracing");
+
     COND_GCPHASE(fullGC, MarkFullRoots, MarkYoungRoots);
     UNUSED_PARAM(fullGC);
@@ -760 +762 @@
 void Heap::collect(SweepToggle sweepToggle)
 {
+    SamplingRegion samplingRegion("Garbage Collection");
+    
     GCPHASE(Collect);
     ASSERT(globalData()->identifierTable == wtfThreadData().currentIdentifierTable());
@@ -793 +797 @@
 
     if (sweepToggle == DoSweep) {
+        SamplingRegion samplingRegion("Garbage Collection: Sweeping");
         GCPHASE(Sweeping);
         sweep();

trunk/Source/JavaScriptCore/heap/VTableSpectrum.cpp

@@ -50 +50 @@
 void VTableSpectrum::countVPtr(void* vTablePointer)
 {
-    std::pair<HashMap<void*, unsigned long>::iterator, bool> result = m_map.add(vTablePointer, 1);
-    if (!result.second)
-        result.first->second++;
+    add(vTablePointer);
 }
 
@@ -60 +58 @@
 }
 
-struct VTableAndCount {
-    void* vtable;
-    unsigned long count;
-    
-    VTableAndCount() { }
-    
-    VTableAndCount(void* vtable, unsigned long count)
-        : vtable(vtable)
-        , count(count)
-    {
-    }
-    
-    bool operator<(const VTableAndCount& other) const
-    {
-        if (count != other.count)
-            return count < other.count;
-        return vtable > other.vtable; // this results in lower-addressed vtables being printed first
-    }
-};
-
 void VTableSpectrum::dump(FILE* output, const char* comment)
 {
     fprintf(output, "%s:\n", comment);
     
-    HashMap<void*, unsigned long>::iterator begin = m_map.begin();
-    HashMap<void*, unsigned long>::iterator end = m_map.end();
-    
-    Vector<VTableAndCount, 0> list;
-    
-    for (HashMap<void*, unsigned long>::iterator iter = begin; iter != end; ++iter)
-        list.append(VTableAndCount(iter->first, iter->second));
-    
-    std::sort(list.begin(), list.end());
+    Vector<KeyAndCount> list = buildList();
     
     for (size_t index = list.size(); index-- > 0;) {
-        VTableAndCount item = list.at(index);
+        KeyAndCount item = list.at(index);
 #if PLATFORM(MAC)
         Dl_info info;
-        if (dladdr(item.vtable, &info)) {
+        if (dladdr(item.key, &info)) {
             char* findResult = strrchr(info.dli_fname, '/');
             const char* strippedFileName;
@@ -107 +77 @@
                 strippedFileName = info.dli_fname;
             
-            fprintf(output, "    %s:%s(%p): %lu\n", strippedFileName, info.dli_sname, item.vtable, item.count);
+            fprintf(output, "    %s:%s(%p): %lu\n", strippedFileName, info.dli_sname, item.key, item.count);
             continue;
         }
 #endif
-        fprintf(output, "    %p: %lu\n", item.vtable, item.count);
+        fprintf(output, "    %p: %lu\n", item.key, item.count);
     }
     

trunk/Source/JavaScriptCore/heap/VTableSpectrum.h

@@ -28 +28 @@
 
 #include <stdio.h>
-#include <wtf/HashMap.h>
+#include <wtf/Spectrum.h>
 
 namespace JSC {
@@ -34 +34 @@
 class JSCell;
 
-class VTableSpectrum {
+class VTableSpectrum: Spectrum<void*> {
 public:
     VTableSpectrum();
@@ -43 +43 @@
     
     void dump(FILE* output, const char* comment);
-    
-private:
-    HashMap<void*, unsigned long> m_map;
 };