X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.cpp;h=411c8dae3a2f6db7ead13637a99f2e2a11245299;hp=7aab0252543258799c9b5a1549d9836e03fcfa29;hb=8ec76e512d20ce5d1dc76de556bb98a06b75d695;hpb=dcc90a564e00e206f05db224f1654c8907f149f4

diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp
index 7aab0252..411c8dae 100644
--- a/src/common/signalproxy.cpp
+++ b/src/common/signalproxy.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   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  *
@@ -19,6 +19,7 @@
  ***************************************************************************/
 
 #include "signalproxy.h"
+
 #include <QObject>
 #include <QIODevice>
 #include <QAbstractSocket>
@@ -29,8 +30,10 @@
 #include <QDebug>
 #include <QMetaMethod>
 #include <QMetaProperty>
-#include <QMutexLocker>
 #include <QRegExp>
+#include <QThread>
+
+#include "syncableobject.h"
 #include "util.h"
 
 class SignalRelay: public QObject {
@@ -51,6 +54,8 @@ public:
   int sigCount() const;
   
 private:
+  bool isSyncMethod(int i);
+  
   SignalProxy* proxy;
   QObject* caller;
   QMultiHash<int, QByteArray> sigNames;
@@ -63,7 +68,7 @@ SignalRelay::SignalRelay(SignalProxy* parent, QObject* source)
     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) {
@@ -75,46 +80,81 @@ 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++;
       }
-      if(synchronize() && proxy->syncMap(caller).contains(_id)) {
-	// qDebug() << "__SYNC__ >>>"
-	// 	 << caller->metaObject()->className()
-	// 	 << caller->objectName()
-	// 	 << proxy->methodName(caller, _id)
-	// 	 << params;
-	params.prepend(QVariant(_id));
-	params.prepend(caller->objectName());
-	params.prepend(caller->metaObject()->className());
-	proxy->dispatchSignal((int)SignalProxy::Sync, params);
+      
+      // dispatch Sync Signal if necessary
+      QByteArray signature(caller->metaObject()->method(_id).signature());
+      SyncableObject *syncObject = qobject_cast<SyncableObject *>(caller);
+      if(synchronize() && proxy->syncMap(syncObject).contains(signature)) {
+	 //qDebug() << "__SYNC__ >>>"
+	 //	 << caller->metaObject()->className()
+	 //	 << caller->objectName()
+	 //	 << signature
+	 //	 << params;
+	// params.prepend(QVariant(_id));
+	params.prepend(signature);
+	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) {
-  QHash<int, int>::const_iterator iter = proxy->syncMap(caller).constBegin();
+  SyncableObject *syncObject = qobject_cast<SyncableObject *>(caller);
+  if(!syncObject)
+    return;
+
+  const QMetaObject *meta = syncObject->syncMetaObject();
   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) {
+  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"))
+    return true;
+
+  if(proxy->proxyMode() == SignalProxy::Client && signature.contains("Requested"))
+    return true;
+
+  return false;
+}
+
 bool SignalRelay::synchronize() const {
   return _sync;
 }
@@ -169,6 +209,12 @@ SignalProxy::~SignalProxy() {
   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) {
@@ -190,10 +236,15 @@ SignalProxy::ProxyMode SignalProxy::proxyMode() const {
 }
 
 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) {
@@ -227,35 +278,9 @@ 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);
-}
-
-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) {
-  QMutexLocker locker(&slaveMutex);
-  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;
   }
 
@@ -275,15 +300,7 @@ void SignalProxy::removePeer(QIODevice* 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);
 
   disconnect(iodev, 0, this, 0);
@@ -293,8 +310,36 @@ void SignalProxy::removePeer(QIODevice* iodev) {
     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) {
+  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();
@@ -306,30 +351,64 @@ void SignalProxy::setArgTypes(QObject* obj, int methodId) {
 }
 
 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(QObject *obj) {
-  const QMetaObject *meta = obj->metaObject();
-  QHash<int, int> syncMap;
+void SignalProxy::setSyncMap(SyncableObject *obj) {
+  const QMetaObject *meta = obj->syncMetaObject();
+  QHash<QByteArray, int> syncMap;
   
   QList<int> slotIndexes;
   for(int i = 0; i < meta->methodCount(); i++) {
@@ -337,6 +416,15 @@ void SignalProxy::setSyncMap(QObject *obj) {
       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++) {
@@ -354,7 +442,7 @@ void SignalProxy::setSyncMap(QObject *obj) {
     }
     if(matchIdx != -1) {
       slotIndexes.removeAt(slotIndexes.indexOf(matchIdx));
-      syncMap[signalIdx] = matchIdx;
+      syncMap[QByteArray(signal.signature())] = matchIdx;
     }
   }
 
@@ -362,20 +450,102 @@ void SignalProxy::setSyncMap(QObject *obj) {
   _classInfo[meta]->syncMap = syncMap;
 }
 
-const QHash<int,int> &SignalProxy::syncMap(QObject *obj) {
-  Q_ASSERT(_classInfo.contains(obj->metaObject()));
-  if(_classInfo[obj->metaObject()]->syncMap.isEmpty())
+const QHash<QByteArray,int> &SignalProxy::syncMap(SyncableObject *obj) {
+  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;  
+}
+
+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->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()))
-    _classInfo[obj->metaObject()] = new ClassInfo();
+  const QMetaObject *meta = metaObject(obj);
+  if(_classInfo.contains(meta))
+    return;
+
+  ClassInfo *classInfo = new ClassInfo();
+  _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) {
@@ -411,108 +581,71 @@ bool SignalProxy::attachSlot(const QByteArray& sigName, QObject* recv, const cha
   _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) {
-  if(proxyMode() == Server)
-    return synchronizeAsMaster(obj);
-  else
-    return synchronizeAsSlave(obj);
-}
-
-void SignalProxy::synchronizeAsMaster(QObject *sender) {
-  createClassInfo(sender);
-
+void SignalProxy::synchronize(SyncableObject *obj) {
+  createClassInfo(obj);
+  setUpdatedRemotelyId(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);
-
-  QByteArray className(sender->metaObject()->className());
-  _syncSlave[className][sender->objectName()] = sender;
+  // attaching as slave to receive sync Calls
+  QByteArray className(obj->syncMetaObject()->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);
-
-  requestInit(receiver);
+  if(proxyMode() == Server) {
+    connect(obj, SIGNAL(objectRenamed(QString, QString)), this, SLOT(objectRenamed(QString, QString)));
+    setInitialized(obj);
+  } else {
+    requestInit(obj);
+  }
 }
 
-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()
+  params << obj->syncMetaObject()->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) {
@@ -522,7 +655,7 @@ void SignalProxy::_detachSlots(QObject* receiver) {
   }
 }
 
-void SignalProxy::_stopSync(QObject* obj) {
+void SignalProxy::stopSync(SyncableObject* obj) {
   if(_relayHash.contains(obj))
     _relayHash[obj]->setSynchronize(false);
 
@@ -530,7 +663,7 @@ void SignalProxy::_stopSync(QObject* obj) {
   // 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;
     }
@@ -538,17 +671,17 @@ void SignalProxy::_stopSync(QObject* obj) {
   }
 }
 
-void SignalProxy::dispatchSignal(QIODevice *receiver, const QVariant &identifier, const QVariantList &params) {
+void SignalProxy::dispatchSignal(QIODevice *receiver, const RequestType &requestType, const QVariantList &params) {
   QVariantList packedFunc;
-  packedFunc << identifier;
+  packedFunc << (qint16)requestType;
   packedFunc << params;
   writeDataToDevice(receiver, QVariant(packedFunc));
 }
 
-void SignalProxy::dispatchSignal(const QVariant &identifier, const QVariantList &params) {
+void SignalProxy::dispatchSignal(const RequestType &requestType, const QVariantList &params) {
   // 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));
@@ -557,29 +690,36 @@ void SignalProxy::dispatchSignal(const QVariant &identifier, const QVariantList
 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);
+  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;
@@ -587,30 +727,43 @@ 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: %1::%2 (objectName=\"%3\"). 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;
+  SyncableObject *receiver = _syncSlave[className][objectName];
+  if(!syncMap(receiver).contains(signal)) {
+    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)[signalId];
-  if(!invokeSlot(receiver, slotId, params))
+  int slotId = syncMap(receiver)[signal];
+
+  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));
 }
 
 void SignalProxy::handleInitRequest(QIODevice *sender, const QVariantList &params) {
@@ -635,20 +788,20 @@ void SignalProxy::handleInitRequest(QIODevice *sender, const QVariantList &param
     return;
   }
   
-  QObject *obj = _syncSlave[className][objectName];
+  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 &params) {
   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;
   }
@@ -658,18 +811,18 @@ void SignalProxy::handleInitData(QIODevice *sender, const QVariantList &params)
   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);
 }
 
@@ -686,12 +839,55 @@ void SignalProxy::handleSignal(const QByteArray &funcName, const QVariantList &p
   }
 }
 
+bool SignalProxy::invokeSlot(QObject *receiver, int methodId, const QVariantList &params, QVariant &returnValue) {
+  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());
+  }
+
+  if(returnValue.type() != QVariant::Invalid)
+    _a[0] = const_cast<void *>(returnValue.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";
+    // note to self: qmetaobject.cpp:990 ff
+    return false;
+  }
+  
+}
+
 bool SignalProxy::invokeSlot(QObject *receiver, int methodId, const QVariantList &params) {
-  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]);
+  QVariant ret;
+  return invokeSlot(receiver, methodId, params, ret);
 }
 
 void SignalProxy::dataAvailable() {
@@ -768,62 +964,20 @@ QString SignalProxy::methodBaseName(const QMetaMethod &method) {
   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() {
@@ -850,14 +1004,20 @@ 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();
 
-  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++;
+//   }
 }