From 991943cabe0c972b8e67f73bf47b0c87c97eb6a2 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <olivier.goffart@nokia.com>
Date: Thu, 6 May 2010 21:04:59 +0200
Subject: QObject: Optimize BlockingQueuedConnection connections

We do not need to copy the argument as we do for QueuedConnection
Same logic as the previous change.

Reviewed-by: Brad
---
 src/corelib/kernel/qobject.cpp | 53 ++++++++++++++++++------------------------
 1 file changed, 23 insertions(+), 30 deletions(-)

diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 0f419bd..8a4304e 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -2562,7 +2562,7 @@ bool QObject::connect(const QObject *sender, const char *signal,
     }
 
     int *types = 0;
-    if ((type == Qt::QueuedConnection || type == Qt::BlockingQueuedConnection)
+    if ((type == Qt::QueuedConnection)
             && !(types = queuedConnectionTypes(smeta->method(signal_absolute_index).parameterTypes())))
         return false;
 
@@ -3117,8 +3117,7 @@ void QMetaObject::connectSlotsByName(QObject *o)
     }
 }
 
-static void queued_activate(QObject *sender, int signal, QObjectPrivate::Connection *c,
-                            void **argv, QSemaphore *semaphore = 0)
+static void queued_activate(QObject *sender, int signal, QObjectPrivate::Connection *c, void **argv)
 {
     if (!c->argumentTypes && c->argumentTypes != &DIRECT_CONNECTION_ONLY) {
         QMetaMethod m = sender->metaObject()->method(signal);
@@ -3148,30 +3147,9 @@ static void queued_activate(QObject *sender, int signal, QObjectPrivate::Connect
                                                                signal,
                                                                nargs,
                                                                types,
-                                                               args,
-                                                               semaphore));
+                                                               args));
 }
 
-static void blocking_activate(QObject *sender, int signal, QObjectPrivate::Connection *c, void **argv)
-{
-    if (QThread::currentThread() == c->receiver->thread()) {
-        qWarning("Qt: Dead lock detected while activating a BlockingQueuedConnection: "
-                 "Sender is %s(%p), receiver is %s(%p)",
-                 sender->metaObject()->className(), sender,
-                 c->receiver->metaObject()->className(), c->receiver);
-    }
-
-#ifdef QT_NO_THREAD
-    queued_activate(sender, signal, c, argv);
-#else
-    QSemaphore semaphore;
-    queued_activate(sender, signal, c, argv, &semaphore);
-    QMutex *mutex = signalSlotLock(sender);
-    mutex->unlock();
-    semaphore.acquire();
-    mutex->lock();
-#endif
-}
 
 /*!\internal
    \obsolete.
@@ -3235,23 +3213,38 @@ void QMetaObject::activate(QObject *sender, const QMetaObject *m, int local_sign
                 continue;
 
             QObject * const receiver = c->receiver;
+            const int method = c->method;
+            const bool receiverInSameThread = currentThreadData == receiver->d_func()->threadData;
 
             // determine if this connection should be sent immediately or
             // put into the event queue
             if ((c->connectionType == Qt::AutoConnection
-                 && (currentThreadData != sender->d_func()->threadData
+                 && (!receiverInSameThread
                      || receiver->d_func()->threadData != sender->d_func()->threadData))
                 || (c->connectionType == Qt::QueuedConnection)) {
                 queued_activate(sender, signal_absolute_index, c, argv ? argv : empty_argv);
                 continue;
+#ifndef QT_NO_THREAD
             } else if (c->connectionType == Qt::BlockingQueuedConnection) {
-                blocking_activate(sender, signal_absolute_index, c, argv ? argv : empty_argv);
+                locker.unlock();
+                if (receiverInSameThread) {
+                    qWarning("Qt: Dead lock detected while activating a BlockingQueuedConnection: "
+                    "Sender is %s(%p), receiver is %s(%p)",
+                    sender->metaObject()->className(), sender,
+                    receiver->metaObject()->className(), receiver);
+                }
+                QSemaphore semaphore;
+                QCoreApplication::postEvent(receiver, new QMetaCallEvent(method,
+                                                                         sender, signal_absolute_index,
+                                                                         0, 0,
+                                                                         argv ? argv : empty_argv,
+                                                                         &semaphore));
+                semaphore.acquire();
+                locker.relock();
                 continue;
+#endif
             }
-
-            const int method = c->method;
             QObjectPrivate::Sender currentSender;
-            const bool receiverInSameThread = currentThreadData == receiver->d_func()->threadData;
             QObjectPrivate::Sender *previousSender = 0;
             if (receiverInSameThread) {
                 currentSender.sender = sender;
-- 
cgit v0.12