JavaScriptCore-7600.1.4.17.5.tar.gz

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

diff --git a/profiler/ProfileNode.cpp b/profiler/ProfileNode.cpp
index 8f20bbeff8a60b512c506fd4bf9e240e17fa062b..cb8678724acdde8674cb6261ee2639331219728d 100644 (file)
--- a/profiler/ProfileNode.cpp
+++ b/profiler/ProfileNode.cpp
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2008, 2014 Apple Inc. All rights reserved.

  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions


@@ -10,7 +10,7 @@
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.

- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * 3.  Neither the name of Apple Inc. ("Apple") nor the names of

  *     its contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
  *     its contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *


@@ -29,46 +29,23 @@
 #include "config.h"
 #include "ProfileNode.h"
 
 #include "config.h"
 #include "ProfileNode.h"
 

-#include "Profiler.h"
-#include <stdio.h>
+#include "LegacyProfiler.h"

 #include <wtf/DateMath.h>
 #include <wtf/DateMath.h>

+#include <wtf/DataLog.h>

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

-#if OS(WINDOWS)
-#include <windows.h>
-#endif
-

 using namespace WTF;
 
 namespace JSC {
 
 using namespace WTF;
 
 namespace JSC {
 

-static double getCount()
-{
-#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
-    return currentTimeMS();
-#endif
-}
-

 ProfileNode::ProfileNode(ExecState* callerCallFrame, const CallIdentifier& callIdentifier, ProfileNode* headNode, ProfileNode* parentNode)
     : m_callerCallFrame(callerCallFrame)
     , m_callIdentifier(callIdentifier)
     , m_head(headNode)
     , m_parent(parentNode)
 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_startTime(0.0)
-    , m_actualTotalTime(0.0)
-    , m_visibleTotalTime(0.0)
-    , m_actualSelfTime(0.0)
-    , m_visibleSelfTime(0.0)
-    , m_numberOfCalls(0)
-    , m_visible(true)
+    , m_nextSibling(nullptr)
+    , m_totalTime(0)
+    , m_selfTime(0)

 {
     startTimer();
 }
 {
     startTimer();
 }


@@ -79,13 +56,9 @@ ProfileNode::ProfileNode(ExecState* callerCallFrame, ProfileNode* headNode, Prof
     , m_head(headNode)
     , m_parent(nodeToCopy->parent())
     , m_nextSibling(0)
     , m_head(headNode)
     , m_parent(nodeToCopy->parent())
     , m_nextSibling(0)

-    , m_startTime(0.0)
-    , m_actualTotalTime(nodeToCopy->actualTotalTime())
-    , m_visibleTotalTime(nodeToCopy->totalTime())
-    , m_actualSelfTime(nodeToCopy->actualSelfTime())
-    , m_visibleSelfTime(nodeToCopy->selfTime())
-    , m_numberOfCalls(nodeToCopy->numberOfCalls())
-    , m_visible(nodeToCopy->visible())
+    , m_totalTime(nodeToCopy->totalTime())
+    , m_selfTime(nodeToCopy->selfTime())
+    , m_calls(nodeToCopy->calls())

 {
 }
 
 {
 }
 


@@ -120,19 +93,6 @@ void ProfileNode::addChild(PassRefPtr<ProfileNode> prpChild)
     m_children.append(child.release());
 }
 
     m_children.append(child.release());
 }
 

-ProfileNode* ProfileNode::findChild(ProfileNode* node) const
-{
-    if (!node)
-        return 0;
-
-    for (size_t i = 0; i < m_children.size(); ++i) {
-        if (*node == m_children[i].get())
-            return m_children[i].get();
-    }
-
-    return 0;
-}
-

 void ProfileNode::removeChild(ProfileNode* node)
 {
     if (!node)
 void ProfileNode::removeChild(ProfileNode* node)
 {
     if (!node)


@@ -161,20 +121,17 @@ void ProfileNode::insertNode(PassRefPtr<ProfileNode> prpNode)
 
 void ProfileNode::stopProfiling()
 {
 
 void ProfileNode::stopProfiling()
 {

-    if (m_startTime)
-        endAndRecordCall();
+    ASSERT(!m_calls.isEmpty());

 
 

-    m_visibleTotalTime = m_actualTotalTime;
-
-    ASSERT(m_actualSelfTime == 0.0 && m_startTime == 0.0);
+    if (isnan(m_calls.last().totalTime()))
+        endAndRecordCall();

 
     // Because we iterate in post order all of our children have been stopped before us.
     for (unsigned i = 0; i < m_children.size(); ++i)
 
     // Because we iterate in post order all of our children have been stopped before us.
     for (unsigned i = 0; i < m_children.size(); ++i)

-        m_actualSelfTime += m_children[i]->totalTime();
+        m_selfTime += m_children[i]->totalTime();

 
 

-    ASSERT(m_actualSelfTime <= m_actualTotalTime);
-    m_actualSelfTime = m_actualTotalTime - m_actualSelfTime;
-    m_visibleSelfTime = m_actualSelfTime;
+    ASSERT(m_selfTime <= m_totalTime);
+    m_selfTime = m_totalTime - m_selfTime;

 }
 
 ProfileNode* ProfileNode::traverseNextNodePostOrder() const
 }
 
 ProfileNode* ProfileNode::traverseNextNodePostOrder() const


@@ -187,98 +144,19 @@ ProfileNode* ProfileNode::traverseNextNodePostOrder() const
     return next;
 }
 
     return next;
 }
 

-ProfileNode* ProfileNode::traverseNextNodePreOrder(bool processChildren) const
-{
-    if (processChildren && m_children.size())
-        return m_children[0].get();
-
-    if (m_nextSibling)
-        return m_nextSibling;
-
-    ProfileNode* nextParent = m_parent;
-    if (!nextParent)
-        return 0;
-
-    ProfileNode* next;
-    for (next = m_parent->nextSibling(); !next; next = nextParent->nextSibling()) {
-        nextParent = nextParent->parent();
-        if (!nextParent)
-            return 0;
-    }
-
-    return next;
-}
-
-void ProfileNode::setTreeVisible(ProfileNode* node, bool visible)
-{
-    ProfileNode* nodeParent = node->parent();
-    ProfileNode* nodeSibling = node->nextSibling();
-    node->setParent(0);
-    node->setNextSibling(0);
-
-    for (ProfileNode* currentNode = node; currentNode; currentNode = currentNode->traverseNextNodePreOrder())
-        currentNode->setVisible(visible);
-
-    node->setParent(nodeParent);
-    node->setNextSibling(nodeSibling);
-}
-
-void ProfileNode::calculateVisibleTotalTime()
-{
-    double sumOfVisibleChildrensTime = 0.0;
-
-    for (unsigned i = 0; i < m_children.size(); ++i) {
-        if (m_children[i]->visible())
-            sumOfVisibleChildrensTime += m_children[i]->totalTime();
-    }
-
-    m_visibleTotalTime = m_visibleSelfTime + sumOfVisibleChildrensTime;
-}
-
-bool ProfileNode::focus(const CallIdentifier& callIdentifier)
-{
-    if (!m_visible)
-        return false;
-
-    if (m_callIdentifier != callIdentifier) {
-        m_visible = false;
-        return true;
-    }
-
-    for (ProfileNode* currentParent = m_parent; currentParent; currentParent = currentParent->parent())
-        currentParent->setVisible(true);
-
-    return false;
-}
-
-void ProfileNode::exclude(const CallIdentifier& callIdentifier)
-{
-    if (m_visible && m_callIdentifier == callIdentifier) {
-        setTreeVisible(this, false);
-
-        m_parent->setVisibleSelfTime(m_parent->selfTime() + m_visibleTotalTime);
-    }
-}
-
-void ProfileNode::restore()
-{
-    m_visibleTotalTime = m_actualTotalTime;
-    m_visibleSelfTime = m_actualSelfTime;
-    m_visible = true;
-}
-

 void ProfileNode::endAndRecordCall()
 {
 void ProfileNode::endAndRecordCall()
 {

-    m_actualTotalTime += m_startTime ? getCount() - m_startTime : 0.0;
-    m_startTime = 0.0;
+    Call& last = lastCall();
+    ASSERT(isnan(last.totalTime()));
+
+    last.setTotalTime(currentTime() - last.startTime());

 
 

-    ++m_numberOfCalls;
+    m_totalTime += last.totalTime();

 }
 
 void ProfileNode::startTimer()
 {
 }
 
 void ProfileNode::startTimer()
 {

-    if (!m_startTime)
-        m_startTime = getCount();
+    m_calls.append(Call(currentTime()));

 }
 
 void ProfileNode::resetChildrensSiblings()
 }
 
 void ProfileNode::resetChildrensSiblings()


@@ -293,13 +171,11 @@ void ProfileNode::debugPrintData(int indentLevel) const
 {
     // Print function names
     for (int i = 0; i < indentLevel; ++i)
 {
     // Print function names
     for (int i = 0; i < indentLevel; ++i)

-        printf("  ");
+        dataLogF("  ");

 
 

-    printf("Function Name %s %d SelfTime %.3fms/%.3f%% TotalTime %.3fms/%.3f%% VSelf %.3fms VTotal %.3fms Visible %s Next Sibling %s\n",
-        functionName().utf8().data(), 
-        m_numberOfCalls, m_actualSelfTime, selfPercent(), m_actualTotalTime, totalPercent(),
-        m_visibleSelfTime, m_visibleTotalTime, 
-        (m_visible ? "True" : "False"),
+    dataLogF("Function Name %s %zu SelfTime %.3fms/%.3f%% TotalTime %.3fms/%.3f%% Next Sibling %s\n",
+        functionName().utf8().data(),
+        numberOfCalls(), m_selfTime, selfPercent(), m_totalTime, totalPercent(),

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


@@ -312,20 +188,20 @@ void ProfileNode::debugPrintData(int indentLevel) const
 // print the profiled data in a format that matches the tool sample's output.
 double ProfileNode::debugPrintDataSampleStyle(int indentLevel, FunctionCallHashCount& countedFunctions) const
 {
 // print the profiled data in a format that matches the tool sample's output.
 double ProfileNode::debugPrintDataSampleStyle(int indentLevel, FunctionCallHashCount& countedFunctions) const
 {

-    printf("    ");
+    dataLogF("    ");

 
     // Print function names
     const char* name = functionName().utf8().data();
 
     // Print function names
     const char* name = functionName().utf8().data();

-    double sampleCount = m_actualTotalTime * 1000;
+    double sampleCount = m_totalTime * 1000;

     if (indentLevel) {
         for (int i = 0; i < indentLevel; ++i)
     if (indentLevel) {
         for (int i = 0; i < indentLevel; ++i)

-            printf("  ");
+            dataLogF("  ");

 
          countedFunctions.add(functionName().impl());
 
 
          countedFunctions.add(functionName().impl());
 

-        printf("%.0f %s\n", sampleCount ? sampleCount : 1, name);
+        dataLogF("%.0f %s\n", sampleCount ? sampleCount : 1, name);

     } else
     } else

-        printf("%s\n", name);
+        dataLogF("%s\n", name);

 
     ++indentLevel;
 
 
     ++indentLevel;
 


@@ -337,14 +213,14 @@ double ProfileNode::debugPrintDataSampleStyle(int indentLevel, FunctionCallHashC
     sumOfChildrensCount *= 1000;    //
     // Print remainder of samples to match sample's output
     if (sumOfChildrensCount < sampleCount) {
     sumOfChildrensCount *= 1000;    //
     // Print remainder of samples to match sample's output
     if (sumOfChildrensCount < sampleCount) {

-        printf("    ");
+        dataLogF("    ");

         while (indentLevel--)
         while (indentLevel--)

-            printf("  ");
+            dataLogF("  ");

 
 

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

     }
 
     }
 

-    return m_actualTotalTime;
+    return m_totalTime;

 }
 #endif
 
 }
 #endif