Changeset 41081 in webkit for trunk/JavaScriptCore

Timestamp:

Feb 19, 2009, 11:40:07 AM (17 years ago)

Author:

[email protected]

Message:

2009-02-19 David Levin <​[email protected]>

Reviewed by Alexey Proskuryakov.

Bug 23976: MessageQueue needs a way to wait for a message that satisfies an arbitrary criteria.
<​https://bugs.webkit.org/show_bug.cgi?id=23976>

• wtf/Deque.h: (WTF::Deque<T>::findIf):
• wtf/MessageQueue.h: (WTF::MessageQueue<T>::waitForMessageFiltered):

Location:

trunk/JavaScriptCore

Files:

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

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2009-02-19  David Levin  <[email protected]>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Bug 23976: MessageQueue needs a way to wait for a message that satisfies an arbitrary criteria.
+        <https://bugs.webkit.org/show_bug.cgi?id=23976>
+
+        * wtf/Deque.h:
+        (WTF::Deque<T>::findIf):
+        * wtf/MessageQueue.h:
+        (WTF::MessageQueue<T>::waitForMessageFiltered):
+
 2009-02-18  David Levin  <[email protected]>
 

trunk/JavaScriptCore/wtf/Deque.h

@@ -82 +82 @@
         void clear();
 
+        template<typename Predicate>
+        iterator findIf(Predicate&);
+
     private:
         friend class DequeIteratorBase<T>;
@@ -354 +357 @@
     }
 
-    template <typename T>
+    template<typename T>
     inline void Deque<T>::swap(Deque<T>& other)
     {
@@ -367 +370 @@
     }
 
-    template <typename T>
+    template<typename T>
     inline void Deque<T>::clear()
     {
@@ -376 +379 @@
         m_end = 0;
         checkValidity();
+    }
+
+    template<typename T>
+    template<typename Predicate>
+    inline DequeIterator<T> Deque<T>::findIf(Predicate& predicate)
+    {
+        iterator end_iterator = end();
+        for (iterator it = begin(); it != end_iterator; ++it) {
+            if (predicate(*it))
+                return it;
+        }
+        return end_iterator;
     }
 

trunk/JavaScriptCore/wtf/MessageQueue.h

@@ -1 +1 @@
 /*
  * Copyright (C) 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -51 +52 @@
         void prepend(const DataType&);
         bool waitForMessage(DataType&);
+        template<typename Predicate>
+        MessageQueueWaitResult waitForMessageFiltered(DataType&, Predicate&);
         MessageQueueWaitResult waitForMessageTimed(DataType&, double absoluteTime);
         void kill();
@@ -98 +101 @@
         m_queue.removeFirst();
         return true;
+    }
+
+    template<typename DataType>
+    template<typename Predicate>
+    inline MessageQueueWaitResult MessageQueue<DataType>::waitForMessageFiltered(DataType& result, Predicate& predicate)
+    {
+        MutexLocker lock(m_mutex);
+
+        DequeConstIterator<DataType> found = m_queue.end();
+        while (!m_killed && (found = m_queue.findIf(predicate)) == m_queue.end())
+            m_condition.wait(m_mutex);
+
+        if (m_killed)
+            return MessageQueueTerminated;
+
+        ASSERT(found != m_queue.end());
+        result = *found;
+        m_queue.remove(found);
+        return MessageQueueMessageReceived;
     }
 
@@ -158 +180 @@
         return m_killed;
     }
-}
+} // namespace WTF
 
 using WTF::MessageQueue;