X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.cpp;h=7aab0252543258799c9b5a1549d9836e03fcfa29;hp=c30fe4f16028eb1b80cb4d3ac999b24f12976e32;hb=dcc90a564e00e206f05db224f1654c8907f149f4;hpb=4bd0fcd5b0599f3658253353bf2bdc01b32951f7

diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp
index c30fe4f1..7aab0252 100644
--- a/src/common/signalproxy.cpp
+++ b/src/common/signalproxy.cpp
@@ -29,6 +29,7 @@
 #include <QDebug>
 #include <QMetaMethod>
 #include <QMetaProperty>
+#include <QMutexLocker>
 #include <QRegExp>
 #include "util.h"
 
@@ -62,7 +63,7 @@ SignalRelay::SignalRelay(SignalProxy* parent, QObject* source)
     caller(source),
     _sync(false)
 {
-  QObject::connect(source, SIGNAL(destroyed()), parent, SLOT(detachSender()));
+  QObject::connect(source, SIGNAL(destroyed()), parent, SLOT(detachSender()), Qt::DirectConnection);
 }
 
 int SignalRelay::qt_metacall(QMetaObject::Call _c, int _id, void **_a) {
@@ -246,7 +247,8 @@ void SignalProxy::objectRenamed(QString oldname, QString newname) {
 }
 
 void SignalProxy::objectRenamed(QByteArray classname, QString oldname, QString newname) {
-  if(_syncSlave.contains(classname) && _syncSlave[classname].contains(oldname))
+  QMutexLocker locker(&slaveMutex);
+  if(_syncSlave.contains(classname) && _syncSlave[classname].contains(oldname) && oldname != newname)
     _syncSlave[classname][newname] = _syncSlave[classname].take(oldname);
 }
 
@@ -409,7 +411,7 @@ bool SignalProxy::attachSlot(const QByteArray& sigName, QObject* recv, const cha
   _attachedSlots.insert(funcName, qMakePair(recv, methodId));
 
   QObject::disconnect(recv, SIGNAL(destroyed()), this, SLOT(detachSender()));
-  QObject::connect(recv, SIGNAL(destroyed()), this, SLOT(detachSender()));
+  QObject::connect(recv, SIGNAL(destroyed()), this, SLOT(detachSender()), Qt::DirectConnection);
   return true;
 }
 
@@ -432,7 +434,7 @@ void SignalProxy::synchronizeAsMaster(QObject *sender) {
   relay->setSynchronize(true);
 
   if(sender->metaObject()->indexOfSignal(QMetaObject::normalizedSignature("renameObject(QString, QString)")) != -1)
-    connect(sender, SIGNAL(renameObject(QString, QString)), this, SLOT(objectRenamed(QString, QString)));
+    connect(sender, SIGNAL(renameObject(QString, QString)), this, SLOT(objectRenamed(QString, QString)), Qt::DirectConnection);
 
   QByteArray className(sender->metaObject()->className());
   _syncSlave[className][sender->objectName()] = sender;
@@ -471,30 +473,37 @@ void SignalProxy::requestInit(QObject *obj) {
 }
 
 void SignalProxy::detachSender() {
-  // this is a slot so we can bypass the QueuedConnection
-  // and if someone is forcing direct connection in a multithreaded environment he's just nuts...
-  _detachSignals(sender());
-  _detachSlots(sender());
+  // this is a private slot. the reason for that is, that we enfoce Qt::DirectConnection.
+  // the result is, that we can be sure, that a registered receiver is removed immediately when it's destroyed.
+  // since we're guarding the the internal datastructures with mutexes this means,
+  // that the object destruction is deffered until we're finished delivering our sync/init/whatever request.
+  // all in all: thread safety! *sigh*
+  detachObject(sender());
 }
 
 // detachObject/Signals/Slots() can be called as a result of an incoming call
 // this might destroy our the iterator used for delivery
 // thus we wrap the actual disconnection by using QueuedConnections
 void SignalProxy::detachObject(QObject* obj) {
-  detachSignals(obj);
-  detachSlots(obj);
+  QMutexLocker locker(&slaveMutex);
+  _detachSignals(obj);
+  _detachSlots(obj);
+  _stopSync(obj);
 }
 
 void SignalProxy::detachSignals(QObject* sender) {
-  QMetaObject::invokeMethod(this, "_detachSignals",
-			    Qt::QueuedConnection,
-			    Q_ARG(QObject*, sender));
+  QMutexLocker locker(&slaveMutex);
+  _detachSignals(sender);
 }
 
 void SignalProxy::detachSlots(QObject* receiver) {
-  QMetaObject::invokeMethod(this, "_detachSlots",
-			    Qt::QueuedConnection,
-			    Q_ARG(QObject*, receiver));
+  QMutexLocker locker(&slaveMutex);
+  _detachSlots(receiver);
+}
+
+void SignalProxy::stopSync(QObject* obj) {
+  QMutexLocker locker(&slaveMutex);
+  _stopSync(obj);
 }
 
 void SignalProxy::_detachSignals(QObject* sender) {
@@ -513,6 +522,22 @@ void SignalProxy::_detachSlots(QObject* receiver) {
   }
 }
 
+void SignalProxy::_stopSync(QObject* obj) {
+  if(_relayHash.contains(obj))
+    _relayHash[obj]->setSynchronize(false);
+
+  // we can't use a className here, since it might be effed up, if we receive the call as a result of a decon
+  // gladly the objectName() is still valid. So we have only to iterate over the classes not each instance! *sigh*
+  QHash<QByteArray, ObjectId>::iterator classIter = _syncSlave.begin();
+  while(classIter != _syncSlave.end()) {
+    if(classIter->contains(obj->objectName())) {
+      classIter->remove(obj->objectName());
+      break;
+    }
+    classIter++;
+  }
+}
+
 void SignalProxy::dispatchSignal(QIODevice *receiver, const QVariant &identifier, const QVariantList &params) {
   QVariantList packedFunc;
   packedFunc << identifier;
@@ -536,6 +561,11 @@ void SignalProxy::receivePeerSignal(QIODevice *sender, const QVariant &packedFun
   if(call.type() != QVariant::Int)
     return handleSignal(call.toByteArray(), params);
 
+  // well yes we are locking code here and not only data.
+  // otherwise each handler would have to lock the data anyway. this leaves us on the safe side
+  // unable to forget a lock
+  QMutexLocker locker(&slaveMutex);
+
   switch(call.toInt()) {
   case Sync:
     return handleSync(params);
@@ -555,7 +585,7 @@ void SignalProxy::handleSync(QVariantList params) {
     return;
   }
   
-  QByteArray className =params.takeFirst().toByteArray();
+  QByteArray className = params.takeFirst().toByteArray();
   QString objectName = params.takeFirst().toString();
   int signalId = params.takeFirst().toInt();
 
@@ -576,7 +606,8 @@ void SignalProxy::handleSync(QVariantList params) {
     qWarning() << "received Sync Call for Object" << receiver
 	       << "- no matching Slot for Signal:" << signalName;
     return;
-   }
+  }
+
   int slotId = syncMap(receiver)[signalId];
   if(!invokeSlot(receiver, slotId, params))
     qWarning("SignalProxy::handleSync(): invokeMethod for \"%s\" failed ", methodName(receiver, slotId).constData());