Changeset 185777 in webkit

Timestamp:

Jun 19, 2015, 4:35:53 PM (11 years ago)

Author:

Matt Baker

Message:

Web Inspector: TimelineAgent needs to handle nested runloops
​https://bugs.webkit.org/show_bug.cgi?id=145090

Reviewed by Joseph Pecoraro.

Source/WebCore:

Previously nested run loops caused InspectorTimelineAgent to prematurely pop the current run loop record. This
patch adds a counter to track the run loop nesting level, and rendering frame records are only pushed/popped
when the nesting level is zero. Run loop entry/exit notifications received while the debugger is paused do not
affect the nesting level.

• inspector/InspectorTimelineAgent.cpp:

(WebCore::InspectorTimelineAgent::internalStart):
(WebCore::InspectorTimelineAgent::internalStop):
(WebCore::InspectorTimelineAgent::InspectorTimelineAgent):

• inspector/InspectorTimelineAgent.h:

LayoutTests:

• TestExpectations:

Unskip tests after improvements to nested runloop handling in InspectorTimelineAgent.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/InspectorTimelineAgent.cpp (modified) (4 diffs)
• Source/WebCore/inspector/InspectorTimelineAgent.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-06-19  Matt Baker  <mattbaker@apple.com>
+
+        Web Inspector: TimelineAgent needs to handle nested runloops
+        https://bugs.webkit.org/show_bug.cgi?id=145090
+
+        Reviewed by Joseph Pecoraro.
+
+        * TestExpectations:
+        Unskip tests after improvements to nested runloop handling in InspectorTimelineAgent.
+
 2015-06-19  Andy Estes  <aestes@apple.com>
 

trunk/LayoutTests/TestExpectations

@@ -525 +525 @@
 webkit.org/b/145390 storage/indexeddb/deleteIndex-bug110792.html [ Pass Failure ]
 
-webkit.org/b/145090 inspector/debugger/break-on-exception.html [ Skip ]
-webkit.org/b/145090 inspector/debugger/break-on-exception-catch.html [ Skip ]
-webkit.org/b/145090 inspector/debugger/break-on-exception-finally.html [ Skip ]
-webkit.org/b/145090 inspector/debugger/break-on-exception-native.html [ Skip ]
-webkit.org/b/145090 inspector/debugger/break-on-exception-throw-in-promise.html [ Skip ]
-webkit.org/b/145090 inspector/debugger/break-on-exception-throw-in-promise-with-catch.html [ Skip ]
-webkit.org/b/145090 inspector/debugger/break-on-exception-throw-in-promise-then.html [ Skip ]
-webkit.org/b/145090 inspector/debugger/break-on-exception-throw-in-promise-then-with-catch.html [ Skip ]
-webkit.org/b/145090 inspector/debugger/break-on-exception-throw-in-promise-rethrow-in-catch.html [ Skip ]
-webkit.org/b/145090 inspector/debugger/break-on-exception-window-onerror.html [ Skip ]
-webkit.org/b/145090 inspector/debugger/break-on-uncaught-exception.html [ Skip ]
-webkit.org/b/145090 inspector/debugger/break-on-uncaught-exception-catch.html [ Skip ]
-webkit.org/b/145090 inspector/debugger/break-on-uncaught-exception-finally.html [ Skip ]
-webkit.org/b/145090 inspector/debugger/break-on-uncaught-exception-native.html [ Skip ]
-webkit.org/b/145090 inspector/debugger/break-on-uncaught-exception-throw-in-promise.html [ Skip ]
-webkit.org/b/145090 inspector/debugger/break-on-uncaught-exception-throw-in-promise-with-catch.html [ Skip ]
-webkit.org/b/145090 inspector/debugger/break-on-uncaught-exception-throw-in-promise-then.html [ Skip ]
-webkit.org/b/145090 inspector/debugger/break-on-uncaught-exception-throw-in-promise-then-with-catch.html [ Skip ]
-webkit.org/b/145090 inspector/debugger/break-on-uncaught-exception-throw-in-promise-rethrow-in-catch.html [ Skip ]
-webkit.org/b/145090 inspector/debugger/break-on-uncaught-exception-window-onerror.html [ Skip ]
-
 # DumpRenderTree does not allow GIFs to animate, thus animated GIF tests don't work in WebKit1.
 fast/images/animated-gif-no-layout.html [ ImageOnlyFailure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-06-19  Matt Baker  <mattbaker@apple.com>
+
+        Web Inspector: TimelineAgent needs to handle nested runloops
+        https://bugs.webkit.org/show_bug.cgi?id=145090
+
+        Reviewed by Joseph Pecoraro.
+
+        Previously nested run loops caused InspectorTimelineAgent to prematurely pop the current run loop record. This
+        patch adds a counter to track the run loop nesting level, and rendering frame records are only pushed/popped
+        when the nesting level is zero. Run loop entry/exit notifications received while the debugger is paused do not
+        affect the nesting level.
+
+        * inspector/InspectorTimelineAgent.cpp:
+        (WebCore::InspectorTimelineAgent::internalStart):
+        (WebCore::InspectorTimelineAgent::internalStop):
+        (WebCore::InspectorTimelineAgent::InspectorTimelineAgent):
+        * inspector/InspectorTimelineAgent.h:
+
 2015-06-19  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp

@@ -141 +141 @@
         m_maxCallStackDepth = 5;
 
-    m_instrumentingAgents->inspectorEnvironment().executionStopwatch()->start();
+    // If the debugger is paused the environment's stopwatch will be stopped, and shouldn't be
+    // restarted until the debugger continues.
+    if (!m_scriptDebugServer->isPaused())
+        m_instrumentingAgents->inspectorEnvironment().executionStopwatch()->start();
 
     m_instrumentingAgents->setInspectorTimelineAgent(this);
@@ -154 +157 @@
 #if PLATFORM(COCOA)
     m_frameStartObserver = RunLoopObserver::create(0, [this]() {
-        if (!m_enabled || m_didStartRecordingRunLoop)
+        if (!m_enabled || m_scriptDebugServer->isPaused())
             return;
 
-        pushCurrentRecord(InspectorObject::create(), TimelineRecordType::RenderingFrame, false, nullptr);
-        m_didStartRecordingRunLoop = true;
+        if (!m_runLoopNestingLevel)
+            pushCurrentRecord(InspectorObject::create(), TimelineRecordType::RenderingFrame, false, nullptr);
+        m_runLoopNestingLevel++;
     });
 
     m_frameStopObserver = RunLoopObserver::create(frameStopRunLoopOrder, [this]() {
-        if (!m_enabled || !m_didStartRecordingRunLoop)
+        if (!m_enabled || m_scriptDebugServer->isPaused())
             return;
 
-        didCompleteCurrentRecord(TimelineRecordType::RenderingFrame);
-        m_didStartRecordingRunLoop = false;
+        ASSERT(m_runLoopNestingLevel > 0);
+        m_runLoopNestingLevel--;
+        if (!m_runLoopNestingLevel)
+            didCompleteCurrentRecord(TimelineRecordType::RenderingFrame);
     });
 
-    m_frameStartObserver->schedule(currentRunLoop(), kCFRunLoopAfterWaiting | kCFRunLoopBeforeTimers);
-    m_frameStopObserver->schedule(currentRunLoop(), kCFRunLoopBeforeWaiting | kCFRunLoopExit);
-
-    // Create a runloop record immediately in order to capture the rest of the current runloop.
+    m_frameStartObserver->schedule(currentRunLoop(), kCFRunLoopEntry | kCFRunLoopAfterWaiting);
+    m_frameStopObserver->schedule(currentRunLoop(), kCFRunLoopExit | kCFRunLoopBeforeWaiting);
+
+    // Create a runloop record and increment the runloop nesting level, to capture the current turn of the main runloop
+    // (which is the outer runloop if recording started while paused in the debugger).
     pushCurrentRecord(InspectorObject::create(), TimelineRecordType::RenderingFrame, false, nullptr);
-    m_didStartRecordingRunLoop = true;
+
+    m_runLoopNestingLevel = 1;
 #endif
 
@@ -199 +207 @@
     m_frameStartObserver = nullptr;
     m_frameStopObserver = nullptr;
-    if (m_didStartRecordingRunLoop) {
-        m_didStartRecordingRunLoop = false;
-
-        // Complete all pending records to prevent discarding events that are currently in progress.
-        while (!m_recordStack.isEmpty())
-            didCompleteCurrentRecord(m_recordStack.last().type);
-    }
+    m_runLoopNestingLevel = 0;
+
+    // Complete all pending records to prevent discarding events that are currently in progress.
+    while (!m_recordStack.isEmpty())
+        didCompleteCurrentRecord(m_recordStack.last().type);
 #endif
 
@@ -723 +729 @@
     , m_enabled(false)
     , m_enabledFromFrontend(false)
-    , m_didStartRecordingRunLoop(false)
+    , m_runLoopNestingLevel(0)
 {
 }

trunk/Source/WebCore/inspector/InspectorTimelineAgent.h

@@ -252 +252 @@
     std::unique_ptr<WebCore::RunLoopObserver> m_frameStopObserver;
 #endif
-    bool m_didStartRecordingRunLoop;
+    int m_runLoopNestingLevel;
 };