Changeset 33941 in webkit for trunk/JavaScriptCore/profiler/Profile.cpp

Timestamp:

May 20, 2008, 1:59:16 PM (17 years ago)

Author:

[email protected]

Message:

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

Reviewed by Tim.

<rdar://problem/5770054> JavaScript profiler (10928)
Split function name into 3 parts so that the Web Inspector can link it to
the resource location from whence it came.

• kjs/ustring.cpp: Implemented operator> for UStrings (KJS::operator>):
• kjs/ustring.h:
• profiler/Profile.cpp: (KJS::Profile::Profile): Initialize all 3 values. (KJS::Profile::willExecute): Use CallIdentifier struct. (KJS::Profile::didExecute): Ditto.
• profiler/Profile.h: Ditto and remove unused function.
• profiler/ProfileNode.cpp: (KJS::ProfileNode::ProfileNode): Use CallIdentifier struct. (KJS::ProfileNode::willExecute): Ditto and fix an issue where we restarted the m_startTime even though it was already started. (KJS::ProfileNode::didExecute): Ditto. (KJS::ProfileNode::findChild): Ditto. (KJS::functionNameDescendingComparator): Ditto and use new comparator. (KJS::functionNameAscendingComparator): Ditto. (KJS::ProfileNode::printDataInspectorStyle): Use CallIdentifier struct. (KJS::ProfileNode::printDataSampleStyle): Ditto.
• profiler/ProfileNode.h: (KJS::CallIdentifier::CallIdentifier): Describe the CallIdentifier struct (KJS::CallIdentifier::operator== ): (KJS::ProfileNode::create): Use the CallIdentifier struct. (KJS::ProfileNode::callIdentifier): (KJS::ProfileNode::functionName): Now only return the function name, not the url and line number too. (KJS::ProfileNode::url): (KJS::ProfileNode::lineNumber):
• profiler/Profiler.cpp: Use the CallIdentifier struct. (KJS::Profiler::startProfiling): (KJS::Profiler::willExecute): (KJS::Profiler::didExecute): (KJS::getCallIdentifiers): (KJS::getCallIdentifierFromFunctionImp):

File:

• trunk/JavaScriptCore/profiler/Profile.cpp (modified) (2 diffs)

trunk/JavaScriptCore/profiler/Profile.cpp

@@ -41 +41 @@
     // FIXME: When multi-threading is supported this will be a vector and calls
     // into the profiler will need to know which thread it is executing on.
-    m_callTree = ProfileNode::create("Thread_1");
+    m_callTree = ProfileNode::create(CallIdentifier("Thread_1", 0, 0));
 }
 
-// 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)
+// The callIdentifiers are in order of bottom of the stack to top of the stack so we iterate it backwards.
+void Profile::willExecute(const Vector<CallIdentifier>& callIdentifiers)
 {
     RefPtr<ProfileNode> callTreeInsertionPoint;
     RefPtr<ProfileNode> foundNameInTree = m_callTree;
 
-    int i = callStackNames.size();
+    int i = callIdentifiers.size();
     while (foundNameInTree && i) {
         callTreeInsertionPoint = foundNameInTree;
-        foundNameInTree = callTreeInsertionPoint->findChild(callStackNames[--i]);
+        foundNameInTree = callTreeInsertionPoint->findChild(callIdentifiers[--i]);
     }
 
     if (!foundNameInTree) {   // Insert remains of the stack into the call tree.
         for (RefPtr<ProfileNode> next; i >= 0; callTreeInsertionPoint = next) {
-            next = ProfileNode::create(callStackNames[i--]);
+            next = ProfileNode::create(callIdentifiers[i--]);
             callTreeInsertionPoint->addChild(next);
         }
@@ -65 +65 @@
 }
 
-void Profile::didExecute(const Vector<UString>& stackNames)
+void Profile::didExecute(const Vector<CallIdentifier>& callIdentifiers)
 {
-    ASSERT(stackNames.size());
-    if (!stackNames.size())
+    if (!callIdentifiers.size())
         return;
 
-    m_callTree->didExecute(stackNames, stackNames.size() - 1);
+    m_callTree->didExecute(callIdentifiers, callIdentifiers.size() - 1);
 }