Changeset 282489 in webkit

Timestamp:

Sep 16, 2021, 12:22:45 AM (5 years ago)

Author:

Adrian Perez de Castro

Message:

Merge r275241 - Occasional debug assert in GenericTaskQueue::~GenericTaskQueue
​https://bugs.webkit.org/show_bug.cgi?id=223913

Reviewed by Eric Carlson.

Eagerly initialize WeakPtrImpl so that we don't hit debug assertions.

Also made Performance object use EventLoop.

No new tests since there is no test case that reliably reproduces this issue.

• dom/TaskSource.h:

(TaskSource): Added PerformanceTimeline.

• page/Performance.cpp:

(WebCore::Performance::Performance):
(WebCore::Performance::contextDestroyed):
(WebCore::Performance::queueEntry): Use EventLoopTaskGroup instead of GenericTaskQueue to deliver entries.

• page/Performance.h:
• platform/GenericTaskQueue.h:

(WebCore::GenericTaskQueue::GenericTaskQueue): Eagerly initialize WeakPtrImpl.
Also assert that we're creating this object in the main thread.

Location:

releases/WebKitGTK/webkit-2.32/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/TaskSource.h (modified) (1 diff)
• page/Performance.cpp (modified) (4 diffs)
• page/Performance.h (modified) (3 diffs)
• platform/GenericTaskQueue.h (modified) (4 diffs)

releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog

@@ +1 @@
+2021-03-30  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Occasional debug assert in GenericTaskQueue::~GenericTaskQueue
+        https://bugs.webkit.org/show_bug.cgi?id=223913
+
+        Reviewed by Eric Carlson.
+
+        Eagerly initialize WeakPtrImpl so that we don't hit debug assertions.
+
+        Also made Performance object use EventLoop.
+
+        No new tests since there is no test case that reliably reproduces this issue.
+
+        * dom/TaskSource.h:
+        (TaskSource): Added PerformanceTimeline.
+        * page/Performance.cpp:
+        (WebCore::Performance::Performance):
+        (WebCore::Performance::contextDestroyed):
+        (WebCore::Performance::queueEntry): Use EventLoopTaskGroup instead of GenericTaskQueue to deliver entries.
+        * page/Performance.h:
+        * platform/GenericTaskQueue.h:
+        (WebCore::GenericTaskQueue::GenericTaskQueue): Eagerly initialize WeakPtrImpl.
+        Also assert that we're creating this object in the main thread.
+
 2021-03-29  Chris Dumez  <cdumez@apple.com>
 

releases/WebKitGTK/webkit-2.32/Source/WebCore/dom/TaskSource.h

@@ -37 +37 @@
     Microtask,
     Networking,
+    PerformanceTimeline,
     PostedMessageQueue,
     UserInteraction,

releases/WebKitGTK/webkit-2.32/Source/WebCore/page/Performance.cpp

@@ -37 +37 @@
 #include "DocumentLoader.h"
 #include "Event.h"
+#include "EventLoop.h"
 #include "EventNames.h"
 #include "Frame.h"
@@ -58 +59 @@
 Performance::Performance(ScriptExecutionContext* context, MonotonicTime timeOrigin)
     : ContextDestructionObserver(context)
-    , m_resourceTimingBufferFullTimer(*this, &Performance::resourceTimingBufferFullTimerFired)
+    , m_resourceTimingBufferFullTimer(*this, &Performance::resourceTimingBufferFullTimerFired) // FIXME: Migrate this to the event loop as well.
     , m_timeOrigin(timeOrigin)
-    , m_performanceTimelineTaskQueue(context)
 {
     ASSERT(m_timeOrigin);
-    ASSERT(context || m_performanceTimelineTaskQueue.isClosed());
 }
 
@@ -70 +69 @@
 void Performance::contextDestroyed()
 {
-    m_performanceTimelineTaskQueue.close();
     m_resourceTimingBufferFullTimer.stop();
     ContextDestructionObserver::contextDestroyed();
@@ -369 +367 @@
         return;
 
-    if (m_performanceTimelineTaskQueue.hasPendingTasks())
-        return;
-
-    m_performanceTimelineTaskQueue.enqueueTask([this] () {
+    if (m_hasScheduledTimingBufferDeliveryTask)
+        return;
+
+    auto* context = scriptExecutionContext();
+    if (!context)
+        return;
+
+    m_hasScheduledTimingBufferDeliveryTask = true;
+    context->eventLoop().queueTask(TaskSource::PerformanceTimeline, [protectedThis = makeRef(*this), this] {
+        auto* context = scriptExecutionContext();
+        if (!context)
+            return;
+
+        m_hasScheduledTimingBufferDeliveryTask = false;
         for (auto& observer : copyToVector(m_observers))
             observer->deliver();

releases/WebKitGTK/webkit-2.32/Source/WebCore/page/Performance.h

@@ -37 +37 @@
 #include "EventTarget.h"
 #include "ExceptionOr.h"
-#include "GenericTaskQueue.h"
 #include "ReducedResolutionSeconds.h"
+#include "ScriptExecutionContext.h"
+#include "Timer.h"
 #include <wtf/ListHashSet.h>
 #include <wtf/Variant.h>
@@ -135 +136 @@
     bool m_resourceTimingBufferFullFlag { false };
     bool m_waitingForBackupBufferToBeProcessed { false };
+    bool m_hasScheduledTimingBufferDeliveryTask { false };
 
     MonotonicTime m_timeOrigin;
@@ -141 +143 @@
     std::unique_ptr<PerformanceUserTiming> m_userTiming;
 
-    GenericTaskQueue<ScriptExecutionContext> m_performanceTimelineTaskQueue;
     ListHashSet<RefPtr<PerformanceObserver>> m_observers;
 };

releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/GenericTaskQueue.h

@@ -59 +59 @@
 
 template<>
-class TaskDispatcher<Timer> : public CanMakeWeakPtr<TaskDispatcher<Timer>> {
+class TaskDispatcher<Timer> : public CanMakeWeakPtr<TaskDispatcher<Timer>, WeakPtrFactoryInitialization::Eager> {
     WTF_MAKE_FAST_ALLOCATED;
 public:
@@ -83 +83 @@
         : m_dispatcher(makeUniqueRef<TaskDispatcher<T>>())
     {
+        ASSERT(isMainThread());
     }
 
@@ -88 +89 @@
         : m_dispatcher(makeUniqueRef<TaskDispatcher<T>>(&t))
     {
+        ASSERT(isMainThread());
     }
 
@@ -94 +96 @@
         , m_isClosed(!t)
     {
+        ASSERT(isMainThread());
     }