X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.cpp;h=204c197e3e4fa60a8cda4602f9d696f670ab2604;hp=841a79f8bc1ffd2b853bd7ae21d4fa20d8b9a7b2;hb=d1b6499b0b848d4287efae89107576548533502c;hpb=53fb39baea40512c3b88abcf37a14cef05fcc287 diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp index 841a79f8..204c197e 100644 --- a/src/common/signalproxy.cpp +++ b/src/common/signalproxy.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-07 by the Quassel IRC Team * + * Copyright (C) 2005-08 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -19,6 +19,7 @@ ***************************************************************************/ #include "signalproxy.h" + #include #include #include @@ -31,6 +32,8 @@ #include #include #include + +#include "syncableobject.h" #include "util.h" class SignalRelay: public QObject { @@ -51,6 +54,8 @@ public: int sigCount() const; private: + bool isSyncMethod(int i); + SignalProxy* proxy; QObject* caller; QMultiHash sigNames; @@ -85,12 +90,12 @@ 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(caller).contains(signature)) { - // qDebug() << "__SYNC__ >>>" - // << caller->metaObject()->className() - // << caller->objectName() - // << proxy->methodName(caller, _id) - // << params; + if(synchronize() && proxy->syncMap(qobject_cast(caller)).contains(signature)) { + //qDebug() << "__SYNC__ >>>" + // << caller->metaObject()->className() + // << caller->objectName() + // << signature + // << params; // params.prepend(QVariant(_id)); params.prepend(signature); params.prepend(caller->objectName()); @@ -108,19 +113,33 @@ void SignalRelay::setSynchronize(bool sync) { if(!_sync && sync) { // enable Sync for(int i = 0; i < meta->methodCount(); i++ ) { - if(proxy->syncMap(caller).contains(meta->method(i).signature())) + if(isSyncMethod(i)) QMetaObject::connect(caller, i, this, QObject::staticMetaObject.methodCount() + i); } } else if (_sync && !sync) { // disable Sync for(int i = 0; i < meta->methodCount(); i++ ) { - if(proxy->syncMap(caller).contains(meta->method(i).signature())) + if(isSyncMethod(i)) QMetaObject::disconnect(caller, i, this, QObject::staticMetaObject.methodCount() + i); } } _sync = sync; } +bool SignalRelay::isSyncMethod(int i) { + QByteArray signature = caller->metaObject()->method(i).signature(); + if(!proxy->syncMap(qobject_cast(caller)).contains(signature)) + return false; + + if(proxy->proxyMode() == SignalProxy::Server && !signature.contains("Requested")) + return true; + + if(proxy->proxyMode() == SignalProxy::Client && signature.contains("Requested")) + return true; + + return false; +} + bool SignalRelay::synchronize() const { return _sync; } @@ -237,6 +256,7 @@ void SignalProxy::removePeerBySender() { // OK we're brutal here... but since it's a private slot we know what we've got connected to it... QIODevice *ioDev = (QIODevice *)(sender()); removePeer(ioDev); + qDebug() << "Client disconnected."; } void SignalProxy::objectRenamed(QString oldname, QString newname) { @@ -333,7 +353,7 @@ const QByteArray &SignalProxy::methodName(QObject *obj, int methodId) { } -void SignalProxy::setSyncMap(QObject *obj) { +void SignalProxy::setSyncMap(SyncableObject *obj) { const QMetaObject *meta = obj->metaObject(); QHash syncMap; @@ -368,7 +388,7 @@ void SignalProxy::setSyncMap(QObject *obj) { _classInfo[meta]->syncMap = syncMap; } -const QHash &SignalProxy::syncMap(QObject *obj) { +const QHash &SignalProxy::syncMap(SyncableObject *obj) { Q_ASSERT(_classInfo.contains(obj->metaObject())); if(_classInfo[obj->metaObject()]->syncMap.isEmpty()) setSyncMap(obj); @@ -376,8 +396,11 @@ const QHash &SignalProxy::syncMap(QObject *obj) { } void SignalProxy::createClassInfo(QObject *obj) { - if(!_classInfo.contains(obj->metaObject())) - _classInfo[obj->metaObject()] = new ClassInfo(); + if(_classInfo.contains(obj->metaObject())) + return; + + ClassInfo *classInfo = new ClassInfo(); + _classInfo[obj->metaObject()] = classInfo; } bool SignalProxy::attachSignal(QObject* sender, const char* signal, const QByteArray& sigName) { @@ -421,55 +444,43 @@ bool SignalProxy::attachSlot(const QByteArray& sigName, QObject* recv, const cha return true; } -void SignalProxy::synchronize(QObject *obj) { - if(proxyMode() == Server) - return synchronizeAsMaster(obj); - else - return synchronizeAsSlave(obj); -} - -void SignalProxy::synchronizeAsMaster(QObject *sender) { - createClassInfo(sender); +void SignalProxy::synchronize(SyncableObject *obj) { + createClassInfo(obj); + // attaching all the Signals SignalRelay* relay; - if(_relayHash.contains(sender)) - relay = _relayHash[sender]; + if(_relayHash.contains(obj)) + relay = _relayHash[obj]; else - relay = _relayHash[sender] = new SignalRelay(this, sender); + relay = _relayHash[obj] = new SignalRelay(this, obj); relay->setSynchronize(true); - if(sender->metaObject()->indexOfSignal(QMetaObject::normalizedSignature("renameObject(QString, QString)")) != -1) - connect(sender, SIGNAL(renameObject(QString, QString)), this, SLOT(objectRenamed(QString, QString)), Qt::DirectConnection); + // attaching as slave to receive sync Calls + QByteArray className(obj->metaObject()->className()); + _syncSlave[className][obj->objectName()] = obj; - QByteArray className(sender->metaObject()->className()); - _syncSlave[className][sender->objectName()] = sender; + 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); - setInitialized(sender); -} - -void SignalProxy::synchronizeAsSlave(QObject *receiver) { - QByteArray className(receiver->metaObject()->className()); - _syncSlave[className][receiver->objectName()] = receiver; - - createClassInfo(receiver); - - requestInit(receiver); + setInitialized(obj); + } else { + requestInit(obj); + } } -void SignalProxy::setInitialized(QObject *obj) { - QMetaObject::invokeMethod(obj, "setInitialized"); +void SignalProxy::setInitialized(SyncableObject *obj) { + obj->setInitialized(); + emit objectInitialized(obj); } -bool SignalProxy::initialized(QObject *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(QObject *obj) { - if(proxyMode() == Server || initialized(obj)) +void SignalProxy::requestInit(SyncableObject *obj) { + if(proxyMode() == Server || isInitialized(obj)) return; QVariantList params; @@ -494,7 +505,8 @@ void SignalProxy::detachObject(QObject* obj) { QMutexLocker locker(&slaveMutex); _detachSignals(obj); _detachSlots(obj); - _stopSync(obj); + SyncableObject *syncobj = qobject_cast(obj); + if(syncobj) _stopSync(syncobj); } void SignalProxy::detachSignals(QObject* sender) { @@ -507,7 +519,7 @@ void SignalProxy::detachSlots(QObject* receiver) { _detachSlots(receiver); } -void SignalProxy::stopSync(QObject* obj) { +void SignalProxy::stopSync(SyncableObject* obj) { QMutexLocker locker(&slaveMutex); _stopSync(obj); } @@ -528,7 +540,7 @@ void SignalProxy::_detachSlots(QObject* receiver) { } } -void SignalProxy::_stopSync(QObject* obj) { +void SignalProxy::_stopSync(SyncableObject* obj) { if(_relayHash.contains(obj)) _relayHash[obj]->setSynchronize(false); @@ -601,7 +613,7 @@ void SignalProxy::handleSync(QVariantList params) { return; } - QObject *receiver = _syncSlave[className][objectName]; + SyncableObject *receiver = _syncSlave[className][objectName]; if(!syncMap(receiver).contains(signal)) { qWarning() << QString("no matching slot for sync call: %s::%s (objectName=\"%s\"). Params are:").arg(QString(className)).arg(QString(signal)).arg(objectName) << params; @@ -609,8 +621,11 @@ void SignalProxy::handleSync(QVariantList params) { } int slotId = syncMap(receiver)[signal]; - if(!invokeSlot(receiver, slotId, params)) + if(!invokeSlot(receiver, slotId, params)) { qWarning("SignalProxy::handleSync(): invokeMethod for \"%s\" failed ", methodName(receiver, slotId).constData()); + return; + } + QMetaObject::invokeMethod(receiver, "updatedRemotely"); } void SignalProxy::handleInitRequest(QIODevice *sender, const QVariantList ¶ms) { @@ -635,7 +650,7 @@ void SignalProxy::handleInitRequest(QIODevice *sender, const QVariantList ¶m return; } - QObject *obj = _syncSlave[className][objectName]; + SyncableObject *obj = _syncSlave[className][objectName]; QVariantList params_; params_ << obj->metaObject()->className() @@ -669,7 +684,7 @@ void SignalProxy::handleInitData(QIODevice *sender, const QVariantList ¶ms) return; } - QObject *obj = _syncSlave[className][objectName]; + SyncableObject *obj = _syncSlave[className][objectName]; setInitData(obj, propertyMap); } @@ -768,64 +783,17 @@ QString SignalProxy::methodBaseName(const QMetaMethod &method) { return methodname; } -QVariantMap SignalProxy::initData(QObject *obj) const { - QVariantMap properties; - - const QMetaObject* meta = obj->metaObject(); - - // we collect data from properties - for(int i = 0; i < meta->propertyCount(); i++) { - QMetaProperty prop = meta->property(i); - properties[QString(prop.name())] = prop.read(obj); - } - - // ...as well as methods, which have names starting with "init" - for(int i = 0; i < meta->methodCount(); i++) { - QMetaMethod method = meta->method(i); - QString methodname(::methodName(method)); - if(!methodname.startsWith("init") || methodname.startsWith("initSet")) - continue; - - QVariant value = QVariant(QVariant::nameToType(method.typeName())); - QGenericReturnArgument genericvalue = QGenericReturnArgument(method.typeName(), &value); - QMetaObject::invokeMethod(obj, methodname.toAscii(), genericvalue); - - properties[methodBaseName(method)] = value; - // qDebug() << ">>> SYNC:" << methodBaseName(method) << value; - } - - // properties["Payload"] = QByteArray(10000000, 'a'); // for testing purposes - return properties; +QVariantMap SignalProxy::initData(SyncableObject *obj) const { + return obj->toVariantMap(); } -void SignalProxy::setInitData(QObject *obj, const QVariantMap &properties) { - if(initialized(obj)) +void SignalProxy::setInitData(SyncableObject *obj, const QVariantMap &properties) { + if(isInitialized(obj)) return; - - const QMetaObject *meta = obj->metaObject(); - - QVariantMap::const_iterator iterator = properties.constBegin(); - while(iterator != properties.constEnd()) { - QString name = iterator.key(); - int propertyIndex = meta->indexOfProperty(name.toAscii()); - - if(propertyIndex == -1 || !meta->property(propertyIndex).isWritable()) - setInitValue(obj, name, iterator.value()); - else - obj->setProperty(name.toAscii(), iterator.value()); - // qDebug() << "<<< SYNC:" << name << iterator.value(); - iterator++; - } + obj->fromVariantMap(properties); setInitialized(obj); } -bool SignalProxy::setInitValue(QObject *obj, const QString &property, const QVariant &value) { - QString handlername = QString("initSet") + property; - handlername[7] = handlername[7].toUpper(); - QGenericArgument param(value.typeName(), value.constData()); - return QMetaObject::invokeMethod(obj, handlername.toAscii(), param); -} - void SignalProxy::dumpProxyStats() { QString mode; if(proxyMode() == Server) @@ -850,7 +818,7 @@ void SignalProxy::dumpProxyStats() { qDebug() << "number of Classes cached:" << _classInfo.count(); } -void SignalProxy::dumpSyncMap(QObject *object) { +void SignalProxy::dumpSyncMap(SyncableObject *object) { const QMetaObject *meta = object->metaObject(); qDebug() << "SignalProxy: SyncMap for Class" << meta->className();