Changeset 36113 in webkit for trunk/JavaScriptCore/profiler/ProfileGenerator.cpp

Timestamp:

Sep 5, 2008, 10:52:39 AM (17 years ago)

Author:

[email protected]

Message:

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

Reviewed by Sam and Alexey.

Make the profiler work with a null exec state. This will allow other
applications start the profiler to get DTrace probes going without
needing a WebView.

• ChangeLog:
• profiler/ProfileGenerator.cpp: (KJS::ProfileGenerator::ProfileGenerator): (KJS::ProfileGenerator::willExecute): (KJS::ProfileGenerator::didExecute):
• profiler/Profiler.cpp: (KJS::Profiler::startProfiling): (KJS::Profiler::stopProfiling): (KJS::dispatchFunctionToProfiles):

File:

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

trunk/JavaScriptCore/profiler/ProfileGenerator.cpp

@@ -46 +46 @@
 
 ProfileGenerator::ProfileGenerator(const UString& title, ExecState* originatingExec, unsigned uid)
-    : m_originatingGlobalExec(originatingExec->lexicalGlobalObject()->globalExec())
-    , m_profileGroup(originatingExec->lexicalGlobalObject()->profileGroup())
-
+    : m_originatingGlobalExec(originatingExec ? originatingExec->lexicalGlobalObject()->globalExec() : 0)
+    , m_profileGroup(originatingExec ? originatingExec->lexicalGlobalObject()->profileGroup() : 0)
 {
     m_profile = Profile::create(title, uid);
     m_currentNode = m_head = m_profile->head();
-
-    addParentForConsoleStart(originatingExec);
+    if (originatingExec)
+        addParentForConsoleStart(originatingExec);
 }
 
@@ -81 +80 @@
     }
 
+    if (!m_originatingGlobalExec)
+        return;
+
     ASSERT_ARG(m_currentNode, m_currentNode);
     m_currentNode = m_currentNode->willExecute(callIdentifier);
@@ -92 +94 @@
         JAVASCRIPTCORE_PROFILE_DID_EXECUTE(m_profileGroup, const_cast<char*>(name.c_str()), const_cast<char*>(url.c_str()), callIdentifier.m_lineNumber);
     }
+
+    if (!m_originatingGlobalExec)
+        return;
 
     ASSERT_ARG(m_currentNode, m_currentNode);