Changeset 173264 in webkit

Timestamp:

Sep 4, 2014 10:21:39 AM (10 years ago)

Author:

Brian Burg

Message:

Web Inspector: the profiler should not accrue time to nodes while the debugger is paused
​https://bugs.webkit.org/show_bug.cgi?id=136352

Reviewed by Timothy Hatcher.

Hook up pause/continue events to the LegacyProfiler and any active
ProfilerGenerators. If the debugger is paused, all intervening call
entries will be created with totalTime as 0.0.

• inspector/ScriptDebugServer.cpp:

(Inspector::ScriptDebugServer::handlePause):

• profiler/LegacyProfiler.cpp: Move from typedef'd callbacks to using

std::function. This allows callbacks to take different argument types.

(JSC::callFunctionForProfilesWithGroup):
(JSC::LegacyProfiler::willExecute):
(JSC::LegacyProfiler::didExecute):
(JSC::LegacyProfiler::exceptionUnwind):
(JSC::LegacyProfiler::didPause):
(JSC::LegacyProfiler::didContinue):
(JSC::dispatchFunctionToProfiles): Deleted.

• profiler/LegacyProfiler.h:
• profiler/ProfileGenerator.cpp:

(JSC::ProfileGenerator::ProfileGenerator):
(JSC::ProfileGenerator::endCallEntry):
(JSC::ProfileGenerator::didExecute): Deleted.

• profiler/ProfileGenerator.h:

(JSC::ProfileGenerator::didPause):
(JSC::ProfileGenerator::didContinue):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/ScriptDebugServer.cpp (modified) (3 diffs)
• profiler/LegacyProfiler.cpp (modified) (7 diffs)
• profiler/LegacyProfiler.h (modified) (2 diffs)
• profiler/ProfileGenerator.cpp (modified) (3 diffs)
• profiler/ProfileGenerator.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-09-04  Brian J. Burg  <burg@cs.washington.edu>
+
+        Web Inspector: the profiler should not accrue time to nodes while the debugger is paused
+        https://bugs.webkit.org/show_bug.cgi?id=136352
+
+        Reviewed by Timothy Hatcher.
+
+        Hook up pause/continue events to the LegacyProfiler and any active
+        ProfilerGenerators. If the debugger is paused, all intervening call
+        entries will be created with totalTime as 0.0.
+
+        * inspector/ScriptDebugServer.cpp:
+        (Inspector::ScriptDebugServer::handlePause):
+        * profiler/LegacyProfiler.cpp: Move from typedef'd callbacks to using
+        std::function. This allows callbacks to take different argument types.
+
+        (JSC::callFunctionForProfilesWithGroup):
+        (JSC::LegacyProfiler::willExecute):
+        (JSC::LegacyProfiler::didExecute):
+        (JSC::LegacyProfiler::exceptionUnwind):
+        (JSC::LegacyProfiler::didPause):
+        (JSC::LegacyProfiler::didContinue):
+        (JSC::dispatchFunctionToProfiles): Deleted.
+        * profiler/LegacyProfiler.h:
+        * profiler/ProfileGenerator.cpp:
+        (JSC::ProfileGenerator::ProfileGenerator):
+        (JSC::ProfileGenerator::endCallEntry):
+        (JSC::ProfileGenerator::didExecute): Deleted.
+        * profiler/ProfileGenerator.h:
+        (JSC::ProfileGenerator::didPause):
+        (JSC::ProfileGenerator::didContinue):
+
 2014-09-04  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.cpp

@@ -39 +39 @@
 #include "JSLock.h"
 #include "JavaScriptCallFrame.h"
+#include "LegacyProfiler.h"
 #include "ScriptValue.h"
 #include "SourceProvider.h"
@@ -317 +318 @@
 {
     dispatchFunctionToListeners(&ScriptDebugServer::dispatchDidPause, vmEntryGlobalObject);
+    LegacyProfiler::profiler()->didPause(currentDebuggerCallFrame());
     didPause(vmEntryGlobalObject);
 
@@ -323 +325 @@
 
     didContinue(vmEntryGlobalObject);
+    LegacyProfiler::profiler()->didContinue(currentDebuggerCallFrame());
     dispatchFunctionToListeners(&ScriptDebugServer::dispatchDidContinue, vmEntryGlobalObject);
 }

trunk/Source/JavaScriptCore/profiler/LegacyProfiler.cpp

@@ -33 +33 @@
 #include "CodeBlock.h"
 #include "CommonIdentifiers.h"
+#include "DebuggerCallFrame.h"
 #include "InternalFunction.h"
 #include "JSFunction.h"
@@ -115 +116 @@
 }
 
-static inline void dispatchFunctionToProfiles(ExecState* callerOrHandlerCallFrame, const Vector<RefPtr<ProfileGenerator>>& profiles, ProfileGenerator::ProfileFunction function, const CallIdentifier& callIdentifier, unsigned currentProfileTargetGroup)
-{
-    for (size_t i = 0; i < profiles.size(); ++i) {
-        if (profiles[i]->profileGroup() == currentProfileTargetGroup || !profiles[i]->origin())
-            (profiles[i].get()->*function)(callerOrHandlerCallFrame, callIdentifier);
+static inline void callFunctionForProfilesWithGroup(std::function<void(ProfileGenerator*)> callback, const Vector<RefPtr<ProfileGenerator>>& profiles, unsigned targetProfileGroup)
+{
+    for (const RefPtr<ProfileGenerator>& profile : profiles) {
+        if (profile->profileGroup() == targetProfileGroup || !profile->origin())
+            callback(profile.get());
     }
 }
@@ -127 +128 @@
     ASSERT(!m_currentProfiles.isEmpty());
 
-    dispatchFunctionToProfiles(callerCallFrame, m_currentProfiles, &ProfileGenerator::willExecute, createCallIdentifier(callerCallFrame, function, StringImpl::empty(), 0, 0), callerCallFrame->lexicalGlobalObject()->profileGroup());
+    CallIdentifier callIdentifier = createCallIdentifier(callerCallFrame, function, StringImpl::empty(), 0, 0);
+
+    callFunctionForProfilesWithGroup(std::bind(&ProfileGenerator::willExecute, std::placeholders::_1, callerCallFrame, callIdentifier), m_currentProfiles, callerCallFrame->lexicalGlobalObject()->profileGroup());
 }
 
@@ -136 +139 @@
     CallIdentifier callIdentifier = createCallIdentifier(callerCallFrame, JSValue(), sourceURL, startingLineNumber, startingColumnNumber);
 
-    dispatchFunctionToProfiles(callerCallFrame, m_currentProfiles, &ProfileGenerator::willExecute, callIdentifier, callerCallFrame->lexicalGlobalObject()->profileGroup());
+    callFunctionForProfilesWithGroup(std::bind(&ProfileGenerator::willExecute, std::placeholders::_1, callerCallFrame, callIdentifier), m_currentProfiles, callerCallFrame->lexicalGlobalObject()->profileGroup());
 }
 
@@ -143 +146 @@
     ASSERT(!m_currentProfiles.isEmpty());
 
-    dispatchFunctionToProfiles(callerCallFrame, m_currentProfiles, &ProfileGenerator::didExecute, createCallIdentifier(callerCallFrame, function, StringImpl::empty(), 0, 0), callerCallFrame->lexicalGlobalObject()->profileGroup());
+    CallIdentifier callIdentifier = createCallIdentifier(callerCallFrame, function, StringImpl::empty(), 0, 0);
+
+    callFunctionForProfilesWithGroup(std::bind(&ProfileGenerator::didExecute, std::placeholders::_1, callerCallFrame, callIdentifier), m_currentProfiles, callerCallFrame->lexicalGlobalObject()->profileGroup());
 }
 
@@ -150 +155 @@
     ASSERT(!m_currentProfiles.isEmpty());
 
-    dispatchFunctionToProfiles(callerCallFrame, m_currentProfiles, &ProfileGenerator::didExecute, createCallIdentifier(callerCallFrame, JSValue(), sourceURL, startingLineNumber, startingColumnNumber), callerCallFrame->lexicalGlobalObject()->profileGroup());
+    CallIdentifier callIdentifier = createCallIdentifier(callerCallFrame, JSValue(), sourceURL, startingLineNumber, startingColumnNumber);
+
+    callFunctionForProfilesWithGroup(std::bind(&ProfileGenerator::didExecute, std::placeholders::_1, callerCallFrame, callIdentifier), m_currentProfiles, callerCallFrame->lexicalGlobalObject()->profileGroup());
 }
 
@@ -157 +164 @@
     ASSERT(!m_currentProfiles.isEmpty());
 
-    dispatchFunctionToProfiles(handlerCallFrame, m_currentProfiles, &ProfileGenerator::exceptionUnwind, createCallIdentifier(handlerCallFrame, JSValue(), StringImpl::empty(), 0, 0), handlerCallFrame->lexicalGlobalObject()->profileGroup());
+    CallIdentifier callIdentifier = createCallIdentifier(handlerCallFrame, JSValue(), StringImpl::empty(), 0, 0);
+
+    callFunctionForProfilesWithGroup(std::bind(&ProfileGenerator::exceptionUnwind, std::placeholders::_1, handlerCallFrame, callIdentifier), m_currentProfiles, handlerCallFrame->lexicalGlobalObject()->profileGroup());
+}
+
+void LegacyProfiler::didPause(PassRefPtr<DebuggerCallFrame> prpCallFrame)
+{
+    if (m_currentProfiles.isEmpty())
+        return;
+
+    RefPtr<DebuggerCallFrame> callFrame = prpCallFrame;
+    CallIdentifier callIdentifier = createCallIdentifier(callFrame->exec(), JSValue(), StringImpl::empty(), 0, 0);
+
+    callFunctionForProfilesWithGroup(std::bind(&ProfileGenerator::didPause, std::placeholders::_1, callFrame, callIdentifier), m_currentProfiles, callFrame->vmEntryGlobalObject()->profileGroup());
+}
+
+void LegacyProfiler::didContinue(PassRefPtr<DebuggerCallFrame> prpCallFrame)
+{
+    if (m_currentProfiles.isEmpty())
+        return;
+
+    RefPtr<DebuggerCallFrame> callFrame = prpCallFrame;
+    CallIdentifier callIdentifier = createCallIdentifier(callFrame->exec(), JSValue(), StringImpl::empty(), 0, 0);
+
+    callFunctionForProfilesWithGroup(std::bind(&ProfileGenerator::didContinue, std::placeholders::_1, callFrame, callIdentifier), m_currentProfiles, callFrame->vmEntryGlobalObject()->profileGroup());
 }
 

trunk/Source/JavaScriptCore/profiler/LegacyProfiler.h

@@ -37 +37 @@
 namespace JSC {
 
+class DebuggerCallFrame;
 class ExecState;
 class VM;
@@ -62 +63 @@
     void exceptionUnwind(ExecState* handlerCallFrame);
 
+    void didPause(PassRefPtr<DebuggerCallFrame>);
+    void didContinue(PassRefPtr<DebuggerCallFrame>);
+
     const Vector<RefPtr<ProfileGenerator>>& currentProfiles() { return m_currentProfiles; };
 

trunk/Source/JavaScriptCore/profiler/ProfileGenerator.cpp

@@ -29 +29 @@
 #include "CallFrame.h"
 #include "CodeBlock.h"
+#include "Debugger.h"
 #include "JSGlobalObject.h"
 #include "JSStringRef.h"
@@ -49 +50 @@
     , m_profileGroup(exec ? exec->lexicalGlobalObject()->profileGroup() : 0)
     , m_foundConsoleStartParent(false)
-{
+    , m_debuggerPaused(false)
+{
+    if (Debugger* debugger = exec->lexicalGlobalObject()->debugger())
+        m_debuggerPaused = debugger->isPaused();
+
     m_profile = Profile::create(title, uid);
     m_currentNode = m_rootNode = m_profile->rootNode();
@@ -124 +129 @@
     ASSERT(isnan(last.totalTime()));
 
-    last.setTotalTime(currentTime() - last.startTime());
+    last.setTotalTime(m_debuggerPaused ? 0.0 : currentTime() - last.startTime());
 }
 

trunk/Source/JavaScriptCore/profiler/ProfileGenerator.h

@@ -34 +34 @@
 namespace JSC {
 
+    class DebuggerCallFrame;
     class ExecState;
     class JSGlobalObject;
@@ -53 +54 @@
         void didExecute(ExecState* callerCallFrame, const CallIdentifier&);
         void exceptionUnwind(ExecState* handlerCallFrame, const CallIdentifier&);
+
+        void didPause(PassRefPtr<DebuggerCallFrame>, const CallIdentifier&) { m_debuggerPaused = true; }
+        void didContinue(PassRefPtr<DebuggerCallFrame>, const CallIdentifier&) { m_debuggerPaused = false; }
 
         void stopProfiling();
@@ -74 +78 @@
         RefPtr<ProfileNode> m_currentNode;
         bool m_foundConsoleStartParent;
+        bool m_debuggerPaused;
     };