Imported WebKit commit e89504fa9195b2063b2530961d4b73dd08de3242 (http://svn.webkit.org/repository/webkit/trunk@135485)

Change-Id: I03774e5ac79721c13ffa30d152537a74d0b12e66
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 19 insertions, 19 deletions

diff --git a/Source/JavaScriptCore/heap/HeapStatistics.cpp b/Source/JavaScriptCore/heap/HeapStatistics.cpp
index 8340bfa37..2b98fe711 100644
--- a/Source/JavaScriptCore/heap/HeapStatistics.cpp
+++ b/Source/JavaScriptCore/heap/HeapStatistics.cpp
@@ -41,8 +41,8 @@ namespace JSC {
 
 double HeapStatistics::s_startTime = 0.0;
 double HeapStatistics::s_endTime = 0.0;
-Deque<double>* HeapStatistics::s_pauseTimeStarts = 0;
-Deque<double>* HeapStatistics::s_pauseTimeEnds = 0;
+Vector<double>* HeapStatistics::s_pauseTimeStarts = 0;
+Vector<double>* HeapStatistics::s_pauseTimeEnds = 0;
 
 #if OS(UNIX) 
 
@@ -50,8 +50,8 @@ void HeapStatistics::initialize()
 {
     ASSERT(Options::recordGCPauseTimes());
     s_startTime = WTF::monotonicallyIncreasingTime();
-    s_pauseTimeStarts = new Deque<double>();
-    s_pauseTimeEnds = new Deque<double>();
+    s_pauseTimeStarts = new Vector<double>();
+    s_pauseTimeEnds = new Vector<double>();
 }
 
 void HeapStatistics::recordGCPauseTime(double start, double end)
@@ -75,28 +75,28 @@ void HeapStatistics::logStatistics()
 #error "The HeapStatistics module is not supported on this platform."
 #endif
     if (!vmName || !suiteName || !benchmarkName)
-        dataLog("HeapStatistics: {\"max_rss\": %ld", usage.ru_maxrss);
+        dataLogF("HeapStatistics: {\"max_rss\": %ld", usage.ru_maxrss);
     else
-        dataLog("HeapStatistics: {\"max_rss\": %ld, \"vm_name\": \"%s\", \"suite_name\": \"%s\", \"benchmark_name\": \"%s\"", 
+        dataLogF("HeapStatistics: {\"max_rss\": %ld, \"vm_name\": \"%s\", \"suite_name\": \"%s\", \"benchmark_name\": \"%s\"", 
             usage.ru_maxrss, vmName, suiteName, benchmarkName); 
 
     if (Options::recordGCPauseTimes()) {
-        dataLog(", \"pause_times\": [");
-        Deque<double>::iterator startIt = s_pauseTimeStarts->begin();
-        Deque<double>::iterator endIt = s_pauseTimeEnds->begin();
+        dataLogF(", \"pause_times\": [");
+        Vector<double>::iterator startIt = s_pauseTimeStarts->begin();
+        Vector<double>::iterator endIt = s_pauseTimeEnds->begin();
         if (startIt != s_pauseTimeStarts->end() && endIt != s_pauseTimeEnds->end()) {
-            dataLog("[%f, %f]", *startIt, *endIt);
+            dataLogF("[%f, %f]", *startIt, *endIt);
             ++startIt;
             ++endIt;
         }
         while (startIt != s_pauseTimeStarts->end() && endIt != s_pauseTimeEnds->end()) {
-            dataLog(", [%f, %f]", *startIt, *endIt);
+            dataLogF(", [%f, %f]", *startIt, *endIt);
             ++startIt;
             ++endIt;
         }
-        dataLog("], \"start_time\": %f, \"end_time\": %f", s_startTime, s_endTime);
+        dataLogF("], \"start_time\": %f, \"end_time\": %f", s_startTime, s_endTime);
     }
-    dataLog("}\n");
+    dataLogF("}\n");
 }
 
 void HeapStatistics::exitWithFailure()
@@ -228,20 +228,20 @@ inline size_t StorageStatistics::storageCapacity()
 
 void HeapStatistics::showObjectStatistics(Heap* heap)
 {
-    dataLog("\n=== Heap Statistics: ===\n");
-    dataLog("size: %ldkB\n", static_cast<long>(heap->m_sizeAfterLastCollect / KB));
-    dataLog("capacity: %ldkB\n", static_cast<long>(heap->capacity() / KB));
-    dataLog("pause time: %lfms\n\n", heap->m_lastGCLength);
+    dataLogF("\n=== Heap Statistics: ===\n");
+    dataLogF("size: %ldkB\n", static_cast<long>(heap->m_sizeAfterLastCollect / KB));
+    dataLogF("capacity: %ldkB\n", static_cast<long>(heap->capacity() / KB));
+    dataLogF("pause time: %lfms\n\n", heap->m_lastGCLength);
 
     StorageStatistics storageStatistics;
     heap->m_objectSpace.forEachLiveCell(storageStatistics);
-    dataLog("wasted .property storage: %ldkB (%ld%%)\n",
+    dataLogF("wasted .property storage: %ldkB (%ld%%)\n",
         static_cast<long>(
             (storageStatistics.storageCapacity() - storageStatistics.storageSize()) / KB),
         static_cast<long>(
             (storageStatistics.storageCapacity() - storageStatistics.storageSize()) * 100
                 / storageStatistics.storageCapacity()));
-    dataLog("objects with out-of-line .property storage: %ld (%ld%%)\n",
+    dataLogF("objects with out-of-line .property storage: %ld (%ld%%)\n",
         static_cast<long>(
             storageStatistics.objectWithOutOfLineStorageCount()),
         static_cast<long>(