JavaScriptCore-903.5.tar.gz

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

diff --git a/profiler/ProfileNode.cpp b/profiler/ProfileNode.cpp
index 19050aa0c60a6f39e5073c1caa43d43d3af15df0..8f20bbeff8a60b512c506fd4bf9e240e17fa062b 100644 (file)
--- a/profiler/ProfileNode.cpp
+++ b/profiler/ProfileNode.cpp
@@ -32,29 +32,33 @@
 #include "Profiler.h"
 #include <stdio.h>
 #include <wtf/DateMath.h>
 #include "Profiler.h"
 #include <stdio.h>
 #include <wtf/DateMath.h>

+#include <wtf/text/StringHash.h>

 
 

-#if PLATFORM(WIN_OS)
+#if OS(WINDOWS)

 #include <windows.h>
 #endif
 
 #include <windows.h>
 #endif
 

+using namespace WTF;
+

 namespace JSC {
 
 static double getCount()
 {
 namespace JSC {
 
 static double getCount()
 {

-#if PLATFORM(WIN_OS)
-    static LARGE_INTEGER frequency = {0};
+#if OS(WINDOWS)
+    static LARGE_INTEGER frequency;

     if (!frequency.QuadPart)
         QueryPerformanceFrequency(&frequency);
     LARGE_INTEGER counter;
     QueryPerformanceCounter(&counter);
     return static_cast<double>(counter.QuadPart) / frequency.QuadPart;
 #else
     if (!frequency.QuadPart)
         QueryPerformanceFrequency(&frequency);
     LARGE_INTEGER counter;
     QueryPerformanceCounter(&counter);
     return static_cast<double>(counter.QuadPart) / frequency.QuadPart;
 #else

-    return WTF::getCurrentUTCTimeWithMicroseconds();
+    return currentTimeMS();

 #endif
 }
 
 #endif
 }
 

-ProfileNode::ProfileNode(const CallIdentifier& callIdentifier, ProfileNode* headNode, ProfileNode* parentNode)
-    : m_callIdentifier(callIdentifier)
+ProfileNode::ProfileNode(ExecState* callerCallFrame, const CallIdentifier& callIdentifier, ProfileNode* headNode, ProfileNode* parentNode)
+    : m_callerCallFrame(callerCallFrame)
+    , m_callIdentifier(callIdentifier)

     , m_head(headNode)
     , m_parent(parentNode)
     , m_nextSibling(0)
     , m_head(headNode)
     , m_parent(parentNode)
     , m_nextSibling(0)


@@ -69,8 +73,9 @@ ProfileNode::ProfileNode(const CallIdentifier& callIdentifier, ProfileNode* head
     startTimer();
 }
 
     startTimer();
 }
 

-ProfileNode::ProfileNode(ProfileNode* headNode, ProfileNode* nodeToCopy)
-    : m_callIdentifier(nodeToCopy->callIdentifier())
+ProfileNode::ProfileNode(ExecState* callerCallFrame, ProfileNode* headNode, ProfileNode* nodeToCopy)
+    : m_callerCallFrame(callerCallFrame)
+    , m_callIdentifier(nodeToCopy->callIdentifier())

     , m_head(headNode)
     , m_parent(nodeToCopy->parent())
     , m_nextSibling(0)
     , m_head(headNode)
     , m_parent(nodeToCopy->parent())
     , m_nextSibling(0)


@@ -84,7 +89,7 @@ ProfileNode::ProfileNode(ProfileNode* headNode, ProfileNode* nodeToCopy)
 {
 }
 
 {
 }
 

-ProfileNode* ProfileNode::willExecute(const CallIdentifier& callIdentifier)
+ProfileNode* ProfileNode::willExecute(ExecState* callerCallFrame, const CallIdentifier& callIdentifier)

 {
     for (StackIterator currentChild = m_children.begin(); currentChild != m_children.end(); ++currentChild) {
         if ((*currentChild)->callIdentifier() == callIdentifier) {
 {
     for (StackIterator currentChild = m_children.begin(); currentChild != m_children.end(); ++currentChild) {
         if ((*currentChild)->callIdentifier() == callIdentifier) {


@@ -93,7 +98,7 @@ ProfileNode* ProfileNode::willExecute(const CallIdentifier& callIdentifier)
         }
     }
 
         }
     }
 

-    RefPtr<ProfileNode> newChild = ProfileNode::create(callIdentifier, m_head ? m_head : this, this); // If this ProfileNode has no head it is the head.
+    RefPtr<ProfileNode> newChild = ProfileNode::create(callerCallFrame, callIdentifier, m_head ? m_head : this, this); // If this ProfileNode has no head it is the head.

     if (m_children.size())
         m_children.last()->setNextSibling(newChild.get());
     m_children.append(newChild.release());
     if (m_children.size())
         m_children.last()->setNextSibling(newChild.get());
     m_children.append(newChild.release());


@@ -291,11 +296,11 @@ void ProfileNode::debugPrintData(int indentLevel) const
         printf("  ");
 
     printf("Function Name %s %d SelfTime %.3fms/%.3f%% TotalTime %.3fms/%.3f%% VSelf %.3fms VTotal %.3fms Visible %s Next Sibling %s\n",
         printf("  ");
 
     printf("Function Name %s %d SelfTime %.3fms/%.3f%% TotalTime %.3fms/%.3f%% VSelf %.3fms VTotal %.3fms Visible %s Next Sibling %s\n",

-        functionName().UTF8String().c_str(), 
+        functionName().utf8().data(), 

         m_numberOfCalls, m_actualSelfTime, selfPercent(), m_actualTotalTime, totalPercent(),
         m_visibleSelfTime, m_visibleTotalTime, 
         (m_visible ? "True" : "False"),
         m_numberOfCalls, m_actualSelfTime, selfPercent(), m_actualTotalTime, totalPercent(),
         m_visibleSelfTime, m_visibleTotalTime, 
         (m_visible ? "True" : "False"),

-        m_nextSibling ? m_nextSibling->functionName().UTF8String().c_str() : "");
+        m_nextSibling ? m_nextSibling->functionName().utf8().data() : "");

 
     ++indentLevel;
 
 
     ++indentLevel;
 


@@ -310,13 +315,13 @@ double ProfileNode::debugPrintDataSampleStyle(int indentLevel, FunctionCallHashC
     printf("    ");
 
     // Print function names
     printf("    ");
 
     // Print function names

-    const char* name = functionName().UTF8String().c_str();
+    const char* name = functionName().utf8().data();

     double sampleCount = m_actualTotalTime * 1000;
     if (indentLevel) {
         for (int i = 0; i < indentLevel; ++i)
             printf("  ");
 
     double sampleCount = m_actualTotalTime * 1000;
     if (indentLevel) {
         for (int i = 0; i < indentLevel; ++i)
             printf("  ");
 

-         countedFunctions.add(functionName().rep());
+         countedFunctions.add(functionName().impl());

 
         printf("%.0f %s\n", sampleCount ? sampleCount : 1, name);
     } else
 
         printf("%.0f %s\n", sampleCount ? sampleCount : 1, name);
     } else


@@ -336,7 +341,7 @@ double ProfileNode::debugPrintDataSampleStyle(int indentLevel, FunctionCallHashC
         while (indentLevel--)
             printf("  ");
 
         while (indentLevel--)
             printf("  ");
 

-        printf("%.0f %s\n", sampleCount - sumOfChildrensCount, functionName().UTF8String().c_str());
+        printf("%.0f %s\n", sampleCount - sumOfChildrensCount, functionName().utf8().data());

     }
 
     return m_actualTotalTime;
     }
 
     return m_actualTotalTime;