Changeset 180054 in webkit

Timestamp:

Feb 13, 2015, 9:50:15 AM (10 years ago)

Author:

Antti Koivisto

Message:

WorkQueue should support concurrent queues
​https://bugs.webkit.org/show_bug.cgi?id=141559

Reviewed by Anders Carlsson.

• DatabaseProcess/DatabaseProcess.cpp:

(WebKit::DatabaseProcess::DatabaseProcess):

• Platform/IPC/Connection.h:
• Platform/IPC/mac/ConnectionMac.mm:

(IPC::Connection::open):

• Platform/WorkQueue.cpp:

(WorkQueue::create):

Also make create return a Ref.

(WorkQueue::WorkQueue):

• Platform/WorkQueue.h:

Add queue type enum.

• Platform/efl/WorkQueueEfl.cpp:

(WorkQueue::platformInitialize):

• Platform/gtk/WorkQueueGtk.cpp:

(WorkQueue::platformInitialize):

• Platform/mac/WorkQueueMac.cpp:

(WorkQueue::platformInitialize):

• Shared/mac/SecItemShim.cpp:

(WebKit::SecItemShim::initializeConnection):

• Shared/mac/SecItemShim.h:
• UIProcess/Launcher/ProcessLauncher.cpp:

(WebKit::processLauncherWorkQueue):

• UIProcess/mac/SecItemShimProxy.cpp:

(WebKit::SecItemShimProxy::initializeConnection):

• UIProcess/mac/SecItemShimProxy.h:
• WebProcess/Plugins/PluginProcessConnectionManager.cpp:

(WebKit::PluginProcessConnectionManager::initializeConnection):

• WebProcess/Plugins/PluginProcessConnectionManager.h:
• WebProcess/WebPage/EventDispatcher.cpp:

(WebKit::EventDispatcher::EventDispatcher):
(WebKit::EventDispatcher::initializeConnection):

• WebProcess/WebPage/EventDispatcher.h:
• WebProcess/WebPage/ViewUpdateDispatcher.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• DatabaseProcess/DatabaseProcess.cpp (modified) (1 diff)
• Platform/IPC/Connection.h (modified) (1 diff)
• Platform/IPC/mac/ConnectionMac.mm (modified) (2 diffs)
• Platform/WorkQueue.cpp (modified) (1 diff)
• Platform/WorkQueue.h (modified) (3 diffs)
• Platform/efl/WorkQueueEfl.cpp (modified) (1 diff)
• Platform/gtk/WorkQueueGtk.cpp (modified) (1 diff)
• Platform/mac/WorkQueueMac.cpp (modified) (1 diff)
• Shared/mac/SecItemShim.cpp (modified) (1 diff)
• Shared/mac/SecItemShim.h (modified) (1 diff)
• UIProcess/Launcher/ProcessLauncher.cpp (modified) (2 diffs)
• UIProcess/mac/SecItemShimProxy.cpp (modified) (1 diff)
• UIProcess/mac/SecItemShimProxy.h (modified) (1 diff)
• WebProcess/Plugins/PluginProcessConnectionManager.cpp (modified) (1 diff)
• WebProcess/Plugins/PluginProcessConnectionManager.h (modified) (1 diff)
• WebProcess/WebPage/EventDispatcher.cpp (modified) (2 diffs)
• WebProcess/WebPage/EventDispatcher.h (modified) (1 diff)
• WebProcess/WebPage/ViewUpdateDispatcher.cpp (modified) (1 diff)
• WebProcess/WebPage/ViewUpdateDispatcher.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog ¶

@@ +1 @@
+2015-02-13  Antti Koivisto  <antti@apple.com>
+
+        WorkQueue should support concurrent queues
+        https://bugs.webkit.org/show_bug.cgi?id=141559
+
+        Reviewed by Anders Carlsson.
+
+        * DatabaseProcess/DatabaseProcess.cpp:
+        (WebKit::DatabaseProcess::DatabaseProcess):
+        * Platform/IPC/Connection.h:
+        * Platform/IPC/mac/ConnectionMac.mm:
+        (IPC::Connection::open):
+        * Platform/WorkQueue.cpp:
+        (WorkQueue::create):
+
+            Also make create return a Ref.
+
+        (WorkQueue::WorkQueue):
+        * Platform/WorkQueue.h:
+
+            Add queue type enum.
+
+        * Platform/efl/WorkQueueEfl.cpp:
+        (WorkQueue::platformInitialize):
+        * Platform/gtk/WorkQueueGtk.cpp:
+        (WorkQueue::platformInitialize):
+        * Platform/mac/WorkQueueMac.cpp:
+        (WorkQueue::platformInitialize):
+        * Shared/mac/SecItemShim.cpp:
+        (WebKit::SecItemShim::initializeConnection):
+        * Shared/mac/SecItemShim.h:
+        * UIProcess/Launcher/ProcessLauncher.cpp:
+        (WebKit::processLauncherWorkQueue):
+        * UIProcess/mac/SecItemShimProxy.cpp:
+        (WebKit::SecItemShimProxy::initializeConnection):
+        * UIProcess/mac/SecItemShimProxy.h:
+        * WebProcess/Plugins/PluginProcessConnectionManager.cpp:
+        (WebKit::PluginProcessConnectionManager::initializeConnection):
+        * WebProcess/Plugins/PluginProcessConnectionManager.h:
+        * WebProcess/WebPage/EventDispatcher.cpp:
+        (WebKit::EventDispatcher::EventDispatcher):
+        (WebKit::EventDispatcher::initializeConnection):
+        * WebProcess/WebPage/EventDispatcher.h:
+        * WebProcess/WebPage/ViewUpdateDispatcher.h:
+
 2015-02-12  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp ¶

@@ -55 +55 @@
 
 DatabaseProcess::DatabaseProcess()
-    : m_queue(adoptRef(*WorkQueue::create("com.apple.WebKit.DatabaseProcess").leakRef()))
+    : m_queue(WorkQueue::create("com.apple.WebKit.DatabaseProcess"))
     , m_webOriginDataManager(std::make_unique<WebOriginDataManager>(*this, *this))
 {

trunk/Source/WebKit2/Platform/IPC/Connection.h ¶

@@ -244 +244 @@
 
     bool m_isConnected;
-    RefPtr<WorkQueue> m_connectionQueue;
+    Ref<WorkQueue> m_connectionQueue;
     WTF::RunLoop& m_clientRunLoop;
 

trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm ¶

@@ -207 +207 @@
     // Register the data available handler.
     RefPtr<Connection> connection(this);
-    m_receivePortDataAvailableSource = createDataAvailableSource(m_receivePort, *m_connectionQueue, [connection] {
+    m_receivePortDataAvailableSource = createDataAvailableSource(m_receivePort, m_connectionQueue, [connection] {
         connection->receiveSourceEventHandler();
     });
@@ -214 +214 @@
     // If we have an exception port, register the data available handler and send over the port to the other end.
     if (m_exceptionPort) {
-        m_exceptionPortDataAvailableSource = createDataAvailableSource(m_exceptionPort, *m_connectionQueue, [connection] {
+        m_exceptionPortDataAvailableSource = createDataAvailableSource(m_exceptionPort, m_connectionQueue, [connection] {
             connection->exceptionSourceEventHandler();
         });

trunk/Source/WebKit2/Platform/WorkQueue.cpp ¶

@@ -27 +27 @@
 #include "WorkQueue.h"
 
-PassRefPtr<WorkQueue> WorkQueue::create(const char* name, QOS qos)
+Ref<WorkQueue> WorkQueue::create(const char* name, Type type, QOS qos)
 {
-    return adoptRef(new WorkQueue(name, qos));
+    return adoptRef(*new WorkQueue(name, type, qos));
 }
 
-WorkQueue::WorkQueue(const char* name, QOS qos)
+WorkQueue::WorkQueue(const char* name, Type type, QOS qos)
 {
-    platformInitialize(name, qos);
+    platformInitialize(name, type, qos);
 }
 

trunk/Source/WebKit2/Platform/WorkQueue.h ¶

@@ -55 +55 @@
 class WorkQueue final : public FunctionDispatcher {
 public:
+    enum class Type {
+        Serial,
+        Concurrent
+    };
     enum class QOS {
         UserInteractive,
@@ -63 +67 @@
     };
     
-    static PassRefPtr<WorkQueue> create(const char* name, QOS = QOS::Default);
+    static Ref<WorkQueue> create(const char* name, Type = Type::Serial, QOS = QOS::Default);
     virtual ~WorkQueue();
 
@@ -80 +84 @@
 
 private:
-    explicit WorkQueue(const char* name, QOS);
+    explicit WorkQueue(const char* name, Type, QOS);
 
-    void platformInitialize(const char* name, QOS);
+    void platformInitialize(const char* name, Type, QOS);
     void platformInvalidate();
 

trunk/Source/WebKit2/Platform/efl/WorkQueueEfl.cpp ¶

@@ -24 +24 @@
 #include <DispatchQueueWorkItemEfl.h>
 
-void WorkQueue::platformInitialize(const char* name, QOS)
+void WorkQueue::platformInitialize(const char* name, Type, QOS)
 {
     m_dispatchQueue = DispatchQueue::create(name);

trunk/Source/WebKit2/Platform/gtk/WorkQueueGtk.cpp ¶

@@ -33 +33 @@
 static const size_t kVisualStudioThreadNameLimit = 31;
 
-void WorkQueue::platformInitialize(const char* name, QOS)
+void WorkQueue::platformInitialize(const char* name, Type, QOS)
 {
     m_eventContext = adoptGRef(g_main_context_new());

trunk/Source/WebKit2/Platform/mac/WorkQueueMac.cpp ¶

@@ -63 +63 @@
 #endif
 
-void WorkQueue::platformInitialize(const char* name, QOS qos)
+void WorkQueue::platformInitialize(const char* name, Type type, QOS qos)
 {
-    dispatch_queue_attr_t attr = 0;
+    dispatch_queue_attr_t attr = type == Type::Concurrent ? DISPATCH_QUEUE_CONCURRENT : DISPATCH_QUEUE_SERIAL;
 #if HAVE(QOS_CLASSES)
-    attr = dispatch_queue_attr_make_with_qos_class(DISPATCH_QUEUE_SERIAL, dispatchQOSClass(qos), 0);
+    attr = dispatch_queue_attr_make_with_qos_class(attr, dispatchQOSClass(qos), 0);
 #endif
     m_dispatchQueue = dispatch_queue_create(name, attr);

trunk/Source/WebKit2/Shared/mac/SecItemShim.cpp ¶

@@ -179 +179 @@
 void SecItemShim::initializeConnection(IPC::Connection* connection)
 {
-    connection->addWorkQueueMessageReceiver(Messages::SecItemShim::messageReceiverName(), m_queue.get(), this);
+    connection->addWorkQueueMessageReceiver(Messages::SecItemShim::messageReceiverName(), &m_queue.get(), this);
 }
 

trunk/Source/WebKit2/Shared/mac/SecItemShim.h ¶

@@ -52 +52 @@
     void secItemResponse(uint64_t requestID, const SecItemResponseData&);
 
-    RefPtr<WorkQueue> m_queue;
+    Ref<WorkQueue> m_queue;
 };
 

trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp ¶

@@ -28 +28 @@
 
 #include "WorkQueue.h"
-#include <wtf/StdLibExtras.h>
+#include <wtf/StdLibExtras.h> 
 
 namespace WebKit {
@@ -34 +34 @@
 static WorkQueue& processLauncherWorkQueue()
 {
-    static WorkQueue& processLauncherWorkQueue = *WorkQueue::create("com.apple.WebKit.ProcessLauncher").leakRef();
+
+    static WorkQueue& processLauncherWorkQueue = WorkQueue::create("com.apple.WebKit.ProcessLauncher").leakRef();
     return processLauncherWorkQueue;
 }

trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.cpp ¶

@@ -55 +55 @@
 void SecItemShimProxy::initializeConnection(IPC::Connection& connection)
 {
-    connection.addWorkQueueMessageReceiver(Messages::SecItemShimProxy::messageReceiverName(), m_queue.get(), this);
+    connection.addWorkQueueMessageReceiver(Messages::SecItemShimProxy::messageReceiverName(), &m_queue.get(), this);
 }
 

trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.h ¶

@@ -50 +50 @@
     void secItemRequest(IPC::Connection&, uint64_t requestID, const SecItemRequestData&);
 
-    RefPtr<WorkQueue> m_queue;
+    Ref<WorkQueue> m_queue;
 };
 

trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp ¶

@@ -59 +59 @@
 void PluginProcessConnectionManager::initializeConnection(IPC::Connection* connection)
 {
-    connection->addWorkQueueMessageReceiver(Messages::PluginProcessConnectionManager::messageReceiverName(), m_queue.get(), this);
+    connection->addWorkQueueMessageReceiver(Messages::PluginProcessConnectionManager::messageReceiverName(), &m_queue.get(), this);
 }
 

trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.h ¶

@@ -61 +61 @@
     void pluginProcessCrashed(uint64_t pluginProcessToken);
 
-    RefPtr<WorkQueue> m_queue;
+    Ref<WorkQueue> m_queue;
 
     Vector<RefPtr<PluginProcessConnection>> m_pluginProcessConnections;

trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp ¶

@@ -53 +53 @@
 
 EventDispatcher::EventDispatcher()
-    : m_queue(WorkQueue::create("com.apple.WebKit.EventDispatcher", WorkQueue::QOS::UserInteractive))
+    : m_queue(WorkQueue::create("com.apple.WebKit.EventDispatcher", WorkQueue::Type::Serial, WorkQueue::QOS::UserInteractive))
     , m_recentWheelEventDeltaTracker(std::make_unique<WheelEventDeltaTracker>())
 #if ENABLE(IOS_TOUCH_EVENTS)
@@ -88 +88 @@
 void EventDispatcher::initializeConnection(IPC::Connection* connection)
 {
-    connection->addWorkQueueMessageReceiver(Messages::EventDispatcher::messageReceiverName(), m_queue.get(), this);
+    connection->addWorkQueueMessageReceiver(Messages::EventDispatcher::messageReceiverName(), &m_queue.get(), this);
 }
 

trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.h ¶

@@ -90 +90 @@
 #endif
 
-    RefPtr<WorkQueue> m_queue;
+    Ref<WorkQueue> m_queue;
 
 #if ENABLE(ASYNC_SCROLLING)

trunk/Source/WebKit2/WebProcess/WebPage/ViewUpdateDispatcher.cpp ¶

@@ -53 +53 @@
 void ViewUpdateDispatcher::initializeConnection(IPC::Connection* connection)
 {
-    connection->addWorkQueueMessageReceiver(Messages::ViewUpdateDispatcher::messageReceiverName(), m_queue.get(), this);
+    connection->addWorkQueueMessageReceiver(Messages::ViewUpdateDispatcher::messageReceiverName(), &m_queue.get(), this);
 }
 

trunk/Source/WebKit2/WebProcess/WebPage/ViewUpdateDispatcher.h ¶

@@ -57 +57 @@
     };
 
-    RefPtr<WorkQueue> m_queue;
+    Ref<WorkQueue> m_queue;
     SpinLock m_dataMutex;
     HashMap<uint64_t, UpdateData> m_latestUpdate;