Changeset 174322 in webkit for trunk/Source/JavaScriptCore/profiler

Timestamp:

Oct 4, 2014, 2:55:58 PM (11 years ago)

Author:

Brian Burg

Message:

Unreviewed, rolling out r174319.

Causes assertions in fast/profiler tests. Needs nontrivial
investigation, will take offline.

Reverted changeset:

"Web Inspector: timelines should not count time elapsed while
paused in the debugger"
​https://bugs.webkit.org/show_bug.cgi?id=136351
​http://trac.webkit.org/changeset/174319

Location:

trunk/Source/JavaScriptCore/profiler

Files:

• LegacyProfiler.cpp (modified) (7 diffs)
• LegacyProfiler.h (modified) (3 diffs)
• ProfileGenerator.cpp (modified) (5 diffs)
• ProfileGenerator.h (modified) (5 diffs)

trunk/Source/JavaScriptCore/profiler/LegacyProfiler.cpp

@@ -33 +33 @@
 #include "CodeBlock.h"
 #include "CommonIdentifiers.h"
+#include "DebuggerCallFrame.h"
 #include "InternalFunction.h"
 #include "JSFunction.h"
@@ -50 +51 @@
 static CallIdentifier createCallIdentifierFromFunctionImp(ExecState*, JSObject*, const String& defaultSourceURL, unsigned defaultLineNumber, unsigned defaultColumnNumber);
 
-LegacyProfiler* LegacyProfiler::s_sharedLegacyProfiler = nullptr;
+LegacyProfiler* LegacyProfiler::s_sharedLegacyProfiler = 0;
 
 LegacyProfiler* LegacyProfiler::profiler()
@@ -57 +58 @@
         s_sharedLegacyProfiler = new LegacyProfiler();
     return s_sharedLegacyProfiler;
-}
-
-void LegacyProfiler::startProfiling(ExecState* exec, const String& title, PassRefPtr<Stopwatch> stopwatch)
+}   
+
+void LegacyProfiler::startProfiling(ExecState* exec, const String& title)
 {
     if (!exec)
@@ -75 +76 @@
 
     exec->vm().setEnabledProfiler(this);
-    RefPtr<ProfileGenerator> profileGenerator = ProfileGenerator::create(exec, title, ++ProfilesUID, stopwatch);
+    RefPtr<ProfileGenerator> profileGenerator = ProfileGenerator::create(exec, title, ++ProfilesUID);
     m_currentProfiles.append(profileGenerator);
 }
@@ -82 +83 @@
 {
     if (!exec)
-        return nullptr;
+        return 0;
 
     JSGlobalObject* origin = exec->lexicalGlobalObject();
@@ -94 +95 @@
             if (!m_currentProfiles.size())
                 exec->vm().setEnabledProfiler(nullptr);
-
+            
             return returnProfile;
         }
     }
 
-    return nullptr;
+    return 0;
 }
 
@@ -182 +183 @@
 
     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

@@ -33 +33 @@
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefPtr.h>
-#include <wtf/Stopwatch.h>
 #include <wtf/Vector.h>
 
 namespace JSC {
 
+class DebuggerCallFrame;
 class ExecState;
+class VM;
 class JSGlobalObject;
 class JSObject;
@@ -48 +49 @@
     WTF_MAKE_FAST_ALLOCATED;
 public:
-    JS_EXPORT_PRIVATE static LegacyProfiler* profiler();
+    JS_EXPORT_PRIVATE static LegacyProfiler* profiler(); 
     static CallIdentifier createCallIdentifier(ExecState*, JSValue, const WTF::String& sourceURL, unsigned defaultLineNumber, unsigned defaultColumnNumber);
 
-    JS_EXPORT_PRIVATE void startProfiling(ExecState*, const WTF::String& title, PassRefPtr<Stopwatch>);
+    JS_EXPORT_PRIVATE void startProfiling(ExecState*, const WTF::String& title);
     JS_EXPORT_PRIVATE PassRefPtr<Profile> stopProfiling(ExecState*, const WTF::String& title);
     void stopProfiling(JSGlobalObject*);
@@ -66 +67 @@
     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"
@@ -40 +41 @@
 namespace JSC {
 
-PassRefPtr<ProfileGenerator> ProfileGenerator::create(ExecState* exec, const String& title, unsigned uid, PassRefPtr<Stopwatch> stopwatch)
-{
-    return adoptRef(new ProfileGenerator(exec, title, uid, stopwatch));
-}
-
-ProfileGenerator::ProfileGenerator(ExecState* exec, const String& title, unsigned uid, PassRefPtr<Stopwatch> stopwatch)
+PassRefPtr<ProfileGenerator> ProfileGenerator::create(ExecState* exec, const String& title, unsigned uid)
+{
+    return adoptRef(new ProfileGenerator(exec, title, uid));
+}
+
+ProfileGenerator::ProfileGenerator(ExecState* exec, const String& title, unsigned uid)
     : m_origin(exec ? exec->lexicalGlobalObject() : nullptr)
     , m_profileGroup(exec ? exec->lexicalGlobalObject()->profileGroup() : 0)
-    , m_stopwatch(stopwatch)
+    , m_debuggerPausedTimestamp(NAN)
     , m_foundConsoleStartParent(false)
     , m_suspended(false)
 {
+    if (Debugger* debugger = exec->lexicalGlobalObject()->debugger())
+        m_debuggerPausedTimestamp = debugger->isPaused() ? currentTime() : NAN;
+
     m_profile = Profile::create(title, uid);
     m_currentNode = m_rootNode = m_profile->rootNode();
@@ -115 +119 @@
 
     if (isnan(startTime))
-        startTime = m_stopwatch->elapsedTime();
+        startTime = currentTime();
+
+    // If the debugger is paused when beginning, then don't set the start time. It
+    // will be fixed up when the debugger unpauses or the call entry ends.
+    if (!isnan(m_debuggerPausedTimestamp))
+        startTime = NAN;
 
     node->appendCall(ProfileNode::Call(startTime));
@@ -125 +134 @@
 
     ProfileNode::Call& last = node->lastCall();
+
+    // If the debugger is paused, ignore the interval that ends now.
+    if (!isnan(m_debuggerPausedTimestamp) && !isnan(last.elapsedTime()))
+        return;
+
+    // If paused and no time was accrued then the debugger was never unpaused. The call will
+    // have no time accrued and appear to have started when the debugger was paused.
+    if (!isnan(m_debuggerPausedTimestamp)) {
+        last.setStartTime(m_debuggerPausedTimestamp);
+        last.setElapsedTime(0.0);
+        return;
+    }
+
+    // Otherwise, add the interval ending now to elapsed time.
     double previousElapsedTime = isnan(last.elapsedTime()) ? 0.0 : last.elapsedTime();
-    double newlyElapsedTime = m_stopwatch->elapsedTime() - last.startTime();
+    double newlyElapsedTime = currentTime() - last.startTime();
     last.setElapsedTime(previousElapsedTime + newlyElapsedTime);
 }
@@ -201 +224 @@
 }
 
+void ProfileGenerator::didPause(PassRefPtr<DebuggerCallFrame>, const CallIdentifier&)
+{
+    ASSERT(isnan(m_debuggerPausedTimestamp));
+
+    m_debuggerPausedTimestamp = currentTime();
+
+    for (ProfileNode* node = m_currentNode.get(); node != m_profile->rootNode(); node = node->parent()) {
+        ProfileNode::Call& last = node->lastCall();
+        ASSERT(!isnan(last.startTime()));
+
+        double previousElapsedTime = isnan(last.elapsedTime()) ? 0.0 : last.elapsedTime();
+        double additionalElapsedTime = m_debuggerPausedTimestamp - last.startTime();
+        last.setStartTime(NAN);
+        last.setElapsedTime(previousElapsedTime + additionalElapsedTime);
+    }
+}
+
+void ProfileGenerator::didContinue(PassRefPtr<DebuggerCallFrame>, const CallIdentifier&)
+{
+    ASSERT(!isnan(m_debuggerPausedTimestamp));
+
+    for (ProfileNode* node = m_currentNode.get(); node != m_profile->rootNode(); node = node->parent())
+        node->lastCall().setStartTime(m_debuggerPausedTimestamp);
+
+    m_debuggerPausedTimestamp = NAN;
+}
+
 void ProfileGenerator::stopProfiling()
 {

trunk/Source/JavaScriptCore/profiler/ProfileGenerator.h

@@ -30 +30 @@
 #include <wtf/RefCounted.h>
 #include <wtf/RefPtr.h>
-#include <wtf/Stopwatch.h>
 #include <wtf/text/WTFString.h>
 
@@ -44 +43 @@
     class ProfileGenerator : public RefCounted<ProfileGenerator>  {
     public:
-        static PassRefPtr<ProfileGenerator> create(ExecState*, const WTF::String& title, unsigned uid, PassRefPtr<Stopwatch>);
+        static PassRefPtr<ProfileGenerator> create(ExecState*, const WTF::String& title, unsigned uid);
 
         // Members
@@ -56 +55 @@
         void exceptionUnwind(ExecState* handlerCallFrame, const CallIdentifier&);
 
+        void didPause(PassRefPtr<DebuggerCallFrame>, const CallIdentifier&);
+        void didContinue(PassRefPtr<DebuggerCallFrame>, const CallIdentifier&);
+
         void setIsSuspended(bool suspended) { ASSERT(m_suspended != suspended); m_suspended = suspended; }
 
@@ -61 +63 @@
 
     private:
-        ProfileGenerator(ExecState*, const WTF::String& title, unsigned uid, PassRefPtr<Stopwatch>);
+        ProfileGenerator(ExecState*, const WTF::String& title, unsigned uid);
         void addParentForConsoleStart(ExecState*);
 
@@ -73 +75 @@
         JSGlobalObject* m_origin;
         unsigned m_profileGroup;
-        RefPtr<Stopwatch> m_stopwatch;
+        // Timestamp is set to NAN when the debugger is not currently paused.
+        double m_debuggerPausedTimestamp;
         RefPtr<ProfileNode> m_rootNode;
         RefPtr<ProfileNode> m_currentNode;