Changeset 62837 in webkit

Timestamp:

Jul 8, 2010 2:17:12 PM (14 years ago)

Author:

luiz@webkit.org

Message:

2010-07-08 Luiz Agostini <​luiz.agostini@openbossa.org>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Move socket objects to connection's thread
​https://bugs.webkit.org/show_bug.cgi?id=41897

To receive network related notifications in the WorkQueue thread, the
QLocalSocket instances must be moved to that thread.

• Platform/CoreIPC/qt/ConnectionQt.cpp: (CoreIPC::Connection::open):
• Platform/WorkQueue.h:
• Platform/qt/WorkQueueQt.cpp: (WorkQueue::moveSocketToWorkThread):

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/CoreIPC/qt/ConnectionQt.cpp (modified) (1 diff)
• Platform/WorkQueue.h (modified) (2 diffs)
• Platform/qt/WorkQueueQt.cpp (modified) (2 diffs)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-07-08  Luiz Agostini  <luiz.agostini@openbossa.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Move socket objects to connection's thread
+        https://bugs.webkit.org/show_bug.cgi?id=41897
+
+        To receive network related notifications in the WorkQueue thread, the
+        QLocalSocket instances must be moved to that thread.
+
+        * Platform/CoreIPC/qt/ConnectionQt.cpp:
+        (CoreIPC::Connection::open):
+        * Platform/WorkQueue.h:
+        * Platform/qt/WorkQueueQt.cpp:
+        (WorkQueue::moveSocketToWorkThread):
+
 2010-07-08  Alice Liu  <alice.liu@apple.com>
 

trunk/WebKit2/Platform/CoreIPC/qt/ConnectionQt.cpp

@@ -92 +92 @@
         m_socket = WebKit::ProcessLauncher::takePendingConnection();
         m_isConnected = m_socket;
-        if (m_isConnected)
+        if (m_isConnected) {
+            m_connectionQueue.moveSocketToWorkThread(m_socket);
             m_connectionQueue.connectSignal(m_socket, SIGNAL(readyRead()), WorkItem::create(this, &Connection::readyReadHandler));
+        }
     } else {
         m_socket = new QLocalSocket();
         m_socket->connectToServer(m_serverName);
+        m_connectionQueue.moveSocketToWorkThread(m_socket);
         m_connectionQueue.connectSignal(m_socket, SIGNAL(readyRead()), WorkItem::create(this, &Connection::readyReadHandler));
         m_isConnected = m_socket->waitForConnected();

trunk/WebKit2/Platform/WorkQueue.h

@@ -39 +39 @@
 
 #if PLATFORM(QT)
+class QLocalSocket;
 class QObject;
 class QThread;
@@ -69 +70 @@
 #elif PLATFORM(QT)
     void connectSignal(QObject*, const char* signal, std::auto_ptr<WorkItem>);
-    void disconnectSignal(QObject*, const char* signa);
+    void disconnectSignal(QObject*, const char* signal);
+
+    void moveSocketToWorkThread(QLocalSocket*);
 #endif
 

trunk/WebKit2/Platform/qt/WorkQueueQt.cpp

@@ -27 +27 @@
 #include "WorkQueue.h"
 
+#include <QLocalSocket>
 #include <QObject>
 #include <QThread>
@@ -93 +94 @@
 }
 
+void WorkQueue::moveSocketToWorkThread(QLocalSocket* socket)
+{
+    ASSERT(m_workThread);
+    ASSERT(socket);
+
+    socket->setParent(0);
+    socket->moveToThread(m_workThread);
+}
+
 void WorkQueue::platformInitialize(const char*)
 {