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

trunk/JavaScriptCore/wtf/ThreadingGtk.cpp

@@ -33 +33 @@
 #if !USE(PTHREADS)
 
+#include "CurrentTime.h"
 #include "HashMap.h"
 #include "MainThread.h"
@@ -38 +39 @@
 
 #include <glib.h>
+#include <limits.h>
 
 namespace WTF {
@@ -206 +208 @@
 }
 
-bool ThreadCondition::timedWait(Mutex& mutex, double interval)
-{
-    if (interval < 0.0) {
+bool ThreadCondition::timedWait(Mutex& mutex, double absoluteTime)
+{
+    // Time is in the past - return right away.
+    if (absoluteTime < currentTime())
+        return false;
+    
+    // Time is too far in the future for g_cond_timed_wait - wait forever.
+    if (absoluteTime > INT_MAX) {
         wait(mutex);
         return true;
     }
-    
-    int intervalSeconds = static_cast<int>(interval);
-    int intervalMicroseconds = static_cast<int>((interval - intervalSeconds) * 1000000.0);
+
+    int timeSeconds = static_cast<int>(absoluteTime);
+    int timeMicroseconds = static_cast<int>((absoluteTime - timeSeconds) * 1000000.0);
     
     GTimeVal targetTime;
-    g_get_current_time(&targetTime);
-        
-    targetTime.tv_sec += intervalSeconds;
-    targetTime.tv_usec += intervalMicroseconds;
-    if (targetTime.tv_usec > 1000000) {
-        targetTime.tv_usec -= 1000000;
-        targetTime.tv_sec++;
-    }
+    targetTime.tv_sec = timeSeconds;
+    targetTime.tv_usec = timeMicroseconds;
 
     return g_cond_timed_wait(m_condition.get(), mutex.impl().get(), &targetTime);