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

Timestamp:

May 23, 2008, 1:56:21 AM (17 years ago)

Author:

[email protected]

Message:

<rdar://problem/5951561> Turn on JavaScript Profiler

Reviewed by Kevin McCullough

Flipped the switch on the profiler, rearranged how we
signal the the profiler is active so that calls aren't
needed in the general case.

Also fixed the entry point for Machine::execute(FunctionBodyNode..)
to correctly indicate function exit.

Results in a 0.7-1.0% regression in SunSpider :-(

File:

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

trunk/JavaScriptCore/profiler/Profiler.cpp

@@ -40 +40 @@
 namespace KJS {
 
-static Profiler* sharedProfiler = 0;
 static const char* GlobalCodeExecution = "(program)";
 static const char* AnonymousFunction = "(anonymous function)";
@@ -48 +47 @@
 static CallIdentifier createCallIdentifierFromFunctionImp(FunctionImp*);
 
+Profiler* Profiler::s_sharedProfiler = 0;
+Profiler* Profiler::s_sharedEnabledProfilerReference = 0;
+
 Profiler* Profiler::profiler()
 {
-    if (!sharedProfiler)
-        sharedProfiler = new Profiler;
-    return sharedProfiler;
-}
-
+    if (!s_sharedProfiler)
+        s_sharedProfiler = new Profiler();
+    return s_sharedProfiler;
+}   
+    
 Profile* Profiler::findProfile(ExecState* exec, const UString& title) const
 {
@@ -74 +76 @@
         if (m_currentProfiles[i]->originatingGlobalExec() == globalExec && m_currentProfiles[i]->title() == title)
             return;
-
+    s_sharedEnabledProfilerReference = this;
     RefPtr<Profile> profile = Profile::create(title, globalExec, exec->lexicalGlobalObject()->pageGroupIdentifier());
     m_currentProfiles.append(profile);
@@ -88 +90 @@
             PassRefPtr<Profile> prpProfile = m_currentProfiles[i].release();
             m_currentProfiles.remove(i);
+            if (!m_currentProfiles.size())
+                s_sharedEnabledProfilerReference = 0;
             return prpProfile;
         }