JavaScriptCore-1218.33.tar.gz

[apple/javascriptcore.git] / profiler / Profile.cpp

diff --git a/profiler/Profile.cpp b/profiler/Profile.cpp
index 126e6f686e54bf4a75ea99df2546211d7ca0b10b..2274889a1f1fcff1abf1a6eff8aa762b4a30adf3 100644 (file)
--- a/profiler/Profile.cpp
+++ b/profiler/Profile.cpp
@@ -28,21 +28,22 @@
 
 #include "ProfileNode.h"
 #include <stdio.h>
 
 #include "ProfileNode.h"
 #include <stdio.h>

+#include <wtf/DataLog.h>

 
 namespace JSC {
 
 
 namespace JSC {
 

-PassRefPtr<Profile> Profile::create(const UString& title, unsigned uid)
+PassRefPtr<Profile> Profile::create(const String& title, unsigned uid)

 {
     return adoptRef(new Profile(title, uid));
 }
 
 {
     return adoptRef(new Profile(title, uid));
 }
 

-Profile::Profile(const UString& title, unsigned uid)
+Profile::Profile(const String& title, unsigned uid)

     : m_title(title)
     , m_uid(uid)
 {
     // FIXME: When multi-threading is supported this will be a vector and calls
     // into the profiler will need to know which thread it is executing on.
     : m_title(title)
     , m_uid(uid)
 {
     // FIXME: When multi-threading is supported this will be a vector and calls
     // into the profiler will need to know which thread it is executing on.

-    m_head = ProfileNode::create(CallIdentifier("Thread_1", UString(), 0), 0, 0);
+    m_head = ProfileNode::create(0, CallIdentifier("Thread_1", String(), 0), 0, 0);

 }
 
 Profile::~Profile()
 }
 
 Profile::~Profile()


@@ -102,15 +103,15 @@ void Profile::restoreAll()
 #ifndef NDEBUG
 void Profile::debugPrintData() const
 {
 #ifndef NDEBUG
 void Profile::debugPrintData() const
 {

-    printf("Call graph:\n");
+    dataLogF("Call graph:\n");

     m_head->debugPrintData(0);
 }
 
     m_head->debugPrintData(0);
 }
 

-typedef pair<UString::Rep*, unsigned> NameCountPair;
+typedef WTF::KeyValuePair<FunctionCallHashCount::ValueType, unsigned> NameCountPair;

 
 static inline bool functionNameCountPairComparator(const NameCountPair& a, const NameCountPair& b)
 {
 
 static inline bool functionNameCountPairComparator(const NameCountPair& a, const NameCountPair& b)
 {

-    return a.second > b.second;
+    return a.value > b.value;

 }
 
 void Profile::debugPrintDataSampleStyle() const
 }
 
 void Profile::debugPrintDataSampleStyle() const


@@ -118,18 +119,18 @@ void Profile::debugPrintDataSampleStyle() const
     typedef Vector<NameCountPair> NameCountPairVector;
 
     FunctionCallHashCount countedFunctions;
     typedef Vector<NameCountPair> NameCountPairVector;
 
     FunctionCallHashCount countedFunctions;

-    printf("Call graph:\n");
+    dataLogF("Call graph:\n");

     m_head->debugPrintDataSampleStyle(0, countedFunctions);
 
     m_head->debugPrintDataSampleStyle(0, countedFunctions);
 

-    printf("\nTotal number in stack:\n");
+    dataLogF("\nTotal number in stack:\n");

     NameCountPairVector sortedFunctions(countedFunctions.size());
     copyToVector(countedFunctions, sortedFunctions);
 
     std::sort(sortedFunctions.begin(), sortedFunctions.end(), functionNameCountPairComparator);
     for (NameCountPairVector::iterator it = sortedFunctions.begin(); it != sortedFunctions.end(); ++it)
     NameCountPairVector sortedFunctions(countedFunctions.size());
     copyToVector(countedFunctions, sortedFunctions);
 
     std::sort(sortedFunctions.begin(), sortedFunctions.end(), functionNameCountPairComparator);
     for (NameCountPairVector::iterator it = sortedFunctions.begin(); it != sortedFunctions.end(); ++it)

-        printf("        %-12d%s\n", (*it).second, UString((*it).first).UTF8String().data());
+        dataLogF("        %-12d%s\n", (*it).value, String((*it).key).utf8().data());

 
 

-    printf("\nSort by top of stack, same collapsed (when >= 5):\n");
+    dataLogF("\nSort by top of stack, same collapsed (when >= 5):\n");

 }
 #endif
 
 }
 #endif