Changeset 39908 in webkit for trunk/JavaScriptCore/wtf/ThreadingPthreads.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/ThreadingPthreads.cpp (modified) (2 diffs)

trunk/JavaScriptCore/wtf/ThreadingPthreads.cpp

@@ -34 +34 @@
 #if USE(PTHREADS)
 
+#include "CurrentTime.h"
 #include "HashMap.h"
 #include "MainThread.h"
@@ -233 +234 @@
 }
 
-bool ThreadCondition::timedWait(Mutex& mutex, double secondsToWait)
-{
-    if (secondsToWait < 0.0) {
+bool ThreadCondition::timedWait(Mutex& mutex, double absoluteTime)
+{
+    if (absoluteTime < currentTime())
+        return false;
+
+    if (absoluteTime > INT_MAX) {
         wait(mutex);
         return true;
     }
 
-    int intervalSeconds = static_cast<int>(secondsToWait);
-    int intervalMicroseconds = static_cast<int>((secondsToWait - intervalSeconds) * 1000000.0);
-
-    // Current time comes in sec/microsec
-    timeval currentTime;
-    gettimeofday(&currentTime, NULL);
-
-    // Target time comes in sec/nanosec
+    int timeSeconds = static_cast<int>(absoluteTime);
+    int timeNanoseconds = static_cast<int>((absoluteTime - timeSeconds) * 1E9);
+
     timespec targetTime;
-    targetTime.tv_sec = currentTime.tv_sec + intervalSeconds;
-    targetTime.tv_nsec = (currentTime.tv_usec + intervalMicroseconds) * 1000;
-    if (targetTime.tv_nsec > 1000000000) {
-        targetTime.tv_nsec -= 1000000000;
-        targetTime.tv_sec++;
-    }
+    targetTime.tv_sec = timeSeconds;
+    targetTime.tv_nsec = timeNanoseconds;
 
     return pthread_cond_timedwait(&m_condition, &mutex.impl(), &targetTime) == 0;