/***************************************************************************
- * 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 *
int sigCount() const;
private:
+ bool isSyncMethod(int i);
+
SignalProxy* proxy;
QObject* caller;
QMultiHash<int, QByteArray> sigNames;
proxy->dispatchSignal(funcIter.value(), params);
funcIter++;
}
- if(synchronize() && proxy->syncMap(caller).contains(_id)) {
+
+ // 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;
- params.prepend(QVariant(_id));
+ // params.prepend(QVariant(_id));
+ params.prepend(signature);
params.prepend(caller->objectName());
params.prepend(caller->metaObject()->className());
proxy->dispatchSignal((int)SignalProxy::Sync, params);
}
void SignalRelay::setSynchronize(bool sync) {
- QHash<int, int>::const_iterator iter = proxy->syncMap(caller).constBegin();
+ const QMetaObject *meta = caller->metaObject();
if(!_sync && sync) {
- while(iter != proxy->syncMap(caller).constEnd()) {
- QMetaObject::connect(caller, iter.key(), this, QObject::staticMetaObject.methodCount() + iter.key());
- iter++;
+ // 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) {
- while(iter != proxy->syncMap(caller).constEnd()) {
- QMetaObject::disconnect(caller, iter.key(), this, QObject::staticMetaObject.methodCount() + iter.key());
- iter++;
+ // 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) {
+ QByteArray signature = caller->metaObject()->method(i).signature();
+ if(!proxy->syncMap(caller).contains(signature))
+ return false;
+
+ if(proxy->proxyMode() == SignalProxy::Server && !signature.startsWith("request"))
+ return true;
+
+ if(proxy->proxyMode() == SignalProxy::Client && signature.startsWith("request"))
+ return true;
+
+ return false;
+}
+
bool SignalRelay::synchronize() const {
return _sync;
}
}
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);
}
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::setMethodName(QObject *obj, int methodId) {
const QMetaObject *meta = obj->metaObject();
QByteArray method(::methodName(meta->method(methodId)));
void SignalProxy::setSyncMap(QObject *obj) {
const QMetaObject *meta = obj->metaObject();
- QHash<int, int> syncMap;
+ QHash<QByteArray, int> syncMap;
QList<int> slotIndexes;
for(int i = 0; i < meta->methodCount(); i++) {
}
if(matchIdx != -1) {
slotIndexes.removeAt(slotIndexes.indexOf(matchIdx));
- syncMap[signalIdx] = matchIdx;
+ syncMap[QByteArray(signal.signature())] = matchIdx;
}
}
_classInfo[meta]->syncMap = syncMap;
}
-const QHash<int,int> &SignalProxy::syncMap(QObject *obj) {
+const QHash<QByteArray,int> &SignalProxy::syncMap(QObject *obj) {
Q_ASSERT(_classInfo.contains(obj->metaObject()));
if(_classInfo[obj->metaObject()]->syncMap.isEmpty())
setSyncMap(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->hasUpdateSignal = (obj->metaObject()->indexOfSignal(QMetaObject::normalizedSignature("updatedRemotely()")) != -1);
+ _classInfo[obj->metaObject()] = classInfo;
}
bool SignalProxy::attachSignal(QObject* sender, const char* signal, const QByteArray& sigName) {
}
void SignalProxy::synchronize(QObject *obj) {
- if(proxyMode() == Server)
- return synchronizeAsMaster(obj);
- else
- return synchronizeAsSlave(obj);
-}
-
-void SignalProxy::synchronizeAsMaster(QObject *sender) {
- createClassInfo(sender);
+ 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)));
-
- QByteArray className(sender->metaObject()->className());
- _syncSlave[className][sender->objectName()] = sender;
+ // attaching as slave to receive sync Calls
+ QByteArray className(obj->metaObject()->className());
+ _syncSlave[className][obj->objectName()] = obj;
- setInitialized(sender);
-}
-
-void SignalProxy::synchronizeAsSlave(QObject *receiver) {
- QByteArray className(receiver->metaObject()->className());
- _syncSlave[className][receiver->objectName()] = receiver;
-
- createClassInfo(receiver);
+ 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);
- requestInit(receiver);
+ setInitialized(obj);
+ } else {
+ requestInit(obj);
+ }
}
void SignalProxy::setInitialized(QObject *obj) {
void SignalProxy::receivePeerSignal(QIODevice *sender, const QVariant &packedFunc) {
QVariantList params(packedFunc.toList());
+ QVariant call = params.takeFirst();
+ 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);
-
- QVariant call = params.takeFirst();
- if(call.type() != QVariant::Int)
- return handleSignal(call.toByteArray(), params);
switch(call.toInt()) {
case Sync:
QByteArray className = params.takeFirst().toByteArray();
QString objectName = params.takeFirst().toString();
- int signalId = params.takeFirst().toInt();
+ QByteArray signal = params.takeFirst().toByteArray();
if(!_syncSlave.contains(className) || !_syncSlave[className].contains(objectName)) {
- qWarning() << "no registered receiver:" << className << objectName << "for Sync call" << signalId << params;
+ qWarning() << QString("no registered receiver for sync call: %s::%s (objectName=\"%s\"). Params are:").arg(QString(className)).arg(QString(signal)).arg(objectName)
+ << params;
return;
}
QObject *receiver = _syncSlave[className][objectName];
- if(!syncMap(receiver).contains(signalId)) {
- const QMetaObject *meta = receiver->metaObject();
- QString signalName;
- if(signalId < meta->methodCount())
- signalName = QString(meta->method(signalId).signature());
- else
- signalName = QString::number(signalId);
-
- qWarning() << "received Sync Call for Object" << receiver
- << "- no matching Slot for Signal:" << signalName;
+ 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;
return;
- }
- int slotId = syncMap(receiver)[signalId];
- if(!invokeSlot(receiver, slotId, params))
+ }
+
+ int slotId = syncMap(receiver)[signal];
+ if(!invokeSlot(receiver, slotId, params)) {
qWarning("SignalProxy::handleSync(): invokeMethod for \"%s\" failed ", methodName(receiver, slotId).constData());
+ return;
+ }
+ if(hasUpdateSignal(receiver))
+ QMetaObject::invokeMethod(receiver, "updatedRemotely");
}
void SignalProxy::handleInitRequest(QIODevice *sender, const QVariantList ¶ms) {
const QMetaObject *meta = object->metaObject();
qDebug() << "SignalProxy: SyncMap for Class" << meta->className();
- QHash<int, int> syncMap_ = syncMap(object);
- QHash<int, int>::const_iterator iter = syncMap_.constBegin();
+ QHash<QByteArray, int> syncMap_ = syncMap(object);
+ QHash<QByteArray, int>::const_iterator iter = syncMap_.constBegin();
while(iter != syncMap_.constEnd()) {
- qDebug() << iter.key() << meta->method(iter.key()).signature() << "-->" << iter.value() << meta->method(iter.value()).signature();
+ qDebug() << iter.key() << "-->" << iter.value() << meta->method(iter.value()).signature();
iter++;
}
+// QHash<int, int> syncMap_ = syncMap(object);
+// QHash<int, int>::const_iterator iter = syncMap_.constBegin();
+// while(iter != syncMap_.constEnd()) {
+// qDebug() << iter.key() << meta->method(iter.key()).signature() << "-->" << iter.value() << meta->method(iter.value()).signature();
+// iter++;
+// }
}
projects / quassel.git / blobdiff