Changeset 34013 in webkit for trunk/JavaScriptCore/profiler/Profiler.cpp

Timestamp:

May 21, 2008, 11:21:59 PM (17 years ago)

Author:

[email protected]

Message:

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

Reviewed by Maciej and Geoff.

<rdar://problem/5951561> Turn on JavaScript Profiler
-As part of the effort to turn on the profiler it would be helpful if it
did not need ExecStates to represent the stack location of the currently
executing statement.
-We now create each node as necessary with a reference to the current
node and each node knows its parent so that the tree can be made without
the entire stack.

• profiler/Profile.cpp: (KJS::Profile::Profile): The current node starts at the head. (KJS::Profile::stopProfiling): The current node is cleared when profiling stops. (KJS::Profile::willExecute): The current node either adds a new child or starts and returns a reference to an already existing child if the call ID that is requested already exists. (KJS::Profile::didExecute): The current node finishes and returns its parent.
• profiler/Profile.h: Use a single callIdentifier instead of a vector since we no longer use the whole stack.
• profiler/ProfileNode.cpp: Now profile nodes keep a reference to their parent. (KJS::ProfileNode::ProfileNode): Initialize the parent. (KJS::ProfileNode::didExecute): Record the time and return the parent. (KJS::ProfileNode::addOrStartChild): If the given callIdentifier is already a child, start it and return it, otherwise create a new one and return that. (KJS::ProfileNode::stopProfiling): Same logic, just use the new function.
• profiler/ProfileNode.h: Utilize the parent. (KJS::ProfileNode::create): (KJS::ProfileNode::parent):
• profiler/Profiler.cpp: (KJS::Profiler::startProfiling): Here is the only place where the ExecState is used to figure out where in the stack the profiler is currently profiling. (KJS::dispatchFunctionToProfiles): Only send one CallIdentifier instead of a vector of them. (KJS::Profiler::willExecute): Ditto. (KJS::Profiler::didExecute): Ditto. (KJS::createCallIdentifier): Create only one CallIdentifier. (KJS::createCallIdentifierFromFunctionImp): Ditto.
• profiler/Profiler.h:

File:

• trunk/JavaScriptCore/profiler/Profiler.cpp (modified) (9 diffs)

trunk/JavaScriptCore/profiler/Profiler.cpp

@@ -41 +41 @@
 
 static Profiler* sharedProfiler = 0;
-static const char* GlobalCodeExecution = "(global code)";
+static const char* GlobalCodeExecution = "(program)";
 static const char* AnonymousFunction = "(anonymous function)";
 
 static void getCallIdentifiers(ExecState*, Vector<CallIdentifier>& callIdentifiers);
-static void getCallIdentifiers(ExecState*, JSObject*, Vector<CallIdentifier>& callIdentifiers);
-static void getCallIdentifiers(ExecState*, const UString& sourceURL, int startingLineNumber, Vector<CallIdentifier>& callIdentifiers);
-static void getCallIdentifierFromFunctionImp(FunctionImp*, Vector<CallIdentifier>& callIdentifiers);
+static CallIdentifier createCallIdentifier(JSObject*);
+static CallIdentifier createCallIdentifier(const UString& sourceURL, int startingLineNumber);
+static CallIdentifier createCallIdentifierFromFunctionImp(FunctionImp*);
 
 Profiler* Profiler::profiler()
@@ -82 +82 @@
     Vector<CallIdentifier> callIdentifiers;
     getCallIdentifiers(exec, callIdentifiers);
-    profile->willExecute(callIdentifiers);
+    for (unsigned i = 0; i< callIdentifiers.size(); ++i)
+        profile->willExecute(callIdentifiers[i]);
 }
 
@@ -113 +114 @@
 }
 
-static inline void dispatchFunctionToProfiles(const Vector<RefPtr<Profile> >& profiles, Profile::ProfileFunction function, const Vector<CallIdentifier>& callIdentifiers, unsigned currentPageGroupIdentifier)
+static inline void dispatchFunctionToProfiles(const Vector<RefPtr<Profile> >& profiles, Profile::ProfileFunction function, const CallIdentifier& callIdentifier, unsigned currentPageGroupIdentifier)
 {
     for (size_t i = 0; i < profiles.size(); ++i)
         if (profiles[i]->pageGroupIdentifier() == currentPageGroupIdentifier)
-            (profiles[i].get()->*function)(callIdentifiers);
+            (profiles[i].get()->*function)(callIdentifier);
 }
 
@@ -128 +129 @@
         return;
 
-    Vector<CallIdentifier> callIdentifiers;
-    getCallIdentifiers(exec, calledFunction, callIdentifiers);
-
-    dispatchFunctionToProfiles(m_currentProfiles, &Profile::willExecute, callIdentifiers, exec->lexicalGlobalObject()->pageGroupIdentifier());
+    dispatchFunctionToProfiles(m_currentProfiles, &Profile::willExecute, createCallIdentifier(calledFunction), exec->lexicalGlobalObject()->pageGroupIdentifier());
 }
 
@@ -139 +137 @@
         return;
 
-    Vector<CallIdentifier> callIdentifiers;
-    getCallIdentifiers(exec, sourceURL, startingLineNumber, callIdentifiers);
-
-    dispatchFunctionToProfiles(m_currentProfiles, &Profile::willExecute, callIdentifiers, exec->lexicalGlobalObject()->pageGroupIdentifier());
+    CallIdentifier callIdentifier = createCallIdentifier(sourceURL, startingLineNumber);
+
+    dispatchFunctionToProfiles(m_currentProfiles, &Profile::willExecute, callIdentifier, exec->lexicalGlobalObject()->pageGroupIdentifier());
 }
 
@@ -153 +150 @@
         return;
 
-    Vector<CallIdentifier> callIdentifiers;
-    getCallIdentifiers(exec, calledFunction, callIdentifiers);
-
-    dispatchFunctionToProfiles(m_currentProfiles, &Profile::didExecute, callIdentifiers, exec->lexicalGlobalObject()->pageGroupIdentifier());
+    dispatchFunctionToProfiles(m_currentProfiles, &Profile::didExecute, createCallIdentifier(calledFunction), exec->lexicalGlobalObject()->pageGroupIdentifier());
 }
 
@@ -164 +158 @@
         return;
 
-    Vector<CallIdentifier> callIdentifiers;
-    getCallIdentifiers(exec, sourceURL, startingLineNumber, callIdentifiers);
-
-    dispatchFunctionToProfiles(m_currentProfiles, &Profile::didExecute, callIdentifiers, exec->lexicalGlobalObject()->pageGroupIdentifier());
+    dispatchFunctionToProfiles(m_currentProfiles, &Profile::didExecute, createCallIdentifier(sourceURL, startingLineNumber), exec->lexicalGlobalObject()->pageGroupIdentifier());
 }
 
@@ -183 +174 @@
 }
 
-void getCallIdentifiers(ExecState* exec, JSObject* calledFunction, Vector<CallIdentifier>& callIdentifiers)
+CallIdentifier createCallIdentifier(JSObject* calledFunction)
 {
     if (calledFunction->inherits(&FunctionImp::info))
-        getCallIdentifierFromFunctionImp(static_cast<FunctionImp*>(calledFunction), callIdentifiers);
-    else if (calledFunction->inherits(&InternalFunctionImp::info))
-        callIdentifiers.append(CallIdentifier(static_cast<InternalFunctionImp*>(calledFunction)->functionName().ustring(), "", 0) );
-    getCallIdentifiers(exec, callIdentifiers);
-}
-
-void getCallIdentifiers(ExecState* exec, const UString& sourceURL, int startingLineNumber, Vector<CallIdentifier>& callIdentifiers)
-{
-    callIdentifiers.append(CallIdentifier(GlobalCodeExecution, sourceURL, (startingLineNumber + 1)) );
-    getCallIdentifiers(exec, callIdentifiers);
-}
-
-void getCallIdentifierFromFunctionImp(FunctionImp* functionImp, Vector<CallIdentifier>& callIdentifiers)
+        return createCallIdentifierFromFunctionImp(static_cast<FunctionImp*>(calledFunction));
+    if (calledFunction->inherits(&InternalFunctionImp::info))
+        return CallIdentifier(static_cast<InternalFunctionImp*>(calledFunction)->functionName().ustring(), "", 0);
+
+    ASSERT_NOT_REACHED();
+    return CallIdentifier("", 0, 0);
+}
+
+CallIdentifier createCallIdentifier(const UString& sourceURL, int startingLineNumber)
+{
+    return CallIdentifier(GlobalCodeExecution, sourceURL, (startingLineNumber + 1));
+}
+
+CallIdentifier createCallIdentifierFromFunctionImp(FunctionImp* functionImp)
 {
     UString name = functionImp->functionName().ustring();
@@ -204 +196 @@
         name = AnonymousFunction;
 
-    callIdentifiers.append(CallIdentifier(name, functionImp->body->sourceURL(), functionImp->body->lineNo()) );
+    return CallIdentifier(name, functionImp->body->sourceURL(), functionImp->body->lineNo());
 }