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

Timestamp:

Apr 24, 2008, 10:20:01 AM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2008-04-24 Kevin McCullough <​[email protected]>

Reviewed by Adam and Sam.

-<rdar://problem/5770054> JavaScript profiler (10928)
-Only profile the page group that starts profiling to avoid profiling
tools that shouldn't be profiled unless explicitly requested to.

• JavaScriptCore.exp: Export new signature.
• kjs/JSGlobalObject.cpp: Add unique identifiers to the JSGlobalObject. (KJS::JSGlobalObject::init):
• kjs/JSGlobalObject.h: Ditto. (KJS::JSGlobalObject::setPageGroupIdentifier): (KJS::JSGlobalObject::pageGroupIdentifier):
• profiler/Profiler.cpp: Check the identifier of the page group of the lexical global exec state and only profile if it matches the given page group identifier. (KJS::Profiler::startProfiling): (KJS::Profiler::willExecute): (KJS::Profiler::didExecute):
• profiler/Profiler.h: Ditto. (KJS::Profiler::Profiler):

WebCore:

2008-04-24 Kevin McCullough <​[email protected]>

Reviewed by Adam and Sam.

-<rdar://problem/5770054> JavaScript profiler (10928)
-Only profile the page group that starts profiling to avoid profiling
tools that shouldn't be profiled unless explicitly requested to.

• bindings/js/kjs_proxy.cpp: When a new global object is created set its page group identifier. (WebCore::KJSProxy::clear): (WebCore::KJSProxy::initScript):
• page/Console.cpp: When calling console.profile set the identifier of the page group being profiled. (WebCore::Console::profile):
• page/PageGroup.cpp: Implement unique identifiers. (WebCore::getUniqueIdentifier): (WebCore::PageGroup::PageGroup):
• page/PageGroup.h: Ditto. (WebCore::PageGroup::identifier):

File:

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

trunk/JavaScriptCore/profiler/Profiler.cpp

@@ -31 +31 @@
 
 #include "FunctionCallProfile.h"
-#include <kjs/ExecState.h>
-#include <kjs/function.h>
+#include "JSGlobalObject.h"
+#include "ExecState.h"
+#include "function.h"
 
 #include <stdio.h>
@@ -53 +54 @@
 }
 
-void Profiler::startProfiling()
+void Profiler::startProfiling(unsigned pageGroupIdentifier)
 {
     if (m_profiling)
         return;
+
+    m_pageGroupIdentifier = pageGroupIdentifier;
 
     // FIXME: When multi-threading is supported this will be a vector and calls
@@ -72 +75 @@
 void Profiler::willExecute(ExecState* exec, JSObject* calledFunction)
 {
-    if (!m_profiling)
+    if (!m_profiling || exec->lexicalGlobalObject()->pageGroupIdentifier() != m_pageGroupIdentifier)
         return;
 
@@ -82 +85 @@
 void Profiler::willExecute(ExecState* exec, const UString& sourceURL, int startingLineNumber)
 {
-    if (!m_profiling)
+    if (!m_profiling || exec->lexicalGlobalObject()->pageGroupIdentifier() != m_pageGroupIdentifier)
         return;
 
@@ -92 +95 @@
 void Profiler::didExecute(ExecState* exec, JSObject* calledFunction)
 {
-    if (!m_profiling)
+    if (!m_profiling || exec->lexicalGlobalObject()->pageGroupIdentifier() != m_pageGroupIdentifier)
         return;
 
@@ -102 +105 @@
 void Profiler::didExecute(ExecState* exec, const UString& sourceURL, int startingLineNumber)
 {
-    if (!m_profiling)
+    if (!m_profiling || exec->lexicalGlobalObject()->pageGroupIdentifier() != m_pageGroupIdentifier)
         return;