const QList<int> &argTypes = proxy->argTypes(caller, _id);
QVariantList params;
int n = argTypes.size();
- for(int i=0; i<n; i++)
- params.append(QVariant(argTypes[i], _a[i+1]));
+ for(int i=0; i<n; 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<int, QByteArray>::const_iterator funcIter = sigNames.constFind(_id);
while(funcIter != sigNames.constEnd() && funcIter.key() == _id) {
- proxy->dispatchSignal(funcIter.value(), params);
+ proxy->dispatchSignal(SignalProxy::RpcCall, QVariantList() << funcIter.value() << params);
funcIter++;
}
params.prepend(signature);
params.prepend(caller->objectName());
params.prepend(caller->metaObject()->className());
- proxy->dispatchSignal((int)SignalProxy::Sync, params);
+ proxy->dispatchSignal(SignalProxy::Sync, params);
}
}
- _id -= 1;
+ _id -= QObject::staticMetaObject.methodCount();
}
return _id;
}
QList<QObject*> senders = _relayHash.keys();
foreach(QObject* sender, senders)
detachObject(sender);
+
+ // close peer connections
+ foreach(QIODevice *device, _peerByteCount.keys()) {
+ device->close();
+ delete device;
+ }
}
void SignalProxy::setProxyMode(ProxyMode mode) {
}
void SignalProxy::initServer() {
+ disconnect(&_heartBeatTimer, 0, this, 0);
+ _heartBeatTimer.stop();
}
void SignalProxy::initClient() {
attachSlot("__objectRenamed__", this, SLOT(objectRenamed(QByteArray, QString, QString)));
+ connect(&_heartBeatTimer, SIGNAL(timeout()),
+ this, SLOT(sendHeartBeat()));
+ _heartBeatTimer.start(60 * 1000); // msecs: one beep per minute
}
bool SignalProxy::addPeer(QIODevice* iodev) {
return true;
}
-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) {
- const QMetaObject *meta = sender()->metaObject();
- const QByteArray className(meta->className());
- objectRenamed(className, oldname, newname);
-
- if(proxyMode() == Client)
- return;
-
- QVariantList params;
- params << className << oldname << newname;
- dispatchSignal("__objectRenamed__", params);
-}
-
-void SignalProxy::objectRenamed(QByteArray classname, QString oldname, QString newname) {
- if(_syncSlave.contains(classname) && _syncSlave[classname].contains(oldname) && oldname != newname)
- _syncSlave[classname][newname] = _syncSlave[classname].take(oldname);
-}
-
-
void SignalProxy::removePeer(QIODevice* iodev) {
if(_peerByteCount.isEmpty()) {
- qWarning() << "SignalProxy: No peers in use!";
+ qWarning() << "SignalProxy::removePeer(): No peers in use!";
return;
}
qWarning() << "SignalProxy: unknown QIODevice" << iodev;
return;
}
-
- // take a last gasp
- while(true) {
- QVariant var;
- if(readDataFromDevice(iodev, _peerByteCount[iodev], var))
- receivePeerSignal(iodev, var);
- else
- break;
- }
+
_peerByteCount.remove(iodev);
disconnect(iodev, 0, this, 0);
emit disconnected();
}
+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(const QString &newname, const QString &oldname) {
+ const QMetaObject *meta = sender()->metaObject();
+ const QByteArray className(meta->className());
+ objectRenamed(className, oldname, newname);
+
+ if(proxyMode() == Client)
+ return;
+
+ QVariantList params;
+ params << "__objectRenamed__" << className << newname << oldname;
+ dispatchSignal(RpcCall, params);
+}
+
+void SignalProxy::objectRenamed(const QByteArray &classname, const QString &newname, const QString &oldname) {
+ if(_syncSlave.contains(classname) && _syncSlave[classname].contains(oldname) && oldname != newname) {
+ SyncableObject *obj = _syncSlave[classname][newname] = _syncSlave[classname].take(oldname);
+ requestInit(obj);
+ }
+}
+
void SignalProxy::setArgTypes(QObject* obj, int methodId) {
const QMetaObject *meta = obj->metaObject();
QList<QByteArray> p = meta->method(methodId).parameterTypes();
_syncSlave[className][obj->objectName()] = 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)));
-
+ connect(obj, SIGNAL(objectRenamed(QString, QString)), this, SLOT(objectRenamed(QString, QString)));
setInitialized(obj);
} else {
requestInit(obj);
QVariantList params;
params << obj->metaObject()->className()
<< obj->objectName();
- dispatchSignal((int)InitRequest, params);
+ dispatchSignal(InitRequest, params);
}
void SignalProxy::detachSender() {
// 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())) {
+ if(classIter->contains(obj->objectName()) && classIter.value()[obj->objectName()] == obj) {
classIter->remove(obj->objectName());
break;
}
}
}
-void SignalProxy::dispatchSignal(QIODevice *receiver, const QVariant &identifier, const QVariantList ¶ms) {
+void SignalProxy::dispatchSignal(QIODevice *receiver, const RequestType &requestType, const QVariantList ¶ms) {
QVariantList packedFunc;
- packedFunc << identifier;
+ packedFunc << (qint16)requestType;
packedFunc << params;
writeDataToDevice(receiver, QVariant(packedFunc));
}
-void SignalProxy::dispatchSignal(const QVariant &identifier, const QVariantList ¶ms) {
+void SignalProxy::dispatchSignal(const RequestType &requestType, const QVariantList ¶ms) {
// yes I know we have a little code duplication here... it's for the sake of performance
QVariantList packedFunc;
- packedFunc << identifier;
+ packedFunc << (qint16)requestType;
packedFunc << params;
foreach(QIODevice* dev, _peerByteCount.keys())
writeDataToDevice(dev, QVariant(packedFunc));
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);
+ if(params.isEmpty()) {
+ qWarning() << "SignalProxy::receivePeerSignal(): received incompatible Data:" << packedFunc;
+ return;
+ }
+
+ int callType = params.takeFirst().value<int>();
- switch(call.toInt()) {
+ switch(callType) {
+ case RpcCall:
+ if(params.empty()) {
+ qWarning() << "SignalProxy::receivePeerSignal(): received empty RPC-Call";
+ return;
+ } else {
+ return handleSignal(params.takeFirst().toByteArray(), params);
+ }
case Sync:
return handleSync(params);
case InitRequest:
return handleInitRequest(sender, params);
case InitData:
return handleInitData(sender, params);
+ case HeartBeat:
+ return;
default:
- qWarning() << "received undefined CallType" << call.toInt();
+ qWarning() << "SignalProxy::receivePeerSignal(): received undefined CallType" << callType << params;
return;
}
}
QByteArray signal = params.takeFirst().toByteArray();
if(!_syncSlave.contains(className) || !_syncSlave[className].contains(objectName)) {
- qWarning() << QString("no registered receiver for sync call: %s::%s (objectName=\"%s\"). 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(signal)).arg(objectName)
<< params;
return;
}
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)
+ qWarning() << QString("no matching slot for sync call: %1::%2 (objectName=\"%3\"). Params are:").arg(QString(className)).arg(QString(signal)).arg(objectName)
<< params;
return;
}
<< obj->objectName()
<< initData(obj);
- dispatchSignal(sender, (int)InitData, params_);
+ dispatchSignal(sender, InitData, params_);
}
void SignalProxy::handleInitData(QIODevice *sender, const QVariantList ¶ms) {
? params.count()
: args.count();
- if(minArgCount(receiver, methodId) < params.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;
+
+ void *_a[] = {0, // return type
+ 0, 0, 0, 0 , 0, // and 10 args - that's the max size qt can handle with signals and slots
+ 0, 0, 0, 0 , 0};
// check for argument compatibility and build params array
for(int i = 0; i < numArgs; i++) {
+ if(!params[i].isValid()) {
+ qWarning() << "SignalProxy::invokeSlot(): received invalid data for argument number" << i << "of method" << QString("%1::%2()").arg(receiver->metaObject()->className()).arg(receiver->metaObject()->method(methodId).signature());
+ qWarning() << " - make sure all your data types are known by the Qt MetaSystem";
+ return false;
+ }
if(args[i] != QMetaType::type(params[i].typeName())) {
qWarning() << "SignalProxy::invokeSlot(): incompatible param types to invoke" << methodName(receiver, methodId);
return false;
invokeSlot(obj, updatedRemotelyId(obj));
}
+void SignalProxy::sendHeartBeat() {
+ dispatchSignal(SignalProxy::HeartBeat, QVariantList());
+}
+
void SignalProxy::dumpProxyStats() {
QString mode;
if(proxyMode() == Server)
projects / quassel.git / blobdiff