diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-24 16:36:50 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-24 16:36:50 +0100 |
| commit | ad0d549d4cc13433f77c1ac8f0ab379c83d93f28 (patch) | |
| tree | b34b0daceb7c8e7fdde4b4ec43650ab7caadb0a9 /Source/JavaScriptCore/heap/Heap.cpp | |
| parent | 03e12282df9aa1e1fb05a8b90f1cfc2e08764cec (diff) | |
| download | qtwebkit-ad0d549d4cc13433f77c1ac8f0ab379c83d93f28.tar.gz | |
Imported WebKit commit bb52bf3c0119e8a128cd93afe5572413a8617de9 (http://svn.webkit.org/repository/webkit/trunk@108790)
Diffstat (limited to 'Source/JavaScriptCore/heap/Heap.cpp')
| -rw-r--r-- | Source/JavaScriptCore/heap/Heap.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/Source/JavaScriptCore/heap/Heap.cpp b/Source/JavaScriptCore/heap/Heap.cpp index 9f5094a58..1333c7b2c 100644 --- a/Source/JavaScriptCore/heap/Heap.cpp +++ b/Source/JavaScriptCore/heap/Heap.cpp @@ -21,8 +21,8 @@ #include "config.h" #include "Heap.h" -#include "BumpSpace.h" -#include "BumpSpaceInlineMethods.h" +#include "CopiedSpace.h" +#include "CopiedSpaceInlineMethods.h" #include "CodeBlock.h" #include "ConservativeRoots.h" #include "GCActivityCallback.h" @@ -77,7 +77,7 @@ struct GCTimer { } ~GCTimer() { - printf("%s: %.2lfms (avg. %.2lf, min. %.2lf, max. %.2lf)\n", m_name, m_time * 1000, m_time * 1000 / m_count, m_min*1000, m_max*1000); + dataLog("%s: %.2lfms (avg. %.2lf, min. %.2lf, max. %.2lf)\n", m_name, m_time * 1000, m_time * 1000 / m_count, m_min*1000, m_max*1000); } double m_time; double m_min; @@ -127,7 +127,7 @@ struct GCCounter { } ~GCCounter() { - printf("%s: %zu values (avg. %zu, min. %zu, max. %zu)\n", m_name, m_total, m_total / m_count, m_min, m_max); + dataLog("%s: %zu values (avg. %zu, min. %zu, max. %zu)\n", m_name, m_total, m_total / m_count, m_min, m_max); } const char* m_name; size_t m_count; @@ -345,7 +345,7 @@ Heap::~Heap() m_blockFreeingThreadShouldQuit = true; m_freeBlockCondition.broadcast(); } - waitForThreadCompletion(m_blockFreeingThread, 0); + waitForThreadCompletion(m_blockFreeingThread); // The destroy function must already have been called, so assert this. ASSERT(!m_globalData); @@ -381,8 +381,8 @@ void Heap::destroy() ASSERT(!size()); #if ENABLE(SIMPLE_HEAP_PROFILING) - m_slotVisitor.m_visitedTypeCounts.dump(stderr, "Visited Type Counts"); - m_destroyedTypeCounts.dump(stderr, "Destroyed Type Counts"); + m_slotVisitor.m_visitedTypeCounts.dump(WTF::dataFile(), "Visited Type Counts"); + m_destroyedTypeCounts.dump(WTF::dataFile(), "Destroyed Type Counts"); #endif releaseFreeBlocks(); @@ -407,10 +407,9 @@ void Heap::waitForRelativeTime(double relative) waitForRelativeTimeWhileHoldingLock(relative); } -void* Heap::blockFreeingThreadStartFunc(void* heap) +void Heap::blockFreeingThreadStartFunc(void* heap) { static_cast<Heap*>(heap)->blockFreeingThreadMain(); - return 0; } void Heap::blockFreeingThreadMain() |