Changeset 84281 in webkit

Timestamp:

Apr 19, 2011 12:28:29 PM (13 years ago)

Author:

andersca@apple.com

Message:

2011-04-19 Anders Carlsson <​andersca@apple.com>

Reviewed by Sam Weinig.

Add a way to set the default sync message timeout for a CoreIPC connection
​https://bugs.webkit.org/show_bug.cgi?id=58908

• Platform/CoreIPC/Connection.cpp: (CoreIPC::Connection::Connection): Initialize m_defaultSyncMessageTimeout.

(CoreIPC::Connection::setDefaultSyncMessageTimeout):
Set the m_defaultSyncMessageTimeout member variable.

(CoreIPC::Connection::waitForSyncReply):
Handle the timeout being one of our two special magic values.

• Platform/CoreIPC/Connection.h: Add a DefaultTimeout constant and change the NoTimeout constant to be -1.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/CoreIPC/Connection.cpp (modified) (3 diffs)
• Platform/CoreIPC/Connection.h (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-04-19  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Add a way to set the default sync message timeout for a CoreIPC connection
+        https://bugs.webkit.org/show_bug.cgi?id=58908
+
+        * Platform/CoreIPC/Connection.cpp:
+        (CoreIPC::Connection::Connection):
+        Initialize m_defaultSyncMessageTimeout.
+
+        (CoreIPC::Connection::setDefaultSyncMessageTimeout):
+        Set the m_defaultSyncMessageTimeout member variable.
+
+        (CoreIPC::Connection::waitForSyncReply):
+        Handle the timeout being one of our two special magic values.
+
+        * Platform/CoreIPC/Connection.h:
+        Add a DefaultTimeout constant and change the NoTimeout constant to be -1.
+
 2011-04-19  Vsevolod Vlasov  <vsevik@chromium.org>
 

trunk/Source/WebKit2/Platform/CoreIPC/Connection.cpp

@@ -205 +205 @@
     , m_inDispatchMessageMarkedDispatchWhenWaitingForSyncReplyCount(0)
     , m_didReceiveInvalidMessage(false)
+    , m_defaultSyncMessageTimeout(NoTimeout)
     , m_syncMessageState(SyncMessageState::getOrCreate(clientRunLoop))
     , m_shouldWaitForSyncReplies(true)
@@ -253 +254 @@
 
     m_didReceiveInvalidMessage = true;
+}
+
+void Connection::setDefaultSyncMessageTimeout(double defaultSyncMessageTimeout)
+{
+    ASSERT(defaultSyncMessageTimeout != DefaultTimeout);
+
+    m_defaultSyncMessageTimeout = defaultSyncMessageTimeout;
 }
 
@@ -388 +396 @@
 PassOwnPtr<ArgumentDecoder> Connection::waitForSyncReply(uint64_t syncRequestID, double timeout)
 {
+    if (timeout == DefaultTimeout)
+        timeout = m_defaultSyncMessageTimeout;
+
+    // Use a really long timeout.
+    if (timeout == NoTimeout)
+        timeout = 1e10;
+
     double absoluteTime = currentTime() + timeout;
 

trunk/Source/WebKit2/Platform/CoreIPC/Connection.h

@@ -134 +134 @@
     void markCurrentlyDispatchedMessageAsInvalid();
 
-    static const unsigned long long NoTimeout = 10000000000ULL;
+    void setDefaultSyncMessageTimeout(double);
+
+    static const int DefaultTimeout = 0;
+    static const int NoTimeout = -1;
 
     template<typename T> bool send(const T& message, uint64_t destinationID, unsigned messageSendFlags = 0);
-    template<typename T> bool sendSync(const T& message, const typename T::Reply& reply, uint64_t destinationID, double timeout = NoTimeout);
+    template<typename T> bool sendSync(const T& message, const typename T::Reply& reply, uint64_t destinationID, double timeout = DefaultTimeout);
     template<typename T> bool waitForAndDispatchImmediately(uint64_t destinationID, double timeout);
 
@@ -232 +235 @@
     unsigned m_inDispatchMessageMarkedDispatchWhenWaitingForSyncReplyCount;
     bool m_didReceiveInvalidMessage;
+
+    double m_defaultSyncMessageTimeout;
 
     // Incoming messages.