X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.cpp;h=ebcf507696fef745a454269335f34962789242c4;hp=0cb8106d0249a8f709d7cbbdd6d60f5d4e75573b;hb=70283ef877bdf3339fb067667ad9130ceabd8b9a;hpb=e531fd1f1ea36a360a9d876c94e73b0f3b1bcd22 diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp index 0cb8106d..ebcf5076 100644 --- a/src/common/signalproxy.cpp +++ b/src/common/signalproxy.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-08 by the Quassel Project * + * Copyright (C) 2005-09 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -61,146 +61,106 @@ public: }; // ================================================== -// SIGNALRELAY +// SignalRelay // ================================================== -class SignalRelay: public QObject { +class SignalProxy::SignalRelay : public QObject { /* Q_OBJECT is not necessary or even allowed, because we implement qt_metacall ourselves (and don't use any other features of the meta object system) */ public: - SignalRelay(SignalProxy* parent, QObject* source); - int qt_metacall(QMetaObject::Call _c, int _id, void **_a); - - void attachSignal(int methodId, const QByteArray &func); + SignalRelay(SignalProxy *parent) : QObject(parent), _proxy(parent) {} + inline SignalProxy *proxy() const { return _proxy; } - void setSynchronize(bool); + int qt_metacall(QMetaObject::Call _c, int _id, void **_a); - inline bool synchronize() const { return _sync; } - inline int sigCount() const { return sigNames.count(); } + void attachSignal(QObject *sender, int signalId, const QByteArray &funcName); + void detachSignal(QObject *sender, int signalId = -1); private: - bool isSyncMethod(int i); + struct Signal { + QObject *sender; + int signalId; + QByteArray signature; + Signal(QObject *sender, int sigId, const QByteArray &signature) : sender(sender), signalId(sigId), signature(signature) {} + Signal() : sender(0), signalId(-1) {} + }; - SignalProxy* proxy; - QObject* caller; - QMultiHash sigNames; - bool _sync; + SignalProxy *_proxy; + QHash _slots; }; -SignalRelay::SignalRelay(SignalProxy* parent, QObject* source) - : QObject(parent), - proxy(parent), - caller(source), - _sync(false) -{ - QObject::connect(source, SIGNAL(destroyed()), parent, SLOT(detachSender())); +void SignalProxy::SignalRelay::attachSignal(QObject *sender, int signalId, const QByteArray &funcName) { + // we ride without safetybelts here... all checking for valid method etc pp has to be done by the caller + // all connected methodIds are offset by the standard methodCount of QObject + int slotId; + for(int i = 0;; i++) { + if(!_slots.contains(i)) { + slotId = i; + break; + } + } + + QByteArray fn; + if(!funcName.isEmpty()) { + fn = QMetaObject::normalizedSignature(funcName); + } else { + fn = SIGNAL(fakeMethodSignature()); + fn = fn.replace("fakeMethodSignature()", sender->metaObject()->method(signalId).signature()); + } + + _slots[slotId] = Signal(sender, signalId, fn); + + QMetaObject::connect(sender, signalId, this, QObject::staticMetaObject.methodCount() + slotId); } -int SignalRelay::qt_metacall(QMetaObject::Call _c, int _id, void **_a) { +void SignalProxy::SignalRelay::detachSignal(QObject *sender, int signalId) { + QHash::iterator slotIter = _slots.begin(); + while(slotIter != _slots.end()) { + if(slotIter->sender == sender && (signalId == -1 || slotIter->signalId == signalId)) { + slotIter = _slots.erase(slotIter); + if(signalId != -1) + break; + } else { + slotIter++; + } + } +} + +int SignalProxy::SignalRelay::qt_metacall(QMetaObject::Call _c, int _id, void **_a) { _id = QObject::qt_metacall(_c, _id, _a); if(_id < 0) return _id; - SignalProxy::ExtendedMetaObject *eMeta = proxy->extendedMetaObject(caller); - Q_ASSERT(eMeta); if(_c == QMetaObject::InvokeMetaMethod) { - if(sigNames.contains(_id) || synchronize()) { - const QList &argTypes = eMeta->argTypes(_id); + if(_slots.contains(_id)) { + QObject *caller = sender(); + + SignalProxy::ExtendedMetaObject *eMeta = proxy()->extendedMetaObject(caller->metaObject()); + Q_ASSERT(eMeta); + + const Signal &signal = _slots[_id]; + QVariantList params; - int n = argTypes.size(); - for(int i=0; i &argTypes = eMeta->argTypes(signal.signalId); + for(int i = 0; i < argTypes.size(); i++) { if(argTypes[i] == 0) { qWarning() << "SignalRelay::qt_metacall(): received invalid data for argument number" << i << "of signal" << QString("%1::%2").arg(caller->metaObject()->className()).arg(caller->metaObject()->method(_id).signature()); qWarning() << " - make sure all your data types are known by the Qt MetaSystem"; return _id; } - params.append(QVariant(argTypes[i], _a[i+1])); - } - QMultiHash::const_iterator funcIter = sigNames.constFind(_id); - while(funcIter != sigNames.constEnd() && funcIter.key() == _id) { - proxy->dispatchSignal(SignalProxy::RpcCall, QVariantList() << funcIter.value() << params); - funcIter++; + params << QVariant(argTypes[i], _a[i+1]); } - // dispatch Sync Signal if necessary - QByteArray signature(caller->metaObject()->method(_id).signature()); - SyncableObject *syncObject = qobject_cast(caller); - if(synchronize() && eMeta->syncMap().contains(signature)) { - //qDebug() << "__SYNC__ >>>" - // << caller->metaObject()->className() - // << caller->objectName() - // << signature - // << params; - // params.prepend(QVariant(_id)); - params.prepend(signature); - params.prepend(syncObject->objectName()); - params.prepend(syncObject->syncMetaObject()->className()); - proxy->dispatchSignal(SignalProxy::Sync, params); - } + proxy()->dispatchSignal(SignalProxy::RpcCall, params); } - _id -= QObject::staticMetaObject.methodCount(); + _id -= _slots.count(); } return _id; } -void SignalRelay::setSynchronize(bool sync) { - SyncableObject *syncObject = qobject_cast(caller); - if(!syncObject) - return; - - const QMetaObject *meta = syncObject->syncMetaObject(); - if(!_sync && sync) { - // enable Sync - for(int i = 0; i < meta->methodCount(); i++ ) { - 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(isSyncMethod(i)) - QMetaObject::disconnect(caller, i, this, QObject::staticMetaObject.methodCount() + i); - } - } - _sync = sync; -} - -bool SignalRelay::isSyncMethod(int i) { - SyncableObject *syncObject = qobject_cast(caller); - if(!syncObject) - return false; - - QByteArray signature = syncObject->syncMetaObject()->method(i).signature(); - SignalProxy::ExtendedMetaObject *eMeta = proxy->extendedMetaObject(caller); - Q_ASSERT(eMeta); - if(!eMeta->syncMap().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; -} - -void SignalRelay::attachSignal(int methodId, const QByteArray &func) { - // we ride without safetybelts here... all checking for valid method etc pp has to be done by the caller - // all connected methodIds are offset by the standard methodCount of QObject - if(!sigNames.contains(methodId)) - QMetaObject::connect(caller, methodId, this, QObject::staticMetaObject.methodCount() + methodId); - - QByteArray fn; - if(!func.isEmpty()) { - fn = QMetaObject::normalizedSignature(func); - } else { - fn = QByteArray("2") + caller->metaObject()->method(methodId).signature(); - } - sigNames.insert(methodId, fn); -} - // ================================================== // Peers // ================================================== @@ -271,9 +231,18 @@ SignalProxy::SignalProxy(ProxyMode mode, QIODevice* device, QObject* parent) } SignalProxy::~SignalProxy() { - QList senders = _relayHash.keys(); - foreach(QObject* sender, senders) - detachObject(sender); + QHash::iterator classIter = _syncSlave.begin(); + while(classIter != _syncSlave.end()) { + ObjectId::iterator objIter = classIter->begin(); + while(objIter != classIter->end()) { + SyncableObject *obj = objIter.value(); + objIter = classIter->erase(objIter); + obj->stopSynchronize(this); + } + classIter++; + } + _syncSlave.clear(); + removeAllPeers(); } @@ -302,6 +271,7 @@ void SignalProxy::setProxyMode(ProxyMode mode) { } void SignalProxy::init() { + _signalRelay = new SignalRelay(this); connect(&_heartBeatTimer, SIGNAL(timeout()), this, SLOT(sendHeartBeat())); _heartBeatTimer.start(30 * 1000); _secure = false; @@ -431,21 +401,23 @@ void SignalProxy::removePeerBySender() { removePeer(sender()); } -void SignalProxy::objectRenamed(const QString &newname, const QString &oldname) { - SyncableObject *syncObject = qobject_cast(sender()); - const QMetaObject *meta = syncObject->syncMetaObject(); - const QByteArray className(meta->className()); - objectRenamed(className, newname, oldname); - +void SignalProxy::renameObject(const SyncableObject *obj, const QString &newname, const QString &oldname) { if(proxyMode() == Client) return; + const QMetaObject *meta = obj->syncMetaObject(); + const QByteArray className(meta->className()); + objectRenamed(className, newname, oldname); + QVariantList params; params << "__objectRenamed__" << className << newname << oldname; dispatchSignal(RpcCall, params); } void SignalProxy::objectRenamed(const QByteArray &classname, const QString &newname, const QString &oldname) { + if(proxyMode() == Server) + return; + if(_syncSlave.contains(classname) && _syncSlave[classname].contains(oldname) && oldname != newname) { SyncableObject *obj = _syncSlave[classname][newname] = _syncSlave[classname].take(oldname); requestInit(obj); @@ -459,22 +431,22 @@ const QMetaObject *SignalProxy::metaObject(const QObject *obj) { return obj->metaObject(); } -SignalProxy::ExtendedMetaObject *SignalProxy::extendedMetaObject(const QObject *obj) const { - if(_extendedMetaObjects.contains(metaObject(obj))) - return _extendedMetaObjects[metaObject(obj)]; +SignalProxy::ExtendedMetaObject *SignalProxy::extendedMetaObject(const QMetaObject *meta) const { + if(_extendedMetaObjects.contains(meta)) + return _extendedMetaObjects[meta]; else return 0; } -void SignalProxy::createExtendedMetaObject(const QObject *obj) { - const QMetaObject *meta = metaObject(obj); +SignalProxy::ExtendedMetaObject *SignalProxy::createExtendedMetaObject(const QMetaObject *meta, bool checkConflicts) { if(!_extendedMetaObjects.contains(meta)) { - _extendedMetaObjects[meta] = new ExtendedMetaObject(meta); + _extendedMetaObjects[meta] = new ExtendedMetaObject(meta, checkConflicts); } + return _extendedMetaObjects[meta]; } -bool SignalProxy::attachSignal(QObject* sender, const char* signal, const QByteArray& sigName) { - const QMetaObject* meta = metaObject(sender); +bool SignalProxy::attachSignal(QObject *sender, const char* signal, const QByteArray& sigName) { + const QMetaObject* meta = sender->metaObject(); QByteArray sig(meta->normalizedSignature(signal).mid(1)); int methodId = meta->indexOfMethod(sig.constData()); if(methodId == -1 || meta->method(methodId).methodType() != QMetaMethod::Signal) { @@ -482,20 +454,14 @@ bool SignalProxy::attachSignal(QObject* sender, const char* signal, const QByteA return false; } - createExtendedMetaObject(sender); - - SignalRelay* relay; - if(_relayHash.contains(sender)) - relay = _relayHash[sender]; - else - relay = _relayHash[sender] = new SignalRelay(this, sender); - - relay->attachSignal(methodId, sigName); + createExtendedMetaObject(meta); + _signalRelay->attachSignal(sender, methodId, sigName); + disconnect(sender, SIGNAL(destroyed(QObject *)), this, SLOT(detachObject(QObject *))); + connect(sender, SIGNAL(destroyed(QObject *)), this, SLOT(detachObject(QObject *))); return true; } - bool SignalProxy::attachSlot(const QByteArray& sigName, QObject* recv, const char* slot) { const QMetaObject* meta = recv->metaObject(); int methodId = meta->indexOfMethod(meta->normalizedSignature(slot).mid(1)); @@ -504,34 +470,24 @@ bool SignalProxy::attachSlot(const QByteArray& sigName, QObject* recv, const cha return false; } - createExtendedMetaObject(recv); + createExtendedMetaObject(meta); QByteArray funcName = QMetaObject::normalizedSignature(sigName.constData()); _attachedSlots.insert(funcName, qMakePair(recv, methodId)); - QObject::disconnect(recv, SIGNAL(destroyed()), this, SLOT(detachSender())); - QObject::connect(recv, SIGNAL(destroyed()), this, SLOT(detachSender())); + disconnect(recv, SIGNAL(destroyed(QObject *)), this, SLOT(detachObject(QObject *))); + connect(recv, SIGNAL(destroyed(QObject *)), this, SLOT(detachObject(QObject *))); return true; } void SignalProxy::synchronize(SyncableObject *obj) { - createExtendedMetaObject(obj); - - // attaching all the Signals - SignalRelay* relay; - if(_relayHash.contains(obj)) - relay = _relayHash[obj]; - else - relay = _relayHash[obj] = new SignalRelay(this, obj); - - relay->setSynchronize(true); + createExtendedMetaObject(obj, true); // attaching as slave to receive sync Calls QByteArray className(obj->syncMetaObject()->className()); _syncSlave[className][obj->objectName()] = obj; if(proxyMode() == Server) { - connect(obj, SIGNAL(objectRenamed(QString, QString)), this, SLOT(objectRenamed(QString, QString))); obj->setInitialized(); emit objectInitialized(obj); } else { @@ -540,22 +496,17 @@ void SignalProxy::synchronize(SyncableObject *obj) { else requestInit(obj); } -} -void SignalProxy::detachSender() { - detachObject(sender()); + obj->synchronize(this); } -void SignalProxy::detachObject(QObject* obj) { - stopSync(static_cast(obj)); +void SignalProxy::detachObject(QObject *obj) { detachSignals(obj); detachSlots(obj); } -void SignalProxy::detachSignals(QObject* sender) { - if(!_relayHash.contains(sender)) - return; - _relayHash.take(sender)->deleteLater(); +void SignalProxy::detachSignals(QObject *sender) { + _signalRelay->detachSignal(sender); } void SignalProxy::detachSlots(QObject* receiver) { @@ -568,10 +519,7 @@ void SignalProxy::detachSlots(QObject* receiver) { } } -void SignalProxy::stopSync(SyncableObject* obj) { - if(_relayHash.contains(obj)) - _relayHash[obj]->setSynchronize(false); - +void SignalProxy::stopSynchronize(SyncableObject *obj) { // 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::iterator classIter = _syncSlave.begin(); @@ -582,6 +530,7 @@ void SignalProxy::stopSync(SyncableObject* obj) { } classIter++; } + obj->stopSynchronize(this); } void SignalProxy::dispatchSignal(const RequestType &requestType, const QVariantList ¶ms) { @@ -621,6 +570,18 @@ void SignalProxy::receivePackedFunc(AbstractPeer *sender, const QVariant &packed } void SignalProxy::receivePeerSignal(AbstractPeer *sender, const RequestType &requestType, const QVariantList ¶ms) { + switch(requestType) { + // list all RequestTypes that shouldnot trigger a heartbeat counter reset here + case HeartBeatReply: + break; + default: + if(sender->type() == AbstractPeer::IODevicePeer) { + IODevicePeer *ioPeer = static_cast(sender); + ioPeer->sentHeartBeats = 0; + } + } + + // qDebug() << "SignalProxy::receivePeerSignal)" << requestType << params; switch(requestType) { case RpcCall: if(params.empty()) @@ -672,23 +633,27 @@ void SignalProxy::handleSync(AbstractPeer *sender, QVariantList params) { QByteArray className = params.takeFirst().toByteArray(); QString objectName = params.takeFirst().toString(); - QByteArray signal = params.takeFirst().toByteArray(); + QByteArray slot = params.takeFirst().toByteArray(); if(!_syncSlave.contains(className) || !_syncSlave[className].contains(objectName)) { - qWarning() << QString("no registered receiver for sync call: %1::%2 (objectName=\"%3\"). Params are:").arg(QString(className)).arg(QString(signal)).arg(objectName) + qWarning() << QString("no registered receiver for sync call: %1::%2 (objectName=\"%3\"). Params are:").arg(QString(className)).arg(QString(slot)).arg(objectName) << params; return; } SyncableObject *receiver = _syncSlave[className][objectName]; ExtendedMetaObject *eMeta = extendedMetaObject(receiver); - if(!eMeta->syncMap().contains(signal)) { - qWarning() << QString("no matching slot for sync call: %1::%2 (objectName=\"%3\"). Params are:").arg(QString(className)).arg(QString(signal)).arg(objectName) + if(!eMeta->slotMap().contains(slot)) { + qWarning() << QString("no matching slot for sync call: %1::%2 (objectName=\"%3\"). Params are:").arg(QString(className)).arg(QString(slot)).arg(objectName) << params; return; } - int slotId = eMeta->syncMap()[signal]; + int slotId = eMeta->slotMap()[slot]; + if(proxyMode() != eMeta->receiverMode(slotId)) { + qWarning("SignalProxy::handleSync(): invokeMethod for \"%s\" failed. Wrong ProxyMode!", eMeta->methodName(slotId).constData()); + return; + } QVariant returnValue((QVariant::Type)eMeta->returnType(slotId)); if(!invokeSlot(receiver, slotId, params, returnValue)) { @@ -696,12 +661,14 @@ void SignalProxy::handleSync(AbstractPeer *sender, QVariantList params) { return; } + if(returnValue.type() != QVariant::Invalid && eMeta->receiveMap().contains(slotId)) { int receiverId = eMeta->receiveMap()[slotId]; QVariantList returnParams; returnParams << className << objectName - << QByteArray(receiver->metaObject()->method(receiverId).signature()); + << eMeta->methodName(receiverId); + //QByteArray(receiver->metaObject()->method(receiverId).signature()); if(eMeta->argTypes(receiverId).count() > 1) returnParams << params; returnParams << returnValue; @@ -886,6 +853,9 @@ void SignalProxy::writeDataToDevice(QIODevice *dev, const QVariant &item, bool c } bool SignalProxy::readDataFromDevice(QIODevice *dev, quint32 &blockSize, QVariant &item, bool compressed) { + if(!dev) + return false; + QDataStream in(dev); in.setVersion(QDataStream::Qt_4_2); @@ -895,12 +865,12 @@ bool SignalProxy::readDataFromDevice(QIODevice *dev, quint32 &blockSize, QVarian } if(blockSize > 1 << 22) { - disconnectDevice(dev, tr("Client tried to send package larger than max package size!")); + disconnectDevice(dev, tr("Peer tried to send package larger than max package size!")); return false; } if(blockSize == 0) { - disconnectDevice(dev, tr("Client tried to send 0 byte package!")); + disconnectDevice(dev, tr("Peer tried to send 0 byte package!")); return false; } @@ -917,7 +887,7 @@ bool SignalProxy::readDataFromDevice(QIODevice *dev, quint32 &blockSize, QVarian if(nbytes <= 4) { const char *data = rawItem.constData(); if(nbytes < 4 || (data[0]!=0 || data[1]!=0 || data[2]!=0 || data[3]!=0)) { - disconnectDevice(dev, tr("Client sent corrupted compressed data!")); + disconnectDevice(dev, tr("Peer sent corrupted compressed data!")); return false; } } @@ -932,7 +902,7 @@ bool SignalProxy::readDataFromDevice(QIODevice *dev, quint32 &blockSize, QVarian } if(!item.isValid()) { - disconnectDevice(dev, tr("Client sent corrupt data: unable to load QVariant!")); + disconnectDevice(dev, tr("Peer sent corrupt data: unable to load QVariant!")); return false; } @@ -1027,6 +997,34 @@ void SignalProxy::customEvent(QEvent *event) { } } +void SignalProxy::sync_call__(const SyncableObject *obj, SignalProxy::ProxyMode modeType, const char *funcname, va_list ap) { + // qDebug() << obj << modeType << "(" << _proxyMode << ")" << funcname; + if(modeType != _proxyMode) + return; + + ExtendedMetaObject *eMeta = extendedMetaObject(obj); + + QVariantList params; + params << eMeta->metaObject()->className() + << obj->objectName() + << QByteArray(funcname); + + const QList &argTypes = eMeta->argTypes(eMeta->methodId(QByteArray(funcname))); + + for(int i = 0; i < argTypes.size(); i++) { + if(argTypes[i] == 0) { + qWarning() << Q_FUNC_INFO << "received invalid data for argument number" << i << "of signal" << QString("%1::%2").arg(eMeta->metaObject()->className()).arg(funcname); + qWarning() << " - make sure all your data types are known by the Qt MetaSystem"; + return; + } + params << QVariant(argTypes[i], va_arg(ap, void *)); + } + + dispatchSignal(Sync, params); +} + + + void SignalProxy::disconnectDevice(QIODevice *dev, const QString &reason) { if(!reason.isEmpty()) qWarning() << qPrintable(reason); @@ -1050,36 +1048,17 @@ void SignalProxy::dumpProxyStats() { else mode = "Client"; - int sigCount = 0; - foreach(SignalRelay *relay, _relayHash.values()) - sigCount += relay->sigCount(); - int slaveCount = 0; foreach(ObjectId oid, _syncSlave.values()) slaveCount += oid.count(); qDebug() << this; qDebug() << " Proxy Mode:" << mode; - qDebug() << "attached sending Objects:" << _relayHash.count(); - qDebug() << " number of Signals:" << sigCount; qDebug() << " attached Slots:" << _attachedSlots.count(); qDebug() << " number of synced Slaves:" << slaveCount; qDebug() << "number of Classes cached:" << _extendedMetaObjects.count(); } -void SignalProxy::dumpSyncMap(SyncableObject *object) { - const QMetaObject *meta = object->metaObject(); - ExtendedMetaObject *eMeta = extendedMetaObject(object); - qDebug() << "SignalProxy: SyncMap for Class" << meta->className(); - - QHash syncMap_ = eMeta->syncMap(); - QHash::const_iterator iter = syncMap_.constBegin(); - while(iter != syncMap_.constEnd()) { - qDebug() << qPrintable(QString("%1 --> %2 %3").arg(QString(iter.key()), 40).arg(iter.value()).arg(QString(meta->method(iter.value()).signature()))); - iter++; - } -} - void SignalProxy::updateSecureState() { bool wasSecure = _secure; @@ -1097,94 +1076,55 @@ void SignalProxy::updateSecureState() { // ================================================== // ExtendedMetaObject // ================================================== -SignalProxy::ExtendedMetaObject::ExtendedMetaObject(const QMetaObject *meta) +SignalProxy::ExtendedMetaObject::ExtendedMetaObject(const QMetaObject *meta, bool checkConflicts) : _meta(meta), - _updatedRemotelyId(-1) + _updatedRemotelyId(_meta->indexOfSignal("updatedRemotely()")) { -} - -const QList &SignalProxy::ExtendedMetaObject::argTypes(int methodId) { - if(!_argTypes.contains(methodId)) { - QList paramTypes = _meta->method(methodId).parameterTypes(); - QList argTypes; - for(int i = 0; i < paramTypes.count(); i++) { - argTypes.append(QMetaType::type(paramTypes[i])); - } - _argTypes[methodId] = argTypes; - } - return _argTypes[methodId]; -} - -const int &SignalProxy::ExtendedMetaObject::returnType(int methodId) { - if(!_returnType.contains(methodId)) { - _returnType[methodId] = QMetaType::type(_meta->method(methodId).typeName()); - } - return _returnType[methodId]; -} - -const int &SignalProxy::ExtendedMetaObject::minArgCount(int methodId) { - if(!_minArgCount.contains(methodId)) { - QString signature(_meta->method(methodId).signature()); - _minArgCount[methodId] = _meta->method(methodId).parameterTypes().count() - signature.count("="); - } - return _minArgCount[methodId]; -} - -const QByteArray &SignalProxy::ExtendedMetaObject::methodName(int methodId) { - if(!_methodNames.contains(methodId)) { - _methodNames[methodId] = methodName(_meta->method(methodId)); - } - return _methodNames[methodId]; -} - -const QHash &SignalProxy::ExtendedMetaObject::syncMap() { - if(_syncMap.isEmpty()) { - QHash syncMap; - - QList slotIndexes; - for(int i = 0; i < _meta->methodCount(); i++) { - if(_meta->method(i).methodType() == QMetaMethod::Slot) - slotIndexes << i; - } - - // we're faking sync pairs for sync replies - // --> we deliver to every slot starting with "receive" - QByteArray slotSignature; - QList::iterator slotIter = slotIndexes.begin(); - while(slotIter != slotIndexes.end()) { - slotSignature = QByteArray(_meta->method(*slotIter).signature()); - if(slotSignature.startsWith("receive")) { - syncMap[slotSignature] = *slotIter; - slotIndexes.erase(slotIter); + for(int i = 0; i < _meta->methodCount(); i++) { + if(_meta->method(i).methodType() != QMetaMethod::Slot) + continue; + + if(QByteArray(_meta->method(i).signature()).contains('*')) + continue; // skip methods with ptr params + + QByteArray method = methodName(_meta->method(i)); + if(method.startsWith("init")) + continue; // skip initializers + + if(_methodIds.contains(method)) { + /* funny... moc creates for methods containing default parameters multiple metaMethod with separate methodIds. + we don't care... we just need the full fledged version + */ + const QMetaMethod ¤t = _meta->method(_methodIds[method]); + const QMetaMethod &candidate = _meta->method(i); + if(current.parameterTypes().count() > candidate.parameterTypes().count()) { + int minCount = candidate.parameterTypes().count(); + QList commonParams = current.parameterTypes().mid(0, minCount); + if(commonParams == candidate.parameterTypes()) + continue; // we already got the full featured version } else { - slotIter++; + int minCount = current.parameterTypes().count(); + QList commonParams = candidate.parameterTypes().mid(0, minCount); + if(commonParams == current.parameterTypes()) { + _methodIds[method] = i; // use the new one + continue; + } } - } - - // find the proper sig -> slot matches - QMetaMethod signal, slot; - int matchIdx; - for(int signalIdx = 0; signalIdx < _meta->methodCount(); signalIdx++) { - signal = _meta->method(signalIdx); - if(signal.methodType() != QMetaMethod::Signal) - continue; - - matchIdx = -1; - foreach(int slotIdx, slotIndexes) { - slot = _meta->method(slotIdx); - if(methodsMatch(signal, slot)) { - matchIdx = slotIdx; - break; - } - } - if(matchIdx != -1) { - slotIndexes.removeAll(matchIdx); - syncMap[QByteArray(signal.signature())] = matchIdx; + if(checkConflicts) { + qWarning() << "class" << meta->className() << "contains overloaded methods which is currently not supported!"; + qWarning() << " - " << _meta->method(i).signature() << "conflicts with" << _meta->method(_methodIds[method]).signature(); } + continue; } - _syncMap = syncMap; + _methodIds[method] = i; + } +} + +const SignalProxy::ExtendedMetaObject::MethodDescriptor &SignalProxy::ExtendedMetaObject::methodDescriptor(int methodId) { + if(!_methods.contains(methodId)) { + _methods[methodId] = MethodDescriptor(_meta->method(methodId)); } - return _syncMap; + return _methods[methodId]; } const QHash &SignalProxy::ExtendedMetaObject::receiveMap() { @@ -1230,49 +1170,21 @@ const QHash &SignalProxy::ExtendedMetaObject::receiveMap() { receiverId = _meta->indexOfSlot(signature); } - if(receiverId != -1) + if(receiverId != -1) { receiveMap[i] = receiverId; + qDebug() << requestSlot.signature() << _meta->method(receiverId).signature() << "---" << i << receiverId; + } } _receiveMap = receiveMap; } return _receiveMap; } -int SignalProxy::ExtendedMetaObject::updatedRemotelyId() { - if(_updatedRemotelyId == -1) { - _updatedRemotelyId = _meta->indexOfSignal("updatedRemotely()"); - } - return _updatedRemotelyId; -} - QByteArray SignalProxy::ExtendedMetaObject::methodName(const QMetaMethod &method) { QByteArray sig(method.signature()); return sig.left(sig.indexOf("(")); } -bool SignalProxy::ExtendedMetaObject::methodsMatch(const QMetaMethod &signal, const QMetaMethod &slot) { - // if we don't even have the same basename it's a sure NO - QString baseName = methodBaseName(signal); - if(baseName != methodBaseName(slot)) - return false; - - // are the signatures compatible? - if(!QObject::staticMetaObject.checkConnectArgs(signal.signature(), slot.signature())) - return false; - - // we take an educated guess if the signals and slots match - QString signalsuffix = methodName(signal); - QString slotprefix = methodName(slot); - if(!baseName.isEmpty()) { - signalsuffix = signalsuffix.mid(baseName.count()).toLower(); - slotprefix = slotprefix.left(slotprefix.count() - baseName.count()).toLower(); - } - - uint sizediff = qAbs(slotprefix.size() - signalsuffix.size()); - int ratio = editingDistance(slotprefix, signalsuffix) - sizediff; - return (ratio < 2); -} - QString SignalProxy::ExtendedMetaObject::methodBaseName(const QMetaMethod &method) { QString methodname = QString(method.signature()).section("(", 0, 0); @@ -1297,3 +1209,24 @@ QString SignalProxy::ExtendedMetaObject::methodBaseName(const QMetaMethod &metho return methodname; } +SignalProxy::ExtendedMetaObject::MethodDescriptor::MethodDescriptor(const QMetaMethod &method) + : _methodName(SignalProxy::ExtendedMetaObject::methodName(method)), + _returnType(QMetaType::type(method.typeName())) +{ + // determine argTypes + QList paramTypes = method.parameterTypes(); + QList argTypes; + for(int i = 0; i < paramTypes.count(); i++) { + argTypes.append(QMetaType::type(paramTypes[i])); + } + _argTypes = argTypes; + + // determine minArgCount + QString signature(method.signature()); + _minArgCount = method.parameterTypes().count() - signature.count("="); + + _receiverMode = (_methodName.startsWith("request")) + ? SignalProxy::Server + : SignalProxy::Client; +} +