X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.cpp;h=91ffae9f4b0706cbfbfc7c65cc2c7dcc4fd14bbb;hp=e49647988e1d685696b9c9b9a9554d81517ceeff;hb=bfe9db08aabd456aa66ae9a505fa0a52fdade3fd;hpb=b797e5f581b10a517c30f78cb53f813af741e261 diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp index e4964798..91ffae9f 100644 --- a/src/common/signalproxy.cpp +++ b/src/common/signalproxy.cpp @@ -30,8 +30,8 @@ #include #include #include -#include #include +#include #include "syncableobject.h" #include "util.h" @@ -68,7 +68,7 @@ SignalRelay::SignalRelay(SignalProxy* parent, QObject* source) caller(source), _sync(false) { - QObject::connect(source, SIGNAL(destroyed()), parent, SLOT(detachSender()), Qt::DirectConnection); + QObject::connect(source, SIGNAL(destroyed()), parent, SLOT(detachSender())); } int SignalRelay::qt_metacall(QMetaObject::Call _c, int _id, void **_a) { @@ -91,11 +91,11 @@ int SignalRelay::qt_metacall(QMetaObject::Call _c, int _id, void **_a) { // dispatch Sync Signal if necessary QByteArray signature(caller->metaObject()->method(_id).signature()); if(synchronize() && proxy->syncMap(qobject_cast(caller)).contains(signature)) { - // qDebug() << "__SYNC__ >>>" - // << caller->metaObject()->className() - // << caller->objectName() - // << proxy->methodName(caller, _id) - // << params; + //qDebug() << "__SYNC__ >>>" + // << caller->metaObject()->className() + // << caller->objectName() + // << signature + // << params; // params.prepend(QVariant(_id)); params.prepend(signature); params.prepend(caller->objectName()); @@ -131,10 +131,10 @@ bool SignalRelay::isSyncMethod(int i) { if(!proxy->syncMap(qobject_cast(caller)).contains(signature)) return false; - if(proxy->proxyMode() == SignalProxy::Server && !signature.startsWith("request")) + if(proxy->proxyMode() == SignalProxy::Server && !signature.contains("Requested")) return true; - if(proxy->proxyMode() == SignalProxy::Client && signature.startsWith("request")) + if(proxy->proxyMode() == SignalProxy::Client && signature.contains("Requested")) return true; return false; @@ -273,7 +273,6 @@ void SignalProxy::objectRenamed(QString oldname, QString newname) { } void SignalProxy::objectRenamed(QByteArray classname, QString oldname, QString newname) { - QMutexLocker locker(&slaveMutex); if(_syncSlave.contains(classname) && _syncSlave[classname].contains(oldname) && oldname != newname) _syncSlave[classname][newname] = _syncSlave[classname].take(oldname); } @@ -338,10 +337,19 @@ const QList &SignalProxy::argTypes(QObject *obj, int methodId) { return _classInfo[obj->metaObject()]->argTypes[methodId]; } -bool SignalProxy::hasUpdateSignal(QObject *obj) { - if(!_classInfo.contains(obj->metaObject())) - return false; - return _classInfo[obj->metaObject()]->hasUpdateSignal; +void SignalProxy::setMinArgCount(QObject *obj, int methodId) { + const QMetaObject *meta = obj->metaObject(); + QString signature(meta->method(methodId).signature()); + int minCount = meta->method(methodId).parameterTypes().count() - signature.count("="); + Q_ASSERT(!_classInfo[meta]->minArgCount.contains(methodId)); + _classInfo[meta]->minArgCount[methodId] = minCount; +} + +const int &SignalProxy::minArgCount(QObject *obj, int methodId) { + Q_ASSERT(_classInfo.contains(obj->metaObject())); + if(!_classInfo[obj->metaObject()]->minArgCount.contains(methodId)) + setMinArgCount(obj, methodId); + return _classInfo[obj->metaObject()]->minArgCount[methodId]; } void SignalProxy::setMethodName(QObject *obj, int methodId) { @@ -401,13 +409,24 @@ const QHash &SignalProxy::syncMap(SyncableObject *obj) { return _classInfo[obj->metaObject()]->syncMap; } +void SignalProxy::setUpdatedRemotelyId(QObject *obj) { + const QMetaObject *meta = obj->metaObject(); + Q_ASSERT(_classInfo.contains(meta)); + _classInfo[meta]->updatedRemotelyId = meta->indexOfSignal("updatedRemotely()"); +} + +int SignalProxy::updatedRemotelyId(SyncableObject *obj) { + Q_ASSERT(_classInfo.contains(obj->metaObject())); + return _classInfo[obj->metaObject()]->updatedRemotelyId; +} + void SignalProxy::createClassInfo(QObject *obj) { if(_classInfo.contains(obj->metaObject())) return; ClassInfo *classInfo = new ClassInfo(); - classInfo->hasUpdateSignal = (obj->metaObject()->indexOfSignal(QMetaObject::normalizedSignature("updatedRemotely()")) != -1); _classInfo[obj->metaObject()] = classInfo; + setUpdatedRemotelyId(obj); } bool SignalProxy::attachSignal(QObject* sender, const char* signal, const QByteArray& sigName) { @@ -447,7 +466,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()), Qt::DirectConnection); + QObject::connect(recv, SIGNAL(destroyed()), this, SLOT(detachSender())); return true; } @@ -469,7 +488,7 @@ void SignalProxy::synchronize(SyncableObject *obj) { if(proxyMode() == Server) { if(obj->metaObject()->indexOfSignal(QMetaObject::normalizedSignature("renameObject(QString, QString)")) != -1) - connect(obj, SIGNAL(renameObject(QString, QString)), this, SLOT(objectRenamed(QString, QString)), Qt::DirectConnection); + connect(obj, SIGNAL(renameObject(QString, QString)), this, SLOT(objectRenamed(QString, QString))); setInitialized(obj); } else { @@ -478,18 +497,16 @@ void SignalProxy::synchronize(SyncableObject *obj) { } void SignalProxy::setInitialized(SyncableObject *obj) { - QMetaObject::invokeMethod(obj, "setInitialized"); + obj->setInitialized(); + emit objectInitialized(obj); } -bool SignalProxy::initialized(SyncableObject *obj) { - bool init; - if(!QMetaObject::invokeMethod(obj, "initialized", Q_RETURN_ARG(bool, init))) - init = false; - return init; +bool SignalProxy::isInitialized(SyncableObject *obj) const { + return obj->isInitialized(); } void SignalProxy::requestInit(SyncableObject *obj) { - if(proxyMode() == Server || initialized(obj)) + if(proxyMode() == Server || isInitialized(obj)) return; QVariantList params; @@ -499,47 +516,22 @@ void SignalProxy::requestInit(SyncableObject *obj) { } void SignalProxy::detachSender() { - // 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) { - QMutexLocker locker(&slaveMutex); - _detachSignals(obj); - _detachSlots(obj); - SyncableObject *syncobj = qobject_cast(obj); - if(syncobj) _stopSync(syncobj); + detachSignals(obj); + detachSlots(obj); + stopSync(static_cast(obj)); } void SignalProxy::detachSignals(QObject* sender) { - QMutexLocker locker(&slaveMutex); - _detachSignals(sender); -} - -void SignalProxy::detachSlots(QObject* receiver) { - QMutexLocker locker(&slaveMutex); - _detachSlots(receiver); -} - -void SignalProxy::stopSync(SyncableObject* obj) { - QMutexLocker locker(&slaveMutex); - _stopSync(obj); -} - -void SignalProxy::_detachSignals(QObject* sender) { if(!_relayHash.contains(sender)) return; _relayHash.take(sender)->deleteLater(); } -void SignalProxy::_detachSlots(QObject* receiver) { +void SignalProxy::detachSlots(QObject* receiver) { SlotHash::iterator slotIter = _attachedSlots.begin(); while(slotIter != _attachedSlots.end()) { if(slotIter.value().first == receiver) { @@ -549,7 +541,7 @@ void SignalProxy::_detachSlots(QObject* receiver) { } } -void SignalProxy::_stopSync(SyncableObject* obj) { +void SignalProxy::stopSync(SyncableObject* obj) { if(_relayHash.contains(obj)) _relayHash[obj]->setSynchronize(false); @@ -588,11 +580,6 @@ 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); @@ -634,8 +621,7 @@ void SignalProxy::handleSync(QVariantList params) { qWarning("SignalProxy::handleSync(): invokeMethod for \"%s\" failed ", methodName(receiver, slotId).constData()); return; } - if(hasUpdateSignal(receiver)) - QMetaObject::invokeMethod(receiver, "updatedRemotely"); + invokeSlot(receiver, updatedRemotelyId(receiver)); } void SignalProxy::handleInitRequest(QIODevice *sender, const QVariantList ¶ms) { @@ -673,7 +659,7 @@ void SignalProxy::handleInitRequest(QIODevice *sender, const QVariantList ¶m void SignalProxy::handleInitData(QIODevice *sender, const QVariantList ¶ms) { Q_UNUSED(sender) if(params.count() != 3) { - qWarning() << "SignalProxy::handleInitRequest() received initRequest with invalid param Count:" + qWarning() << "SignalProxy::handleInitData() received initData with invalid param Count:" << params; return; } @@ -683,13 +669,13 @@ void SignalProxy::handleInitData(QIODevice *sender, const QVariantList ¶ms) QVariantMap propertyMap(params[2].toMap()); if(!_syncSlave.contains(className)) { - qWarning() << "SignalProxy::handleInitRequest() received initRequest for unregistered Class:" + qWarning() << "SignalProxy::handleInitData() received initData for unregistered Class:" << className; return; } if(!_syncSlave[className].contains(objectName)) { - qWarning() << "SignalProxy::handleInitRequest() received initRequest for unregistered Object:" + qWarning() << "SignalProxy::handleInitData() received initData for unregistered Object:" << className << objectName; return; } @@ -712,11 +698,40 @@ void SignalProxy::handleSignal(const QByteArray &funcName, const QVariantList &p } bool SignalProxy::invokeSlot(QObject *receiver, int methodId, const QVariantList ¶ms) { - int numParams = argTypes(receiver, methodId).count(); - QGenericArgument args[9]; - for(int i = 0; i < numParams; i++) - args[i] = QGenericArgument(params[i].typeName(), params[i].constData()); - return QMetaObject::invokeMethod(receiver, methodName(receiver, methodId), args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8]); + const QList args = argTypes(receiver, methodId); + const int numArgs = params.count() < args.count() + ? params.count() + : args.count(); + + if(minArgCount(receiver, methodId) < params.count()) { + qWarning() << "SignalProxy::invokeSlot(): not enough params to invoke" << methodName(receiver, methodId); + return false; + } + + void *_a[numArgs+1]; + _a[0] = 0; + // check for argument compatibility and build params array + for(int i = 0; i < numArgs; i++) { + if(args[i] != QMetaType::type(params[i].typeName())) { + qWarning() << "SignalProxy::invokeSlot(): incompatible param types to invoke" << methodName(receiver, methodId); + return false; + } + _a[i+1] = const_cast(params[i].constData()); + } + + + Qt::ConnectionType type = QThread::currentThread() == receiver->thread() + ? Qt::DirectConnection + : Qt::QueuedConnection; + + if (type == Qt::DirectConnection) { + return receiver->qt_metacall(QMetaObject::InvokeMetaMethod, methodId, _a) < 0; + } else { + qWarning() << "Queued Connections are not implemented yet"; + // not to self: qmetaobject.cpp:990 ff + return false; + } + } void SignalProxy::dataAvailable() { @@ -798,10 +813,11 @@ QVariantMap SignalProxy::initData(SyncableObject *obj) const { } void SignalProxy::setInitData(SyncableObject *obj, const QVariantMap &properties) { - if(initialized(obj)) + if(isInitialized(obj)) return; obj->fromVariantMap(properties); setInitialized(obj); + invokeSlot(obj, updatedRemotelyId(obj)); } void SignalProxy::dumpProxyStats() {