Changeset 33581 in webkit for trunk/JavaScriptCore/profiler/Profile.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/Profile.cpp (modified) (3 diffs)

trunk/JavaScriptCore/profiler/Profile.cpp

@@ -36 +36 @@
 namespace KJS {
 
-typedef Vector<UString>::const_iterator NameIterator;
-
 Profile::Profile(const UString& title)
     : m_title(title)
@@ -46 +44 @@
 }
 
+// The callStackNames are in order of bottom of the stack to top of the stack so we iterate it backwards.
 void Profile::willExecute(const Vector<UString>& callStackNames)
 {
     RefPtr<ProfileNode> callTreeInsertionPoint;
     RefPtr<ProfileNode> foundNameInTree = m_callTree;
-    NameIterator callStackLocation = callStackNames.begin();
 
-    while (callStackLocation != callStackNames.end() && foundNameInTree) {
+    int i = callStackNames.size();
+    while (foundNameInTree && i) {
         callTreeInsertionPoint = foundNameInTree;
-        foundNameInTree = callTreeInsertionPoint->findChild(*callStackLocation);
-        ++callStackLocation;
+        foundNameInTree = callTreeInsertionPoint->findChild(callStackNames[--i]);
     }
 
     if (!foundNameInTree) {   // Insert remains of the stack into the call tree.
-        --callStackLocation;
-        for (RefPtr<ProfileNode> next; callStackLocation != callStackNames.end(); ++callStackLocation) {
-            next = ProfileNode::create(*callStackLocation);
+        for (RefPtr<ProfileNode> next; i >= 0; callTreeInsertionPoint = next) {
+            next = ProfileNode::create(callStackNames[i--]);
             callTreeInsertionPoint->addChild(next);
-            callTreeInsertionPoint = next;
         }
     } else    // We are calling a function that is already in the call tree.
@@ -71 +67 @@
 void Profile::didExecute(const Vector<UString>& stackNames)
 {
-    m_callTree->didExecute(stackNames, 0);    
+    ASSERT(stackNames.size());
+    if (!stackNames.size())
+        return;
+
+    m_callTree->didExecute(stackNames, stackNames.size() - 1);
 }