Changeset 142672 in webkit

Timestamp:

Feb 12, 2013 2:17:36 PM (11 years ago)

Author:

andersca@apple.com

Message:

Introduce a WorkQueueMessageReceiver class as a replacement for QueueClient
​https://bugs.webkit.org/show_bug.cgi?id=109612

Reviewed by Andreas Kling.

• Platform/CoreIPC/Connection.cpp:

(CoreIPC::Connection::addWorkQueueMessageReceiver):
(CoreIPC):
(CoreIPC::Connection::removeWorkQueueMessageReceiver):
(CoreIPC::Connection::addWorkQueueMessageReceiverOnConnectionWorkQueue):
(CoreIPC::Connection::removeWorkQueueMessageReceiverOnConnectionWorkQueue):

• Platform/CoreIPC/Connection.h:

(Connection):

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-02-12  Anders Carlsson  <andersca@apple.com>
+
+        Introduce a WorkQueueMessageReceiver class as a replacement for QueueClient
+        https://bugs.webkit.org/show_bug.cgi?id=109612
+
+        Reviewed by Andreas Kling.
+
+        * Platform/CoreIPC/Connection.cpp:
+        (CoreIPC::Connection::addWorkQueueMessageReceiver):
+        (CoreIPC):
+        (CoreIPC::Connection::removeWorkQueueMessageReceiver):
+        (CoreIPC::Connection::addWorkQueueMessageReceiverOnConnectionWorkQueue):
+        (CoreIPC::Connection::removeWorkQueueMessageReceiverOnConnectionWorkQueue):
+        * Platform/CoreIPC/Connection.h:
+        (Connection):
+
 2013-02-12  Csaba Osztrogonác  <ossy@webkit.org>
 

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

@@ -270 +270 @@
 }
 
+void Connection::addWorkQueueMessageReceiver(StringReference messageReceiverName, WorkQueue* workQueue, WorkQueueMessageReceiver* workQueueMessageReceiver)
+{
+    ASSERT(RunLoop::current() == m_clientRunLoop);
+    ASSERT(!m_isConnected);
+
+    m_connectionQueue->dispatch(bind(&Connection::addWorkQueueMessageReceiverOnConnectionWorkQueue, this, messageReceiverName, RefPtr<WorkQueue>(workQueue), RefPtr<WorkQueueMessageReceiver>(workQueueMessageReceiver)));
+}
+
+void Connection::removeWorkQueueMessageReceiver(StringReference messageReceiverName)
+{
+    ASSERT(RunLoop::current() == m_clientRunLoop);
+
+    m_connectionQueue->dispatch(bind(&Connection::removeWorkQueueMessageReceiverOnConnectionWorkQueue, this, messageReceiverName));
+}
+
+void Connection::addWorkQueueMessageReceiverOnConnectionWorkQueue(StringReference messageReceiverName, WorkQueue* workQueue, WorkQueueMessageReceiver* workQueueMessageReceiver)
+{
+    ASSERT(!m_workQueueMessageReceivers.contains(messageReceiverName));
+    m_workQueueMessageReceivers.add(messageReceiverName, std::make_pair(workQueue, workQueueMessageReceiver));
+}
+
+void Connection::removeWorkQueueMessageReceiverOnConnectionWorkQueue(StringReference messageReceiverName)
+{
+    ASSERT(m_workQueueMessageReceivers.contains(messageReceiverName));
+    m_workQueueMessageReceivers.remove(messageReceiverName);
+}
+
 void Connection::addQueueClientOnWorkQueue(QueueClient* queueClient)
 {

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

@@ -93 +93 @@
     };
 
+    class WorkQueueMessageReceiver : public MessageReceiver, public ThreadSafeRefCounted<WorkQueueMessageReceiver> {
+    };
+
     class QueueClient {
     public:
@@ -166 +169 @@
     void setDidCloseOnConnectionWorkQueueCallback(DidCloseOnConnectionWorkQueueCallback callback);
 
+    void addWorkQueueMessageReceiver(StringReference messageReceiverName, WorkQueue*, WorkQueueMessageReceiver*);
+    void removeWorkQueueMessageReceiver(StringReference messageReceiverName);
+
     void addQueueClient(QueueClient*);
     void removeQueueClient(QueueClient*);
@@ -206 +212 @@
     void processIncomingMessage(PassOwnPtr<MessageDecoder>);
     void processIncomingSyncReply(PassOwnPtr<MessageDecoder>);
+
+    void addWorkQueueMessageReceiverOnConnectionWorkQueue(StringReference messageReceiverName, WorkQueue*, WorkQueueMessageReceiver*);
+    void removeWorkQueueMessageReceiverOnConnectionWorkQueue(StringReference messageReceiverName);
 
     void addQueueClientOnWorkQueue(QueueClient*);
@@ -240 +249 @@
 
     Vector<QueueClient*> m_connectionQueueClients;
+
+    HashMap<StringReference, std::pair<RefPtr<WorkQueue>, RefPtr<WorkQueueMessageReceiver> > > m_workQueueMessageReceivers;
 
     unsigned m_inDispatchMessageCount;