Changeset 50247 in webkit for trunk/JavaScriptCore

Timestamp:

Oct 28, 2009, 4:21:31 PM (16 years ago)

Author:

[email protected]

Message:

JavaScriptCore: Add MessageQueue::removeIf(Predicate&) to remove certain tasks without pulling them from the queue.
Existing Database tests cover this since Database removes tasks when it is stopped.
​https://bugs.webkit.org/show_bug.cgi?id=30805

Reviewed by David Levin.

• wtf/MessageQueue.h:

(WTF::::removeIf):

WebCore: Add MessageQueue::removeIf(Predicate&) to remove certain tasks without pulling them from the queue.
Existing Database tests cover this, no change in functionality.
​https://bugs.webkit.org/show_bug.cgi?id=30805

Reviewed by David Levin.

• storage/DatabaseThread.cpp:

(WebCore::SameDatabasePredicate::SameDatabasePredicate): Added predicate that flags the tasks belonging to a specified database.
(WebCore::SameDatabasePredicate::operator()):
(WebCore::DatabaseThread::unscheduleDatabaseTasks): changed to use the new removeIf method.

Location:

trunk/JavaScriptCore

Files:

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

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2009-10-28  Dmitry Titov  <[email protected]>
+
+        Reviewed by David Levin.
+
+        https://bugs.webkit.org/show_bug.cgi?id=30805
+        Add MessageQueue::removeIf(Predicate&) to remove certain tasks without pulling them from the queue.
+        Existing Database tests cover this since Database removes tasks when it is stopped.
+
+        * wtf/MessageQueue.h:
+        (WTF::::removeIf):
+
 2009-10-28  Afonso R. Costa Jr.  <[email protected]>
 

trunk/JavaScriptCore/wtf/MessageQueue.h

@@ -56 +56 @@
         template<typename Predicate>
         MessageQueueWaitResult waitForMessageFilteredWithTimeout(DataType&, Predicate&, double absoluteTime);
-        void kill();
+
+        template<typename Predicate>
+        void removeIf(Predicate&);
 
         bool tryGetMessage(DataType&);
+
+        void kill();
         bool killed() const;
 
@@ -150 +154 @@
 
     template<typename DataType>
+    template<typename Predicate>
+    inline void MessageQueue<DataType>::removeIf(Predicate& predicate)
+    {
+        MutexLocker lock(m_mutex);
+        DequeConstIterator<DataType> found = m_queue.end();
+        while ((found = m_queue.findIf(predicate)) != m_queue.end()) {
+            m_queue.remove(found);
+       }
+    }
+
+    template<typename DataType>
     inline bool MessageQueue<DataType>::isEmpty()
     {