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

Timestamp:

May 19, 2008, 3:15:30 PM (17 years ago)

Author:

[email protected]

Message:

2008-05-19 Kevin McCullough <​[email protected]>

Reviewed by Tim.

<rdar://problem/5770054> JavaScript profiler (10928)
-In an effort to make the profiler as efficient as possible instead of
prepending to a vector we keep the vector in reverse order and operate
over it backwards.

• profiler/Profile.cpp: (KJS::Profile::willExecute): (KJS::Profile::didExecute):
• profiler/ProfileNode.cpp: (KJS::ProfileNode::didExecute): (KJS::ProfileNode::endAndRecordCall):
• profiler/ProfileNode.h:
• profiler/Profiler.cpp: (KJS::getStackNames):

File:

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

trunk/JavaScriptCore/profiler/ProfileNode.cpp

@@ -53 +53 @@
 }
 
-void ProfileNode::didExecute(Vector<UString> stackNames, unsigned int stackIndex)
-{
-    if (stackIndex && stackIndex == stackNames.size()) {
-        ASSERT(stackNames[stackIndex - 1] == m_functionName);
-        endAndRecordCall();
-        return;
-    }
-
-    for (StackIterator currentChild = m_children.begin(); currentChild != m_children.end() && stackIndex < stackNames.size(); ++currentChild) {
-        if ((*currentChild)->functionName() == stackNames[stackIndex]) {
-            (*currentChild)->didExecute(stackNames, ++stackIndex);
+// We start at the end of stackNames and work our way forwards since the names are in 
+// the reverse order of how the ProfileNode tree is created (e.g. the leaf node is at
+// index 0 and the top of the stack is at index stackNames.size() - 1)
+void ProfileNode::didExecute(const Vector<UString>& stackNames, unsigned int stackIndex)
+{
+    for (size_t i = 0; i < m_children.size(); ++i) {
+        if (m_children[i]->functionName() == stackNames[stackIndex]) {
+            if (stackIndex)   // We are not at the bottom of the stack yet
+                m_children[i]->didExecute(stackNames, stackIndex - 1);
+            else    // This is the child we were looking for
+                m_children[i]->endAndRecordCall();
             return;
         }
@@ -189 +189 @@
     for (StackIterator currentChild = m_children.begin(); currentChild != m_children.end(); ++currentChild)
         (*currentChild)->sortCallsAscending();
+}
+
+void ProfileNode::endAndRecordCall()
+{
+    m_totalTime += getCurrentUTCTime() - m_startTime;
+    m_startTime = 0.0;
+
+    ++m_numberOfCalls;
 }
 
@@ -247 +255 @@
 }
 
-void ProfileNode::endAndRecordCall()
-{
-    m_totalTime += getCurrentUTCTime() - m_startTime;
-    m_startTime = 0.0;
-
-    ++m_numberOfCalls;
-}
-
 }   // namespace KJS