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

Timestamp:

Feb 23, 2009, 2:37:17 PM (16 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

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

Reviewed by Alexey Proskuryakov.

Bug 24047: Need to simplify nested if's in WorkerRunLoop::runInMode
<​https://bugs.webkit.org/show_bug.cgi?id=24047>

• wtf/MessageQueue.h: (WTF::MessageQueue::infiniteTime): Allows for one to call waitForMessageFilteredWithTimeout and wait forever.

(WTF::MessageQueue::alwaysTruePredicate):
(WTF::MessageQueue::waitForMessage):
Made waitForMessage call waitForMessageFilteredWithTimeout, so that there is less
duplicate code.

(WTF::MessageQueue::waitForMessageFilteredWithTimeout):

• wtf/ThreadingQt.cpp: (WTF::ThreadCondition::timedWait):
• wtf/ThreadingWin.cpp: (WTF::ThreadCondition::timedWait): Made these two implementations consistent with the pthread and gtk implementations. Currently, the time calculations would overflow when passed large values.

WebCore:

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

Reviewed by Alexey Proskuryakov.

Bug 24047: Need to simplify nested if's in WorkerRunLoop::runInMode
<​https://bugs.webkit.org/show_bug.cgi?id=24047>

Made a nested if inside of WorkerRunLoop::runInMode a lot simpler by
using only MessageQueue::waitForMessageFilteredWithTimeout instead
of three different MessageQueue methods.

No observable change in behavior, so no test.

• dom/WorkerRunLoop.cpp: (WebCore::ModePredicate::operator()): Minor clean-up to able to pass a const ref point for ModePredicate into runInMode. (WebCore::WorkerRunLoop::runInMode):
• dom/WorkerRunLoop.h:

File:

• trunk/JavaScriptCore/wtf/ThreadingQt.cpp (modified) (1 diff)

trunk/JavaScriptCore/wtf/ThreadingQt.cpp

@@ -243 +243 @@
         return false;
 
+    // Time is too far in the future (and would overflow unsigned long) - wait forever.
+    if (absoluteTime - currentTime > static_cast<double>(INT_MAX) / 1000.0) {
+        wait(mutex);
+        return true;
+    }
+
     double intervalMilliseconds = (absoluteTime - currentTime) * 1000.0;
-    // Qt defines wait for up to ULONG_MAX milliseconds.
-    if (intervalMilliseconds >= ULONG_MAX)
-        intervalMilliseconds = ULONG_MAX;
-
     return m_condition->wait(mutex.impl(), static_cast<unsigned long>(intervalMilliseconds));
 }