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

Timestamp:

Jun 25, 2008, 2:44:42 PM (17 years ago)

Author:

[email protected]

Message:

Fixes an ASSERT in the profiler when starting multiple profiles
with the same name inside the same function/program.

Reviewed by Kevin McCullough.

• profiler/Profile.cpp: (KJS::Profile::Profile): Initialize m_stoppedCallDepth to zero. (KJS::Profile::stopProfiling): Set the current node to the parent, because we are in a call that will not get a didExecute call. (KJS::Profile::removeProfile): Increment m_stoppedCallDepth to account for didExecute not being called for profile. (KJS::Profile::willExecute): Increment m_stoppedCallDepth if stopped. (KJS::Profile::didExecute): Decrement m_stoppedCallDepth if stopped and greater than zero, and return early.
• profiler/Profile.h: Added stoppedProfiling().
• profiler/Profiler.cpp: (KJS::Profiler::findProfile): Removed. (KJS::Profiler::startProfiling): Don't return early for stopped profiles. (KJS::Profiler::stopProfiling): Skipp stopped profiles. (KJS::Profiler::didFinishAllExecution): Code clean-up.
• profiler/Profiler.h: Removed findProfile.

File:

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

trunk/JavaScriptCore/profiler/Profiler.cpp

@@ -56 +56 @@
     return s_sharedProfiler;
 }   
-    
-Profile* Profiler::findProfile(ExecState* exec, const UString& title) const
-{
-    ExecState* globalExec = exec->lexicalGlobalObject()->globalExec();
-    for (size_t i = 0; i < m_currentProfiles.size(); ++i)
-        if (m_currentProfiles[i]->originatingGlobalExec() == globalExec && (title.isNull() || m_currentProfiles[i]->title() == title))
-            return m_currentProfiles[i].get();
-    return 0;
-}
 
 void Profiler::startProfiling(ExecState* exec, const UString& title, ProfilerClient* client)
@@ -73 +64 @@
     // If so return early and don't create a new Profile.
     ExecState* globalExec = exec->lexicalGlobalObject()->globalExec();
-    for (size_t i = 0; i < m_currentProfiles.size(); ++i)
-        if (m_currentProfiles[i]->originatingGlobalExec() == globalExec && m_currentProfiles[i]->title() == title)
+    for (size_t i = 0; i < m_currentProfiles.size(); ++i) {
+        Profile* profile = m_currentProfiles[i].get();
+        if (!profile->stoppedProfiling() && profile->originatingGlobalExec() == globalExec && profile->title() == title)
             return;
+    }
+
     s_sharedEnabledProfilerReference = this;
     RefPtr<Profile> profile = Profile::create(title, globalExec, exec->lexicalGlobalObject()->pageGroupIdentifier(), client);
@@ -85 +79 @@
     ExecState* globalExec = exec->lexicalGlobalObject()->globalExec();
     for (ptrdiff_t i = m_currentProfiles.size() - 1; i >= 0; --i) {
-        if (m_currentProfiles[i]->originatingGlobalExec() == globalExec && (title.isNull() || m_currentProfiles[i]->title() == title))
+        Profile* profile = m_currentProfiles[i].get();
+        if (!profile->stoppedProfiling() && profile->originatingGlobalExec() == globalExec && (title.isNull() || profile->title() == title))
             m_currentProfiles[i]->stopProfiling();
     }
@@ -94 +89 @@
     ExecState* globalExec = exec->lexicalGlobalObject()->globalExec();
     for (ptrdiff_t i = m_currentProfiles.size() - 1; i >= 0; --i) {
-        if (m_currentProfiles[i]->originatingGlobalExec() == globalExec && m_currentProfiles[i]->didFinishAllExecution()) {
+        Profile* profile = m_currentProfiles[i].get();
+        if (profile->originatingGlobalExec() == globalExec && profile->didFinishAllExecution()) {
             PassRefPtr<Profile> prpProfile = m_currentProfiles[i].release();        
             m_currentProfiles.remove(i);