***************************************************************************/
#include "signalproxy.h"
+
#include <QObject>
#include <QIODevice>
#include <QAbstractSocket>
#include <QDebug>
#include <QMetaMethod>
#include <QMetaProperty>
-#include <QMutexLocker>
#include <QRegExp>
+#include <QThread>
+
+#include "syncableobject.h"
#include "util.h"
class SignalRelay: public QObject {
caller(source),
_sync(false)
{
- QObject::connect(source, SIGNAL(destroyed()), parent, SLOT(detachSender()), Qt::DirectConnection);
+ QObject::connect(source, SIGNAL(destroyed()), parent, SLOT(detachSender()));
}
int SignalRelay::qt_metacall(QMetaObject::Call _c, int _id, void **_a) {
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(caller).contains(signature)) {
- // qDebug() << "__SYNC__ >>>"
- // << caller->metaObject()->className()
- // << caller->objectName()
- // << proxy->methodName(caller, _id)
- // << params;
+ if(synchronize() && proxy->syncMap(qobject_cast<SyncableObject *>(caller)).contains(signature)) {
+ //qDebug() << "__SYNC__ >>>"
+ // << caller->metaObject()->className()
+ // << caller->objectName()
+ // << signature
+ // << params;
// params.prepend(QVariant(_id));
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;
}
bool SignalRelay::isSyncMethod(int i) {
QByteArray signature = caller->metaObject()->method(i).signature();
- if(!proxy->syncMap(caller).contains(signature))
+ if(!proxy->syncMap(qobject_cast<SyncableObject *>(caller)).contains(signature))
return false;
- if(proxy->proxyMode() == SignalProxy::Server && !signature.startsWith("request"))
+ if(proxy->proxyMode() == SignalProxy::Server && !signature.contains("Requested"))
return true;
- if(proxy->proxyMode() == SignalProxy::Client && signature.startsWith("request"))
+ if(proxy->proxyMode() == SignalProxy::Client && signature.contains("Requested"))
return true;
return false;
}
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) {
// 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) {
return;
QVariantList params;
- params << className << oldname << newname;
- dispatchSignal("__objectRenamed__", params);
+ params << "__objectRenamed__" << className << oldname << newname;
+ dispatchSignal(RpcCall, params);
}
void SignalProxy::objectRenamed(QByteArray classname, QString oldname, QString newname) {
- 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::setMinArgCount(QObject *obj, int methodId) {
+ const QMetaObject *meta = obj->metaObject();
+ 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) {
+ Q_ASSERT(_classInfo.contains(obj->metaObject()));
+ if(!_classInfo[obj->metaObject()]->minArgCount.contains(methodId))
+ setMinArgCount(obj, methodId);
+ return _classInfo[obj->metaObject()]->minArgCount[methodId];
}
void SignalProxy::setMethodName(QObject *obj, int methodId) {
}
-void SignalProxy::setSyncMap(QObject *obj) {
+void SignalProxy::setSyncMap(SyncableObject *obj) {
const QMetaObject *meta = obj->metaObject();
QHash<QByteArray, int> syncMap;
_classInfo[meta]->syncMap = syncMap;
}
-const QHash<QByteArray,int> &SignalProxy::syncMap(QObject *obj) {
+const QHash<QByteArray,int> &SignalProxy::syncMap(SyncableObject *obj) {
Q_ASSERT(_classInfo.contains(obj->metaObject()));
if(_classInfo[obj->metaObject()]->syncMap.isEmpty())
setSyncMap(obj);
return _classInfo[obj->metaObject()]->syncMap;
}
+void SignalProxy::setUpdatedRemotelyId(QObject *obj) {
+ const QMetaObject *meta = obj->metaObject();
+ 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;
+}
+
void SignalProxy::createClassInfo(QObject *obj) {
if(_classInfo.contains(obj->metaObject()))
return;
ClassInfo *classInfo = new ClassInfo();
- classInfo->hasUpdateSignal = (obj->metaObject()->indexOfSignal(QMetaObject::normalizedSignature("updatedRemotely()")) != -1);
_classInfo[obj->metaObject()] = classInfo;
+ setUpdatedRemotelyId(obj);
}
bool SignalProxy::attachSignal(QObject* sender, const char* signal, const QByteArray& sigName) {
_attachedSlots.insert(funcName, qMakePair(recv, methodId));
QObject::disconnect(recv, SIGNAL(destroyed()), this, SLOT(detachSender()));
- QObject::connect(recv, SIGNAL(destroyed()), this, SLOT(detachSender()), Qt::DirectConnection);
+ QObject::connect(recv, SIGNAL(destroyed()), this, SLOT(detachSender()));
return true;
}
-void SignalProxy::synchronize(QObject *obj) {
+void SignalProxy::synchronize(SyncableObject *obj) {
createClassInfo(obj);
// attaching all the Signals
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);
+ connect(obj, SIGNAL(renameObject(QString, QString)), this, SLOT(objectRenamed(QString, QString)));
setInitialized(obj);
} else {
}
}
-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;
params << obj->metaObject()->className()
<< obj->objectName();
- dispatchSignal((int)InitRequest, params);
+ dispatchSignal(InitRequest, params);
}
void SignalProxy::detachSender() {
- // this is a private slot. the reason for that is, that we enfoce Qt::DirectConnection.
- // the result is, that we can be sure, that a registered receiver is removed immediately when it's destroyed.
- // since we're guarding the the internal datastructures with mutexes this means,
- // that the object destruction is deffered until we're finished delivering our sync/init/whatever request.
- // all in all: thread safety! *sigh*
detachObject(sender());
}
-// detachObject/Signals/Slots() can be called as a result of an incoming call
-// this might destroy our the iterator used for delivery
-// thus we wrap the actual disconnection by using QueuedConnections
void SignalProxy::detachObject(QObject* obj) {
- QMutexLocker locker(&slaveMutex);
- _detachSignals(obj);
- _detachSlots(obj);
- _stopSync(obj);
+ detachSignals(obj);
+ detachSlots(obj);
+ stopSync(static_cast<SyncableObject *>(obj));
}
void SignalProxy::detachSignals(QObject* sender) {
- QMutexLocker locker(&slaveMutex);
- _detachSignals(sender);
-}
-
-void SignalProxy::detachSlots(QObject* receiver) {
- QMutexLocker locker(&slaveMutex);
- _detachSlots(receiver);
-}
-
-void SignalProxy::stopSync(QObject* obj) {
- QMutexLocker locker(&slaveMutex);
- _stopSync(obj);
-}
-
-void SignalProxy::_detachSignals(QObject* sender) {
if(!_relayHash.contains(sender))
return;
_relayHash.take(sender)->deleteLater();
}
-void SignalProxy::_detachSlots(QObject* receiver) {
+void SignalProxy::detachSlots(QObject* receiver) {
SlotHash::iterator slotIter = _attachedSlots.begin();
while(slotIter != _attachedSlots.end()) {
if(slotIter.value().first == receiver) {
}
}
-void SignalProxy::_stopSync(QObject* obj) {
+void SignalProxy::stopSync(SyncableObject* obj) {
if(_relayHash.contains(obj))
_relayHash[obj]->setSynchronize(false);
// 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);
-
- // 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);
+ 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;
}
- 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)
+ qWarning() << QString("no matching slot for sync call: %1::%2 (objectName=\"%3\"). Params are:").arg(QString(className)).arg(QString(signal)).arg(objectName)
<< params;
return;
}
qWarning("SignalProxy::handleSync(): invokeMethod for \"%s\" failed ", methodName(receiver, slotId).constData());
return;
}
- if(hasUpdateSignal(receiver))
- QMetaObject::invokeMethod(receiver, "updatedRemotely");
+ invokeSlot(receiver, updatedRemotelyId(receiver));
}
void SignalProxy::handleInitRequest(QIODevice *sender, const QVariantList ¶ms) {
return;
}
- QObject *obj = _syncSlave[className][objectName];
+ SyncableObject *obj = _syncSlave[className][objectName];
QVariantList params_;
params_ << obj->metaObject()->className()
<< obj->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;
}
- QObject *obj = _syncSlave[className][objectName];
+ SyncableObject *obj = _syncSlave[className][objectName];
setInitData(obj, propertyMap);
}
}
bool SignalProxy::invokeSlot(QObject *receiver, int methodId, const QVariantList ¶ms) {
- int numParams = argTypes(receiver, methodId).count();
- QGenericArgument args[9];
- for(int i = 0; i < numParams; i++)
- args[i] = QGenericArgument(params[i].typeName(), params[i].constData());
- return QMetaObject::invokeMethod(receiver, methodName(receiver, methodId), args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8]);
+ const QList<int> args = argTypes(receiver, methodId);
+ const int numArgs = params.count() < args.count()
+ ? params.count()
+ : args.count();
+
+ if(minArgCount(receiver, methodId) > params.count()) {
+ qWarning() << "SignalProxy::invokeSlot(): not enough params to invoke" << methodName(receiver, methodId);
+ return false;
+ }
+
+ 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());
+ }
+
+
+ Qt::ConnectionType type = QThread::currentThread() == receiver->thread()
+ ? Qt::DirectConnection
+ : Qt::QueuedConnection;
+
+ if (type == 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
+ return false;
+ }
+
}
void SignalProxy::dataAvailable() {
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);
+ invokeSlot(obj, updatedRemotelyId(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::sendHeartBeat() {
+ dispatchSignal(SignalProxy::HeartBeat, QVariantList());
}
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();
projects / quassel.git / blobdiff