Changeset 136762 in webkit

Timestamp:

Dec 5, 2012, 2:16:44 PM (13 years ago)

Author:

andersca@apple.com

Message:

Connection::waitForMessage shouldn't use the message ID
​https://bugs.webkit.org/show_bug.cgi?id=104157

Reviewed by Andreas Kling.

Pass the message receiver name and message name to waitForMessage and use them for lookups instead of
the message ID.

• Platform/CoreIPC/Connection.cpp:

(CoreIPC::Connection::createSyncMessageEncoder):
(CoreIPC::Connection::waitForMessage):
(CoreIPC::Connection::processIncomingMessage):

• Platform/CoreIPC/Connection.h:

(CoreIPC::Connection::waitForAndDispatchImmediately):

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-12-05  Anders Carlsson  <andersca@apple.com>
+
+        Connection::waitForMessage shouldn't use the message ID
+        https://bugs.webkit.org/show_bug.cgi?id=104157
+
+        Reviewed by Andreas Kling.
+
+        Pass the message receiver name and message name to waitForMessage and use them for lookups instead of
+        the message ID.
+
+        * Platform/CoreIPC/Connection.cpp:
+        (CoreIPC::Connection::createSyncMessageEncoder):
+        (CoreIPC::Connection::waitForMessage):
+        (CoreIPC::Connection::processIncomingMessage):
+        * Platform/CoreIPC/Connection.h:
+        (CoreIPC::Connection::waitForAndDispatchImmediately):
+
 2012-12-05  Jae Hyun Park  <jae.park@company100.net>
 

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

@@ -284 +284 @@
 }
 
-PassOwnPtr<MessageEncoder> Connection::createSyncMessageEncoder(const StringReference messageReceiverName, const StringReference messageName, uint64_t destinationID, uint64_t& syncRequestID)
+PassOwnPtr<MessageEncoder> Connection::createSyncMessageEncoder(StringReference messageReceiverName, StringReference messageName, uint64_t destinationID, uint64_t& syncRequestID)
 {
     OwnPtr<MessageEncoder> encoder = MessageEncoder::create(messageReceiverName, messageName, destinationID);
@@ -320 +320 @@
 }
 
-PassOwnPtr<MessageDecoder> Connection::waitForMessage(MessageID messageID, uint64_t destinationID, double timeout)
+PassOwnPtr<MessageDecoder> Connection::waitForMessage(StringReference messageReceiverName, StringReference messageName, uint64_t destinationID, double timeout)
 {
     // First, check if this message is already in the incoming messages queue.
@@ -329 +329 @@
             IncomingMessage& message = *it;
 
-            if (message.messageID() == messageID && message.arguments()->destinationID() == destinationID) {
+            if (message.arguments()->messageReceiverName() == messageReceiverName && message.arguments()->messageName() == messageName && message.arguments()->destinationID() == destinationID) {
                 OwnPtr<MessageDecoder> decoder = message.releaseArguments();
 
@@ -337 +337 @@
         }
     }
-    
+
     double absoluteTime = currentTime() + timeout;
     
-    std::pair<unsigned, uint64_t> messageAndDestination(std::make_pair(messageID.toInt(), destinationID));
+    std::pair<std::pair<StringReference, StringReference>, uint64_t> messageAndDestination(std::make_pair(std::make_pair(messageReceiverName, messageName), destinationID));
     
     {
@@ -349 +349 @@
     
         // Insert our pending wait.
-        m_waitForMessageMap.set(messageAndDestination, 0);
+        m_waitForMessageMap.set(messageAndDestination, nullptr);
     }
     
@@ -356 +356 @@
         MutexLocker locker(m_waitForMessageMutex);
 
-        HashMap<std::pair<unsigned, uint64_t>, MessageDecoder*>::iterator it = m_waitForMessageMap.find(messageAndDestination);
+        HashMap<std::pair<std::pair<StringReference, StringReference>, uint64_t>, OwnPtr<MessageDecoder> >::iterator it = m_waitForMessageMap.find(messageAndDestination);
         if (it->value) {
-            // FIXME: m_waitForMessageMap should really hold OwnPtrs to
-            // ArgumentDecoders, but HashMap doesn't currently support OwnPtrs.
-            OwnPtr<MessageDecoder> decoder = adoptPtr(it->value);
+            OwnPtr<MessageDecoder> decoder = it->value.release();
             m_waitForMessageMap.remove(it);
-            
+
             return decoder.release();
         }
@@ -374 +372 @@
         }
     }
-    
+
     return nullptr;
 }
@@ -524 +522 @@
     {
         MutexLocker locker(m_waitForMessageMutex);
-        
-        HashMap<std::pair<unsigned, uint64_t>, MessageDecoder*>::iterator it = m_waitForMessageMap.find(std::make_pair(messageID.toInt(), incomingMessage.destinationID()));
+
+        HashMap<std::pair<std::pair<StringReference, StringReference>, uint64_t>, OwnPtr<MessageDecoder> >::iterator it = m_waitForMessageMap.find(std::make_pair(std::make_pair(incomingMessage.arguments()->messageReceiverName(), incomingMessage.arguments()->messageName()), incomingMessage.destinationID()));
         if (it != m_waitForMessageMap.end()) {
-            it->value = incomingMessage.releaseArguments().leakPtr();
+            it->value = incomingMessage.releaseArguments();
             ASSERT(it->value);
         

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

@@ -243 +243 @@
     bool isValid() const { return m_client; }
     
-    PassOwnPtr<MessageDecoder> waitForMessage(MessageID, uint64_t destinationID, double timeout);
+    PassOwnPtr<MessageDecoder> waitForMessage(StringReference messageReceiverName, StringReference messageName, uint64_t destinationID, double timeout);
     
     PassOwnPtr<MessageDecoder> waitForSyncReply(uint64_t syncRequestID, double timeout, unsigned syncSendFlags);
@@ -301 +301 @@
     ThreadCondition m_waitForMessageCondition;
     Mutex m_waitForMessageMutex;
-    HashMap<std::pair<unsigned, uint64_t>, MessageDecoder*> m_waitForMessageMap;
+    HashMap<std::pair<std::pair<StringReference, StringReference>, uint64_t>, OwnPtr<MessageDecoder> > m_waitForMessageMap;
 
     // Represents a sync request for which we're waiting on a reply.
@@ -427 +427 @@
 template<typename T> bool Connection::waitForAndDispatchImmediately(uint64_t destinationID, double timeout)
 {
-    OwnPtr<MessageDecoder> decoder = waitForMessage(MessageID(T::messageID), destinationID, timeout);
+    OwnPtr<MessageDecoder> decoder = waitForMessage(T::receiverName(), T::name(), destinationID, timeout);
     if (!decoder)
         return false;