Changeset 37771 in webkit for trunk/JavaScriptCore

Timestamp:

Oct 21, 2008, 11:07:32 PM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Darin Adler.

Test: fast/events/message-channel-gc-3.html

​https://bugs.webkit.org/show_bug.cgi?id=21769
MessagePort should be GC protected if there are messages to be delivered

• dom/MessagePort.h: Removed pending activity count. Now we track if a close event is pending, and check if the queue is non-empty. (WebCore::MessagePort::workerContext): Added a stub implementation for a cross-heap GC bug fix (below).

• dom/MessagePort.cpp: (WebCore::CloseMessagePortTimer::fired): (WebCore::MessagePort::MessagePort): (WebCore::MessagePort::queueCloseEvent): (WebCore::MessagePort::dispatchCloseEvent): (WebCore::MessagePort::hasPendingActivity): Track message and close event activity separately.

• bindings/js/JSDOMBinding.cpp: (WebCore::markCrossHeapDependentObjectsForDocument): Fixed a bug in cross-heap GC that was causing same-heap ports to never be deleted.

• wtf/MessageQueue.h: (WTF::::isEmpty): Added. Also added a warning for methods that return a snapshot of queue state, thus likely to cause race conditions.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• wtf/MessageQueue.h (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-10-21  Alexey Proskuryakov  <[email protected]>
+
+        Reviewed by Darin Adler.
+
+        https://bugs.webkit.org/show_bug.cgi?id=21769
+        MessagePort should be GC protected if there are messages to be delivered
+
+        * wtf/MessageQueue.h:
+        (WTF::::isEmpty): Added. Also added a warning for methods that return a snapshot of queue
+        state, thus likely to cause race conditions.
+
 2008-10-21  Darin Adler  <[email protected]>
 

trunk/JavaScriptCore/wtf/MessageQueue.h

@@ -45 +45 @@
         void prepend(const DataType&);
         bool waitForMessage(DataType&);
+        void kill();
+
         bool tryGetMessage(DataType&);
-        void kill();
         bool killed() const;
+
+        // The result of isEmpty() is only valid if no other thread is manipulating the queue at the same time.
+        bool isEmpty();
 
     private:
@@ -104 +108 @@
 
     template<typename DataType>
+    inline bool MessageQueue<DataType>::isEmpty()
+    {
+        MutexLocker lock(m_mutex);
+        if (m_killed)
+            return true;
+        return m_queue.isEmpty();
+    }
+
+    template<typename DataType>
     inline void MessageQueue<DataType>::kill()
     {