Changeset 34310 in webkit for trunk/JavaScriptCore/profiler/ProfileNode.cpp

Timestamp:

Jun 2, 2008, 10:11:35 AM (17 years ago)

Author:

[email protected]

Message:

2008-06-02 Kevin McCullough <​[email protected]>

Reviewed by Darin.

<rdar://problem/5969992> JSProfiler: Remove the recursion limit in the
profiler
Implement Next Sibling pointers as groundwork for removing the recursion
limit in the profiler.

• profiler/ProfileNode.cpp: Also I renamed parentNode and headNode since 'node' is redundant. (KJS::ProfileNode::ProfileNode): Initialize the nextSibling. (KJS::ProfileNode::willExecute): If there are already children then the new child needs to be the nextSibling of the last child. (KJS::ProfileNode::didExecute): (KJS::ProfileNode::addChild): Ditto. (KJS::ProfileNode::stopProfiling): (KJS::ProfileNode::sortTotalTimeDescending): For all of the sorting algorithms once the children are sorted their nextSibling pointers need to be reset to reflect the new order. (KJS::ProfileNode::sortTotalTimeAscending): (KJS::ProfileNode::sortSelfTimeDescending): (KJS::ProfileNode::sortSelfTimeAscending): (KJS::ProfileNode::sortCallsDescending): (KJS::ProfileNode::sortCallsAscending): (KJS::ProfileNode::sortFunctionNameDescending): (KJS::ProfileNode::sortFunctionNameAscending): (KJS::ProfileNode::resetChildrensSiblings): This new function simply loops over all of the children and sets their nextSibling pointers to the next child in the Vector (KJS::ProfileNode::debugPrintData):
• profiler/ProfileNode.h: (KJS::ProfileNode::parent): (KJS::ProfileNode::setParent): (KJS::ProfileNode::nextSibling): (KJS::ProfileNode::setNextSibling): (KJS::ProfileNode::totalPercent): (KJS::ProfileNode::selfPercent):

File:

• trunk/JavaScriptCore/profiler/ProfileNode.cpp (modified) (15 diffs)

trunk/JavaScriptCore/profiler/ProfileNode.cpp

@@ -59 +59 @@
 ProfileNode::ProfileNode(const CallIdentifier& callIdentifier, ProfileNode* headNode, ProfileNode* parentNode)
     : m_callIdentifier(callIdentifier)
-    , m_headNode(headNode)
-    , m_parentNode(parentNode)
+    , 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_actualTotalTime(0.0)
+    , m_visibleTotalTime(0.0)
+    , m_actualSelfTime(0.0)
+    , m_visibleSelfTime(0.0)
     , m_numberOfCalls(0)
     , m_visible(true)
 {
-    if (!m_headNode)
-        m_headNode = this;
+    if (!m_head)
+        m_head = this;
 
     startTimer();
@@ -84 +85 @@
     }
 
-    m_children.append(ProfileNode::create(callIdentifier, m_headNode, this));
+    RefPtr<ProfileNode> newChild = ProfileNode::create(callIdentifier, m_head, this);
+    if (m_children.size())
+        m_children.last()->setNextSibling(newChild.get());
+    m_children.append(newChild.release());
     return m_children.last().get();
 }
@@ -91 +95 @@
 {
     endAndRecordCall();
-    return m_parentNode;
+    return m_parent;
 }
 
@@ -98 +102 @@
     RefPtr<ProfileNode> child = prpChild;
     child->setParent(this);
+    if (m_children.size())
+        m_children.last()->setNextSibling(child.get());
     m_children.append(child.release());
 }
@@ -131 +137 @@
     m_actualSelfTime = m_actualTotalTime - m_actualSelfTime;
 
-    if (m_headNode == this && m_actualSelfTime) {
+    if (m_head == this && m_actualSelfTime) {
         ProfileNode* idleNode = willExecute(CallIdentifier(NonJSExecution, 0, 0));
 
@@ -155 +161 @@
     std::sort(m_children.begin(), m_children.end(), totalTimeDescendingComparator);
 
-    for (StackIterator currentChild = m_children.begin(); currentChild != m_children.end(); ++currentChild)
-        (*currentChild)->sortTotalTimeDescending();
+    unsigned size = m_children.size();
+    for (unsigned i = 0; i < size; ++i)
+        m_children[i]->sortTotalTimeDescending();
+    
+    resetChildrensSiblings();
 }
 
@@ -168 +177 @@
     std::sort(m_children.begin(), m_children.end(), totalTimeAscendingComparator);
 
-    for (StackIterator currentChild = m_children.begin(); currentChild != m_children.end(); ++currentChild)
-        (*currentChild)->sortTotalTimeAscending();
+    unsigned size = m_children.size();
+    for (unsigned i = 0; i < size; ++i)
+        m_children[i]->sortTotalTimeAscending();
+
+    resetChildrensSiblings();
 }
 
@@ -181 +193 @@
     std::sort(m_children.begin(), m_children.end(), selfTimeDescendingComparator);
 
-    for (StackIterator currentChild = m_children.begin(); currentChild != m_children.end(); ++currentChild)
-        (*currentChild)->sortSelfTimeDescending();
+    unsigned size = m_children.size();
+    for (unsigned i = 0; i < size; ++i)
+        m_children[i]->sortSelfTimeDescending();
+
+    resetChildrensSiblings();
 }
 
@@ -194 +209 @@
     std::sort(m_children.begin(), m_children.end(), selfTimeAscendingComparator);
 
-    for (StackIterator currentChild = m_children.begin(); currentChild != m_children.end(); ++currentChild)
-        (*currentChild)->sortSelfTimeAscending();
+    unsigned size = m_children.size();
+    for (unsigned i = 0; i < size; ++i)
+        m_children[i]->sortSelfTimeAscending();
+
+    resetChildrensSiblings();
 }
 
@@ -207 +225 @@
     std::sort(m_children.begin(), m_children.end(), callsDescendingComparator);
 
-    for (StackIterator currentChild = m_children.begin(); currentChild != m_children.end(); ++currentChild)
-        (*currentChild)->sortCallsDescending();
+    unsigned size = m_children.size();
+    for (unsigned i = 0; i < size; ++i)
+        m_children[i]->sortCallsDescending();
+
+    resetChildrensSiblings();
 }
 
@@ -220 +241 @@
     std::sort(m_children.begin(), m_children.end(), callsAscendingComparator);
 
-    for (StackIterator currentChild = m_children.begin(); currentChild != m_children.end(); ++currentChild)
-        (*currentChild)->sortCallsAscending();
+    unsigned size = m_children.size();
+    for (unsigned i = 0; i < size; ++i)
+        m_children[i]->sortCallsAscending();
+
+    resetChildrensSiblings();
 }
 
@@ -233 +257 @@
     std::sort(m_children.begin(), m_children.end(), functionNameDescendingComparator);
 
-    for (StackIterator currentChild = m_children.begin(); currentChild != m_children.end(); ++currentChild)
-        (*currentChild)->sortFunctionNameDescending();
+    unsigned size = m_children.size();
+    for (unsigned i = 0; i < size; ++i)
+        m_children[i]->sortFunctionNameDescending();
+
+    resetChildrensSiblings();
 }
 
@@ -246 +273 @@
     std::sort(m_children.begin(), m_children.end(), functionNameAscendingComparator);
 
-    for (StackIterator currentChild = m_children.begin(); currentChild != m_children.end(); ++currentChild)
-        (*currentChild)->sortFunctionNameAscending();
+    unsigned size = m_children.size();
+    for (unsigned i = 0; i < size; ++i)
+        m_children[i]->sortFunctionNameAscending();
+
+    resetChildrensSiblings();
 }
 
@@ -321 +351 @@
 }
 
+void ProfileNode::resetChildrensSiblings()
+{
+    unsigned size = m_children.size();
+    for (unsigned i = 0; i < size; ++i)
+        m_children[i]->setNextSibling(i + 1 == size ? 0 : m_children[i + 1].get());
+}
+
 #ifndef NDEBUG
 void ProfileNode::debugPrintData(int indentLevel) const
@@ -328 +365 @@
         printf("  ");
 
-    printf("%d SelfTime %.3fms/%.3f%% TotalTime %.3fms/%.3f%% VSelf %.3fms VTotal %.3fms Function Name %s Visible %s\n",
+    printf("%d SelfTime %.3fms/%.3f%% TotalTime %.3fms/%.3f%% VSelf %.3fms VTotal %.3fms Function Name %s Visible %s Next Sibling %s\n",
         m_numberOfCalls, m_actualSelfTime, selfPercent(), m_actualTotalTime, totalPercent(),
         m_visibleSelfTime, m_visibleTotalTime, 
-        functionName().UTF8String().c_str(), (m_visible ? "True" : "False"));
+        functionName().UTF8String().c_str(), (m_visible ? "True" : "False"),
+        m_nextSibling ? m_nextSibling->functionName().UTF8String().c_str() : "");
 
     ++indentLevel;