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++;
}
// dispatch Sync Signal if necessary
QByteArray signature(caller->metaObject()->method(_id).signature());
- if(synchronize() && proxy->syncMap(qobject_cast<SyncableObject *>(caller)).contains(signature)) {
+ SyncableObject *syncObject = qobject_cast<SyncableObject *>(caller);
+ if(synchronize() && proxy->syncMap(syncObject).contains(signature)) {
//qDebug() << "__SYNC__ >>>"
// << caller->metaObject()->className()
// << caller->objectName()
// << params;
// params.prepend(QVariant(_id));
params.prepend(signature);
- params.prepend(caller->objectName());
- params.prepend(caller->metaObject()->className());
- proxy->dispatchSignal((int)SignalProxy::Sync, params);
+ params.prepend(syncObject->objectName());
+ params.prepend(syncObject->syncMetaObject()->className());
+ proxy->dispatchSignal(SignalProxy::Sync, params);
}
}
- _id -= 1;
+ _id -= QObject::staticMetaObject.methodCount();
}
return _id;
}
void SignalRelay::setSynchronize(bool sync) {
- const QMetaObject *meta = caller->metaObject();
+ SyncableObject *syncObject = qobject_cast<SyncableObject *>(caller);
+ if(!syncObject)
+ return;
+
+ const QMetaObject *meta = syncObject->syncMetaObject();
if(!_sync && sync) {
// enable Sync
for(int i = 0; i < meta->methodCount(); i++ ) {
}
bool SignalRelay::isSyncMethod(int i) {
- QByteArray signature = caller->metaObject()->method(i).signature();
- if(!proxy->syncMap(qobject_cast<SyncableObject *>(caller)).contains(signature))
+ SyncableObject *syncObject = qobject_cast<SyncableObject *>(caller);
+ if(!syncObject)
+ return false;
+
+ QByteArray signature = syncObject->syncMetaObject()->method(i).signature();
+ if(!proxy->syncMap(syncObject).contains(signature))
return false;
if(proxy->proxyMode() == SignalProxy::Server && !signature.contains("Requested"))
sigNames.insert(methodId, fn);
}
// ====================
-// END SIGNALRELAY
+// /SIGNALRELAY
// ====================
QList<QObject*> senders = _relayHash.keys();
foreach(QObject* sender, senders)
detachObject(sender);
+
+ // close peer connections
+ foreach(QIODevice *device, _peers.keys()) {
+ device->close();
+ delete device;
+ }
}
void SignalProxy::setProxyMode(ProxyMode mode) {
- foreach(QIODevice* peer, _peerByteCount.keys()) {
+ foreach(QIODevice* peer, _peers.keys()) {
if(peer->isOpen()) {
qWarning() << "SignalProxy: Cannot change proxy mode while connected";
return;
}
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) {
if(!iodev)
return false;
- if(_peerByteCount.contains(iodev))
+ if(_peers.contains(iodev))
return true;
- if(proxyMode() == Client && !_peerByteCount.isEmpty()) {
+ if(proxyMode() == Client && !_peers.isEmpty()) {
qWarning("SignalProxy: only one peer allowed in client mode!");
return false;
}
connect(sock, SIGNAL(disconnected()), this, SLOT(removePeerBySender()));
}
- _peerByteCount[iodev] = 0;
+ _peers[iodev] = peerInfo();
+ if(iodev->property("UseCompression").toBool())
+ _peers[iodev].usesCompression = true;
- if(_peerByteCount.count() == 1)
+ if(_peers.count() == 1)
emit connected();
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!";
+ if(_peers.isEmpty()) {
+ qWarning() << "SignalProxy::removePeer(): No peers in use!";
return;
}
if(proxyMode() == Server && !iodev) {
// disconnect all
- QList<QIODevice *> peers = _peerByteCount.keys();
+ QList<QIODevice *> peers = _peers.keys();
foreach(QIODevice *peer, peers)
removePeer(peer);
}
if(proxyMode() != Server && !iodev)
- iodev = _peerByteCount.keys().first();
+ iodev = _peers.keys().first();
Q_ASSERT(iodev);
- if(!_peerByteCount.contains(iodev)) {
+ if(!_peers.contains(iodev)) {
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);
+
+ _peers.remove(iodev);
disconnect(iodev, 0, this, 0);
emit peerRemoved(iodev);
- if(_peerByteCount.isEmpty())
+ if(_peers.isEmpty())
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...
+ // this Slot is not triggered by destroyed, so the object is still alive and can be used!
+ QIODevice *ioDev = (QIODevice *)(sender());
+ removePeer(ioDev);
+}
+
+void SignalProxy::objectRenamed(const QString &newname, const QString &oldname) {
+ SyncableObject *syncObject = qobject_cast<SyncableObject *>(sender());
+ const QMetaObject *meta = syncObject->metaObject();
+ const QByteArray className(meta->className());
+ objectRenamed(className, newname, oldname);
+
+ 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();
+ const QMetaObject *meta = metaObject(obj);
QList<QByteArray> p = meta->method(methodId).parameterTypes();
QList<int> argTypes;
int ct = p.count();
}
const QList<int> &SignalProxy::argTypes(QObject *obj, int methodId) {
- Q_ASSERT(_classInfo.contains(obj->metaObject()));
- if(!_classInfo[obj->metaObject()]->argTypes.contains(methodId))
+ const QMetaObject *meta = metaObject(obj);
+ Q_ASSERT(_classInfo.contains(meta));
+ if(!_classInfo[meta]->argTypes.contains(methodId))
setArgTypes(obj, methodId);
- return _classInfo[obj->metaObject()]->argTypes[methodId];
+ return _classInfo[meta]->argTypes[methodId];
+}
+
+void SignalProxy::setReturnType(QObject *obj, int methodId) {
+ const QMetaObject *meta = metaObject(obj);
+ int returnType = QMetaType::type(meta->method(methodId).typeName());
+
+ Q_ASSERT(!_classInfo[meta]->returnType.contains(methodId));
+ _classInfo[meta]->returnType[methodId] = returnType;
+}
+
+const int &SignalProxy::returnType(QObject *obj, int methodId) {
+ const QMetaObject *meta = metaObject(obj);
+ Q_ASSERT(_classInfo.contains(meta));
+ if(!_classInfo[meta]->returnType.contains(methodId))
+ setReturnType(obj, methodId);
+ return _classInfo[meta]->returnType[methodId];
+}
+
+void SignalProxy::setMinArgCount(QObject *obj, int methodId) {
+ const QMetaObject *meta = metaObject(obj);
+ 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) {
+ const QMetaObject *meta = metaObject(obj);
+ Q_ASSERT(_classInfo.contains(meta));
+ if(!_classInfo[meta]->minArgCount.contains(methodId))
+ setMinArgCount(obj, methodId);
+ return _classInfo[meta]->minArgCount[methodId];
}
void SignalProxy::setMethodName(QObject *obj, int methodId) {
- const QMetaObject *meta = obj->metaObject();
+ const QMetaObject *meta = metaObject(obj);
QByteArray method(::methodName(meta->method(methodId)));
Q_ASSERT(!_classInfo[meta]->methodNames.contains(methodId));
_classInfo[meta]->methodNames[methodId] = method;
}
const QByteArray &SignalProxy::methodName(QObject *obj, int methodId) {
- Q_ASSERT(_classInfo.contains(obj->metaObject()));
- if(!_classInfo[obj->metaObject()]->methodNames.contains(methodId))
+ const QMetaObject *meta = metaObject(obj);
+ Q_ASSERT(_classInfo.contains(meta));
+ if(!_classInfo[meta]->methodNames.contains(methodId))
setMethodName(obj, methodId);
- return _classInfo[obj->metaObject()]->methodNames[methodId];
+ return _classInfo[meta]->methodNames[methodId];
}
void SignalProxy::setSyncMap(SyncableObject *obj) {
- const QMetaObject *meta = obj->metaObject();
+ const QMetaObject *meta = obj->syncMetaObject();
QHash<QByteArray, int> syncMap;
QList<int> slotIndexes;
slotIndexes << i;
}
+ // we're faking sync pairs for sync replies
+ QByteArray slotSignature;
+ foreach(int slotIdx, slotIndexes) {
+ slotSignature = QByteArray(meta->method(slotIdx).signature());
+ if(!slotSignature.startsWith("receive"))
+ continue;
+ syncMap[slotSignature] = slotIdx;
+ }
+
QMetaMethod signal, slot;
int matchIdx;
for(int signalIdx = 0; signalIdx < meta->methodCount(); signalIdx++) {
}
const QHash<QByteArray,int> &SignalProxy::syncMap(SyncableObject *obj) {
- Q_ASSERT(_classInfo.contains(obj->metaObject()));
- if(_classInfo[obj->metaObject()]->syncMap.isEmpty())
+ const QMetaObject *meta = obj->syncMetaObject();
+ Q_ASSERT(_classInfo.contains(meta));
+ if(_classInfo[meta]->syncMap.isEmpty())
setSyncMap(obj);
- return _classInfo[obj->metaObject()]->syncMap;
+ return _classInfo[meta]->syncMap;
+}
+
+void SignalProxy::setReceiveMap(SyncableObject *obj) {
+ const QMetaObject *meta = obj->syncMetaObject();
+ Q_ASSERT(_classInfo.contains(meta));
+
+ QHash<int, int> receiveMap;
+
+ QMetaMethod requestSlot;
+ QByteArray returnTypeName;
+ QByteArray signature;
+ QByteArray methodName;
+ QByteArray params;
+ int paramsPos;
+ int receiverId;
+ const int methodCount = meta->methodCount();
+ for(int i = 0; i < methodCount; i++) {
+ requestSlot = meta->method(i);
+ if(requestSlot.methodType() != QMetaMethod::Slot)
+ continue;
+
+ returnTypeName = requestSlot.typeName();
+ if(QMetaType::Void == (QMetaType::Type)returnType(obj, i))
+ continue;
+
+ signature = QByteArray(requestSlot.signature());
+ if(!signature.startsWith("request"))
+ continue;
+
+ paramsPos = signature.indexOf('(');
+ if(paramsPos == -1)
+ continue;
+
+ methodName = signature.left(paramsPos);
+ params = signature.mid(paramsPos);
+
+ methodName = methodName.replace("request", "receive");
+ params = params.left(params.count() - 1) + ", " + returnTypeName + ")";
+
+ signature = QMetaObject::normalizedSignature(methodName + params);
+ receiverId = meta->indexOfSlot(signature);
+
+ if(receiverId == -1) {
+ signature = QMetaObject::normalizedSignature(methodName + "(" + returnTypeName + ")");
+ receiverId = meta->indexOfSlot(signature);
+ }
+
+ if(receiverId != -1)
+ receiveMap[i] = receiverId;
+ }
+ _classInfo[meta]->receiveMap = receiveMap;
}
-void SignalProxy::setUpdatedRemotelyId(QObject *obj) {
- const QMetaObject *meta = obj->metaObject();
+const QHash<int, int> &SignalProxy::receiveMap(SyncableObject *obj) {
+ const QMetaObject *meta = obj->syncMetaObject();
+ Q_ASSERT(_classInfo.contains(meta));
+ if(_classInfo[meta]->receiveMap.isEmpty())
+ setReceiveMap(obj);
+ return _classInfo[meta]->receiveMap;
+}
+
+void SignalProxy::setUpdatedRemotelyId(SyncableObject *obj) {
+ const QMetaObject *meta = obj->syncMetaObject();
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;
+ Q_ASSERT(_classInfo.contains(obj->syncMetaObject()));
+ return _classInfo[obj->syncMetaObject()]->updatedRemotelyId;
+}
+
+const QMetaObject *SignalProxy::metaObject(QObject *obj) {
+ if(SyncableObject *syncObject = qobject_cast<SyncableObject *>(obj))
+ return syncObject->syncMetaObject();
+ else
+ return obj->metaObject();
}
void SignalProxy::createClassInfo(QObject *obj) {
- if(_classInfo.contains(obj->metaObject()))
+ const QMetaObject *meta = metaObject(obj);
+ if(_classInfo.contains(meta))
return;
ClassInfo *classInfo = new ClassInfo();
- _classInfo[obj->metaObject()] = classInfo;
- setUpdatedRemotelyId(obj);
+ _classInfo[meta] = classInfo;
}
bool SignalProxy::attachSignal(QObject* sender, const char* signal, const QByteArray& sigName) {
- const QMetaObject* meta = sender->metaObject();
+ const QMetaObject* meta = metaObject(sender);
QByteArray sig(meta->normalizedSignature(signal).mid(1));
int methodId = meta->indexOfMethod(sig.constData());
if(methodId == -1 || meta->method(methodId).methodType() != QMetaMethod::Signal) {
void SignalProxy::synchronize(SyncableObject *obj) {
createClassInfo(obj);
-
+ setUpdatedRemotelyId(obj);
+
// attaching all the Signals
SignalRelay* relay;
if(_relayHash.contains(obj))
relay->setSynchronize(true);
// attaching as slave to receive sync Calls
- QByteArray className(obj->metaObject()->className());
+ QByteArray className(obj->syncMetaObject()->className());
_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);
return;
QVariantList params;
- params << obj->metaObject()->className()
+ params << obj->syncMetaObject()->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) {
+ Q_ASSERT(_peers.contains(receiver));
QVariantList packedFunc;
- packedFunc << identifier;
+ packedFunc << (qint16)requestType;
packedFunc << params;
- writeDataToDevice(receiver, QVariant(packedFunc));
+ writeDataToDevice(receiver, QVariant(packedFunc), _peers[receiver].usesCompression);
}
-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));
+ foreach(QIODevice* dev, _peers.keys()) {
+ Q_ASSERT(_peers.contains(dev));
+ writeDataToDevice(dev, QVariant(packedFunc), _peers[dev].usesCompression);
+ }
}
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);
+ return handleSync(sender, 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;
}
}
-void SignalProxy::handleSync(QVariantList params) {
+void SignalProxy::handleSync(QIODevice *sender, QVariantList params) {
if(params.count() < 3) {
qWarning() << "received invalid Sync call" << 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;
}
int slotId = syncMap(receiver)[signal];
- if(!invokeSlot(receiver, slotId, params)) {
+
+ QVariant returnValue((QVariant::Type)returnType(receiver, slotId));
+ if(!invokeSlot(receiver, slotId, params, returnValue)) {
qWarning("SignalProxy::handleSync(): invokeMethod for \"%s\" failed ", methodName(receiver, slotId).constData());
return;
}
+
+ if(returnValue.type() != QVariant::Invalid && receiveMap(receiver).contains(slotId)) {
+ int receiverId = receiveMap(receiver)[slotId];
+ QVariantList returnParams;
+ returnParams << className
+ << objectName
+ << QByteArray(receiver->metaObject()->method(receiverId).signature());
+ if(argTypes(receiver, receiverId).count() > 1)
+ returnParams << params;
+ returnParams << returnValue;
+ dispatchSignal(sender, Sync, returnParams);
+ }
+
+ // send emit update signal
invokeSlot(receiver, updatedRemotelyId(receiver));
}
SyncableObject *obj = _syncSlave[className][objectName];
QVariantList params_;
- params_ << obj->metaObject()->className()
- << obj->objectName()
+ params_ << className
+ << objectName
<< initData(obj);
- dispatchSignal(sender, (int)InitData, params_);
+ dispatchSignal(sender, InitData, params_);
}
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;
}
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;
}
}
}
-bool SignalProxy::invokeSlot(QObject *receiver, int methodId, const QVariantList ¶ms) {
+bool SignalProxy::invokeSlot(QObject *receiver, int methodId, const QVariantList ¶ms, QVariant &returnValue) {
const QList<int> args = argTypes(receiver, methodId);
- const int numArgs = args.count();
+ const int numArgs = params.count() < args.count()
+ ? params.count()
+ : args.count();
- if(numArgs < 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;
_a[i+1] = const_cast<void *>(params[i].constData());
}
+ if(returnValue.type() != QVariant::Invalid)
+ _a[0] = const_cast<void *>(returnValue.constData());
Qt::ConnectionType type = QThread::currentThread() == receiver->thread()
? 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
+ // note to self: qmetaobject.cpp:990 ff
return false;
}
}
+bool SignalProxy::invokeSlot(QObject *receiver, int methodId, const QVariantList ¶ms) {
+ QVariant ret;
+ return invokeSlot(receiver, methodId, params, ret);
+}
+
void SignalProxy::dataAvailable() {
// yet again. it's a private slot. no need for checks.
QIODevice* ioDev = qobject_cast<QIODevice* >(sender());
+ Q_ASSERT(_peers.contains(ioDev));
QVariant var;
- while(readDataFromDevice(ioDev, _peerByteCount[ioDev], var))
+ while(readDataFromDevice(ioDev, _peers[ioDev].byteCount, var, _peers[ioDev].usesCompression))
receivePeerSignal(ioDev, var);
}
-void SignalProxy::writeDataToDevice(QIODevice *dev, const QVariant &item) {
+void SignalProxy::writeDataToDevice(QIODevice *dev, const QVariant &item, bool compressed) {
QAbstractSocket* sock = qobject_cast<QAbstractSocket*>(dev);
if(!dev->isOpen() || (sock && sock->state()!=QAbstractSocket::ConnectedState)) {
qWarning("SignalProxy: Can't call on a closed device");
return;
}
+
QByteArray block;
QDataStream out(&block, QIODevice::WriteOnly);
out.setVersion(QDataStream::Qt_4_2);
- out << (quint32)0 << item;
- out.device()->seek(0);
- out << (quint32)(block.size() - sizeof(quint32));
+
+ if(compressed) {
+ QByteArray rawItem;
+ QDataStream itemStream(&rawItem, QIODevice::WriteOnly);
+
+ itemStream.setVersion(QDataStream::Qt_4_2);
+ itemStream << item;
+
+ rawItem = qCompress(rawItem);
+
+ out << (quint32)rawItem.size() << rawItem;
+ } else {
+ out << (quint32)0 << item;
+ out.device()->seek(0);
+ out << (quint32)(block.size() - sizeof(quint32));
+ }
+
dev->write(block);
}
-bool SignalProxy::readDataFromDevice(QIODevice *dev, quint32 &blockSize, QVariant &item) {
+bool SignalProxy::readDataFromDevice(QIODevice *dev, quint32 &blockSize, QVariant &item, bool compressed) {
QDataStream in(dev);
in.setVersion(QDataStream::Qt_4_2);
if(dev->bytesAvailable() < blockSize)
return false;
- in >> item;
+
+ if(compressed) {
+ QByteArray rawItem;
+ in >> rawItem;
+ rawItem = qUncompress(rawItem);
+
+ QDataStream itemStream(&rawItem, QIODevice::ReadOnly);
+ itemStream.setVersion(QDataStream::Qt_4_2);
+ itemStream >> item;
+ } else {
+ in >> item;
+ }
+
blockSize = 0;
+
return true;
}
QString methodname = QString(method.signature()).section("(", 0, 0);
// determine where we have to chop:
+ int upperCharPos;
if(method.methodType() == QMetaMethod::Slot) {
// we take evertyhing from the first uppercase char if it's slot
- methodname = methodname.mid(methodname.indexOf(QRegExp("[A-Z]")));
+ upperCharPos = methodname.indexOf(QRegExp("[A-Z]"));
+ if(upperCharPos == -1)
+ return QString();
+ methodname = methodname.mid(upperCharPos);
} else {
// and if it's a signal we discard everything from the last uppercase char
- methodname = methodname.left(methodname.lastIndexOf(QRegExp("[A-Z]")));
+ upperCharPos = methodname.lastIndexOf(QRegExp("[A-Z]"));
+ if(upperCharPos == -1)
+ return QString();
+ methodname = methodname.left(upperCharPos);
}
methodname[0] = methodname[0].toUpper();
return;
obj->fromVariantMap(properties);
setInitialized(obj);
+ invokeSlot(obj, updatedRemotelyId(obj));
+}
+
+void SignalProxy::sendHeartBeat() {
+ dispatchSignal(SignalProxy::HeartBeat, QVariantList());
}
void SignalProxy::dumpProxyStats() {
projects / quassel.git / blobdiff