Added some featues to the SignalProxy. Now SyncSlaves can request that objects residi...

[quassel.git] / src / common / signalproxy.cpp

diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp
index 7aab025..0af4fdc 100644 (file)
--- a/src/common/signalproxy.cpp
+++ b/src/common/signalproxy.cpp
@@ -51,6 +51,8 @@ public:
   int sigCount() const;
   
 private:
+  bool isSyncMethod(int i);
+  
   SignalProxy* proxy;
   QObject* caller;
   QMultiHash<int, QByteArray> sigNames;
@@ -82,13 +84,17 @@ int SignalRelay::qt_metacall(QMetaObject::Call _c, int _id, void **_a) {
         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);
@@ -100,21 +106,37 @@ int SignalRelay::qt_metacall(QMetaObject::Call _c, int _id, void **_a) {
 }
 
 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;
 }
@@ -329,7 +351,7 @@ const QByteArray &SignalProxy::methodName(QObject *obj, int 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++) {
@@ -354,7 +376,7 @@ void SignalProxy::setSyncMap(QObject *obj) {
     }
     if(matchIdx != -1) {
       slotIndexes.removeAt(slotIndexes.indexOf(matchIdx));
-      syncMap[signalIdx] = matchIdx;
+      syncMap[QByteArray(signal.signature())] = matchIdx;
     }
   }
 
@@ -362,7 +384,7 @@ void SignalProxy::setSyncMap(QObject *obj) {
   _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);
@@ -416,39 +438,29 @@ bool SignalProxy::attachSlot(const QByteArray& sigName, QObject* recv, const cha
 }
 
 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)), Qt::DirectConnection);
+  // attaching as slave to receive sync Calls
+  QByteArray className(obj->metaObject()->className());
+  _syncSlave[className][obj->objectName()] = obj;
 
-  QByteArray className(sender->metaObject()->className());
-  _syncSlave[className][sender->objectName()] = sender;
+  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);
 
-  setInitialized(sender);
-}
-
-void SignalProxy::synchronizeAsSlave(QObject *receiver) {
-  QByteArray className(receiver->metaObject()->className());
-  _syncSlave[className][receiver->objectName()] = receiver;
-  
-  createClassInfo(receiver);
-
-  requestInit(receiver);
+    setInitialized(obj);
+  } else {
+    requestInit(obj);
+  }
 }
 
 void SignalProxy::setInitialized(QObject *obj) {
@@ -587,28 +599,22 @@ void SignalProxy::handleSync(QVariantList params) {
   
   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];
+  int slotId = syncMap(receiver)[signal];
   if(!invokeSlot(receiver, slotId, params))
     qWarning("SignalProxy::handleSync(): invokeMethod for \"%s\" failed ", methodName(receiver, slotId).constData());
 }
@@ -854,10 +860,16 @@ void SignalProxy::dumpSyncMap(QObject *object) {
   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++;
+//   }
 }