Changeset 39908 in webkit for trunk/JavaScriptCore/wtf/ThreadingQt.cpp

Timestamp:

Jan 14, 2009, 1:57:30 PM (16 years ago)

Author:

[email protected]

Message:

2009-01-14 Dmitry Titov <​[email protected]>

Reviewed by Alexey Proskuryakov.

​https://bugs.webkit.org/show_bug.cgi?id=23312
Implement MessageQueue::waitForMessageTimed()
Also fixed ThreadCondition::timedWait() to take absolute time, as discussed on webkit-dev.
Win32 version of timedWait still has to be implemented.

• wtf/MessageQueue.h: (WTF::MessageQueueWaitResult: new enum for the result of MessageQueue::waitForMessageTimed. (WTF::MessageQueue::waitForMessage): (WTF::MessageQueue::waitForMessageTimed): New method.
• wtf/Threading.h:
• wtf/ThreadingGtk.cpp: (WTF::ThreadCondition::timedWait): changed to use absolute time instead of interval.
• wtf/ThreadingNone.cpp: (WTF::ThreadCondition::timedWait): ditto.
• wtf/ThreadingPthreads.cpp: (WTF::ThreadCondition::timedWait): ditto.
• wtf/ThreadingQt.cpp: (WTF::ThreadCondition::timedWait): ditto.
• wtf/ThreadingWin.cpp: (WTF::ThreadCondition::timedWait): ditto. The actual Win32 code is still to be implemented.

File:

• trunk/JavaScriptCore/wtf/ThreadingQt.cpp (modified) (2 diffs)

trunk/JavaScriptCore/wtf/ThreadingQt.cpp

@@ -30 +30 @@
 #include "Threading.h"
 
+#include "CurrentTime.h"
 #include "HashMap.h"
 #include "MainThread.h"
@@ -234 +235 @@
 }
 
-bool ThreadCondition::timedWait(Mutex& mutex, double secondsToWait)
-{
-    if (secondsToWait < 0.0) {
-        wait(mutex);
-        return true;
-    }
-
-    unsigned long millisecondsToWait = static_cast<unsigned long>(secondsToWait * 1000.0);
-    return m_condition->wait(mutex.impl(), millisecondsToWait);
+bool ThreadCondition::timedWait(Mutex& mutex, double absoluteTime)
+{
+    double currentTime = WTF::currentTime();
+
+    // Time is in the past - return immediately.
+    if (absoluteTime < currentTime)
+        return false;
+
+    double intervalMilliseconds = (absoluteTime - currentTime) * 1000.0;
+    // Qt defines wait for up to ULONG_MAX milliseconds.
+    if (interval >= ULONG_MAX)
+        interval = ULONG_MAX;
+
+    return m_condition->wait(mutex.impl(), static_cast<unsigned long>(interval));
 }