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

trunk/JavaScriptCore/profiler/Profiler.cpp

@@ -59 +59 @@
 void Profiler::startProfiling(ExecState* exec, const UString& title)
 {
-    ASSERT_ARG(exec, exec);
-
     // Check if we currently have a Profile for this global ExecState and title.
     // If so return early and don't create a new Profile.
-    ExecState* globalExec = exec->lexicalGlobalObject()->globalExec();
+    ExecState* globalExec = exec ? exec->lexicalGlobalObject()->globalExec() : 0;
+
     for (size_t i = 0; i < m_currentProfiles.size(); ++i) {
         ProfileGenerator* profileGenerator = m_currentProfiles[i].get();
@@ -77 +76 @@
 PassRefPtr<Profile> Profiler::stopProfiling(ExecState* exec, const UString& title)
 {
-    ExecState* globalExec = exec->lexicalGlobalObject()->globalExec();
+    ExecState* globalExec = exec ? exec->lexicalGlobalObject()->globalExec() : 0;
     for (ptrdiff_t i = m_currentProfiles.size() - 1; i >= 0; --i) {
         ProfileGenerator* profileGenerator = m_currentProfiles[i].get();
@@ -98 +97 @@
 {
     for (size_t i = 0; i < profiles.size(); ++i) {
-        if (profiles[i]->profileGroup() == currentProfileTargetGroup)
+        if (profiles[i]->profileGroup() == currentProfileTargetGroup || !profiles[i]->originatingGlobalExec())
             (profiles[i].get()->*function)(callIdentifier);
     }