X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.cpp;h=f4fe0fb3ef01e7f23b6f91896f22a968376556c0;hp=c8f753da4bc90295cf4ba41cab026f03ddd4bd75;hb=9a7ec1bc5c61aeb53bf124231d10852797b98970;hpb=0ff076706c3d353ec9b098b1eca270195288774e

diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp
index c8f753da..f4fe0fb3 100644
--- a/src/common/signalproxy.cpp
+++ b/src/common/signalproxy.cpp
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   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  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -16,19 +16,10 @@
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************
- *   SignalProxy has been inspired by QxtRPCPeer, part of libqxt,          *
- *   the Qt eXTension Library <http://www.libqxt.org>. We would like to    *
- *   thank Arvid "aep" Picciani and Adam "ahigerd" Higerd for providing    *
- *   QxtRPCPeer, valuable input and the genius idea to (ab)use Qt's        *
- *   Meta Object System for transmitting signals over the network.         *
- *                                                                         *
- *   To make contribution back into libqxt possible, redistribution and    *
- *   modification of this file is additionally allowed under the terms of  *
- *   the Common Public License, version 1.0, as published by IBM.          *
  ***************************************************************************/
 
 #include "signalproxy.h"
+
 #include <QObject>
 #include <QIODevice>
 #include <QAbstractSocket>
@@ -38,6 +29,12 @@
 #include <QSet>
 #include <QDebug>
 #include <QMetaMethod>
+#include <QMetaProperty>
+#include <QRegExp>
+#include <QThread>
+
+#include "syncableobject.h"
+#include "util.h"
 
 class SignalRelay: public QObject {
 
@@ -51,18 +48,25 @@ public:
 
   void attachSignal(int methodId, const QByteArray &func);
 
+  void setSynchronize(bool);
+  bool synchronize() const;
+  
   int sigCount() const;
   
 private:
+  bool isSyncMethod(int i);
+  
   SignalProxy* proxy;
   QObject* caller;
   QMultiHash<int, QByteArray> sigNames;
+  bool _sync;
 };
 
 SignalRelay::SignalRelay(SignalProxy* parent, QObject* source)
   : QObject(parent),
     proxy(parent),
-    caller(source)
+    caller(source),
+    _sync(false)
 {
   QObject::connect(source, SIGNAL(destroyed()), parent, SLOT(detachSender()));
 }
@@ -72,23 +76,80 @@ int SignalRelay::qt_metacall(QMetaObject::Call _c, int _id, void **_a) {
   if(_id < 0)
     return _id;
   if(_c == QMetaObject::InvokeMetaMethod) {
-    if(sigNames.contains(_id)) {
+    if(sigNames.contains(_id) || synchronize()) {
       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->call(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)) {
+	 //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(SignalProxy::Sync, params);
+      }
     }
-    _id -= 1;
+    _id -= QObject::staticMetaObject.methodCount();
   }
   return _id;
 }
 
+void SignalRelay::setSynchronize(bool sync) {
+  const QMetaObject *meta = caller->metaObject();
+  if(!_sync && sync) {
+    // 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) {
+    // 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(qobject_cast<SyncableObject *>(caller)).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;
+}
+
 int SignalRelay::sigCount() const {
   // only for debuging purpose
   return sigNames.count();
@@ -117,21 +178,21 @@ void SignalRelay::attachSignal(int methodId, const QByteArray &func) {
 //  SignalProxy
 // ====================
 SignalProxy::SignalProxy(QObject* parent)
-  : QObject(parent),
-    _proxyMode(Client)
+  : QObject(parent)
 {
+  setProxyMode(Client);
 }
 
 SignalProxy::SignalProxy(ProxyMode mode, QObject* parent)
-  : QObject(parent),
-    _proxyMode(mode)
+  : QObject(parent)
 {
+  setProxyMode(mode);
 }
 
 SignalProxy::SignalProxy(ProxyMode mode, QIODevice* device, QObject* parent)
-  : QObject(parent),
-    _proxyMode(mode)
+  : QObject(parent)
 {
+  setProxyMode(mode);
   addPeer(device);
 } 
 
@@ -139,6 +200,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) {
@@ -149,13 +216,28 @@ void SignalProxy::setProxyMode(ProxyMode mode) {
     }
   }
   _proxyMode = mode;
+  if(mode == Server)
+    initServer();
+  else
+    initClient();
 }
 
-
 SignalProxy::ProxyMode SignalProxy::proxyMode() const {
   return _proxyMode;
 }
 
+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;
@@ -191,8 +273,31 @@ 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 << "__objectRenamed__" << className << oldname << newname;
+  dispatchSignal(RpcCall, params);
+}
+
+void SignalProxy::objectRenamed(QByteArray classname, QString oldname, QString newname) {
+  if(_syncSlave.contains(classname) && _syncSlave[classname].contains(oldname) && oldname != newname) {
+    SyncableObject *obj = _syncSlave[classname][newname] = _syncSlave[classname].take(oldname);
+    if(!obj->isInitialized())
+      requestInit(obj);
+  }
+}
+
+
 void SignalProxy::removePeer(QIODevice* iodev) {
   if(_peerByteCount.isEmpty()) {
     qWarning() << "SignalProxy: No peers in use!";
@@ -215,12 +320,12 @@ 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(var);
+      receivePeerSignal(iodev, var);
     else
       break;
   }
@@ -234,49 +339,114 @@ void SignalProxy::removePeer(QIODevice* iodev) {
 }
 
 void SignalProxy::setArgTypes(QObject* obj, int methodId) {
-  QList<QByteArray> p = obj->metaObject()->method(methodId).parameterTypes();
+  const QMetaObject *meta = obj->metaObject();
+  QList<QByteArray> p = meta->method(methodId).parameterTypes();
   QList<int> argTypes;
   int ct = p.count();
   for(int i=0; i<ct; i++)
     argTypes.append(QMetaType::type(p.value(i)));
 
-  const QByteArray &className(obj->metaObject()->className());
-  Q_ASSERT(_classInfo.contains(className));
-  Q_ASSERT(!_classInfo[className]->argTypes.contains(methodId));
-  _classInfo[className]->argTypes[methodId] = argTypes;
+  Q_ASSERT(!_classInfo[meta]->argTypes.contains(methodId));
+  _classInfo[meta]->argTypes[methodId] = argTypes;
 }
 
 const QList<int> &SignalProxy::argTypes(QObject *obj, int methodId) {
-  const QByteArray &className(obj->metaObject()->className());
-  Q_ASSERT(_classInfo.contains(className));
-  if(!_classInfo[className]->argTypes.contains(methodId))
+  Q_ASSERT(_classInfo.contains(obj->metaObject()));
+  if(!_classInfo[obj->metaObject()]->argTypes.contains(methodId))
     setArgTypes(obj, methodId);
-  return _classInfo[className]->argTypes[methodId];
+  return _classInfo[obj->metaObject()]->argTypes[methodId];
 }
 
-void SignalProxy::setMethodName(QObject *obj, int methodId) {
-  const QByteArray &className(obj->metaObject()->className());
-  QByteArray method = obj->metaObject()->method(methodId).signature();
-  method = method.left(method.indexOf('('));
+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];
+}
 
-  Q_ASSERT(_classInfo.contains(className));
-  Q_ASSERT(!_classInfo[className]->methodNames.contains(methodId));
-  _classInfo[className]->methodNames[methodId] = method;
+void SignalProxy::setMethodName(QObject *obj, int methodId) {
+  const QMetaObject *meta = obj->metaObject();
+  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) {
-  QByteArray className(obj->metaObject()->className());
-  Q_ASSERT(_classInfo.contains(className));
-  if(!_classInfo[className]->methodNames.contains(methodId))
+  Q_ASSERT(_classInfo.contains(obj->metaObject()));
+  if(!_classInfo[obj->metaObject()]->methodNames.contains(methodId))
     setMethodName(obj, methodId);
-  return _classInfo[className]->methodNames[methodId];
+  return _classInfo[obj->metaObject()]->methodNames[methodId];
 }
 
 
+void SignalProxy::setSyncMap(SyncableObject *obj) {
+  const QMetaObject *meta = obj->metaObject();
+  QHash<QByteArray, int> syncMap;
+  
+  QList<int> slotIndexes;
+  for(int i = 0; i < meta->methodCount(); i++) {
+    if(meta->method(i).methodType() == QMetaMethod::Slot)
+      slotIndexes << i;
+  }
+
+  QMetaMethod signal, slot;
+  int matchIdx;
+  for(int signalIdx = 0; signalIdx < meta->methodCount(); signalIdx++) {
+    signal = meta->method(signalIdx);
+    if(signal.methodType() != QMetaMethod::Signal)
+      continue;
+
+    matchIdx = -1;
+    foreach(int slotIdx, slotIndexes) {
+      slot = meta->method(slotIdx);
+      if(methodsMatch(signal, slot)) {
+	matchIdx = slotIdx;
+	break;
+      }
+    }
+    if(matchIdx != -1) {
+      slotIndexes.removeAt(slotIndexes.indexOf(matchIdx));
+      syncMap[QByteArray(signal.signature())] = matchIdx;
+    }
+  }
+
+  Q_ASSERT(_classInfo[meta]->syncMap.isEmpty());
+  _classInfo[meta]->syncMap = syncMap;
+}
+
+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) {
-  QByteArray className(obj->metaObject()->className());
-  if(!_classInfo.contains(className))
-    _classInfo[className] = new ClassInfo();
+  if(_classInfo.contains(obj->metaObject()))
+    return;
+
+  ClassInfo *classInfo = new ClassInfo();
+  _classInfo[obj->metaObject()] = classInfo;
+  setUpdatedRemotelyId(obj);
 }
 
 bool SignalProxy::attachSignal(QObject* sender, const char* signal, const QByteArray& sigName) {
@@ -320,41 +490,68 @@ bool SignalProxy::attachSlot(const QByteArray& sigName, QObject* recv, const cha
   return true;
 }
 
+void SignalProxy::synchronize(SyncableObject *obj) {
+  createClassInfo(obj);
+
+  // attaching all the Signals
+  SignalRelay* relay;
+  if(_relayHash.contains(obj))
+    relay = _relayHash[obj];
+  else
+    relay = _relayHash[obj] = new SignalRelay(this, obj);
+
+  relay->setSynchronize(true);
+
+  // attaching as slave to receive sync Calls
+  QByteArray className(obj->metaObject()->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)));
+
+    setInitialized(obj);
+  } else {
+    requestInit(obj);
+  }
+}
+
+void SignalProxy::setInitialized(SyncableObject *obj) {
+  obj->setInitialized();
+  emit objectInitialized(obj);
+}
+
+bool SignalProxy::isInitialized(SyncableObject *obj) const {
+  return obj->isInitialized();
+}
+
+void SignalProxy::requestInit(SyncableObject *obj) {
+  if(proxyMode() == Server || isInitialized(obj))
+    return;
+
+  QVariantList params;
+  params << obj->metaObject()->className()
+	 << obj->objectName();
+  dispatchSignal(InitRequest, params);
+}
 
 void SignalProxy::detachSender() {
-  // this is a slot so we can bypass the QueuedConnection
-  // and if someone is forcing direct connection in a multithreaded environment he's just nuts...
-  _detachSignals(sender());
-  _detachSlots(sender());
+  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) {
   detachSignals(obj);
   detachSlots(obj);
+  stopSync(static_cast<SyncableObject *>(obj));
 }
 
 void SignalProxy::detachSignals(QObject* sender) {
-  QMetaObject::invokeMethod(this, "_detachSignals",
-			    Qt::QueuedConnection,
-			    Q_ARG(QObject*, sender));
-}
-
-void SignalProxy::detachSlots(QObject* receiver) {
-  QMetaObject::invokeMethod(this, "_detachSlots",
-			    Qt::QueuedConnection,
-			    Q_ARG(QObject*, receiver));
-}
-
-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) {
@@ -364,49 +561,223 @@ void SignalProxy::_detachSlots(QObject* receiver) {
   }
 }
 
-void SignalProxy::call(const char*  signal, QVariant p1, QVariant p2, QVariant p3, QVariant p4, QVariant p5, QVariant p6, QVariant p7, QVariant p8, QVariant p9) {
-  QByteArray func = QMetaObject::normalizedSignature(signal);
-  QVariantList params;
-  params << p1 << p2 << p3 << p4 << p5 << p6 << p7 << p8 << p9;
-  call(func, params);
+void SignalProxy::stopSync(SyncableObject* obj) {
+  if(_relayHash.contains(obj))
+    _relayHash[obj]->setSynchronize(false);
+
+  // we can't use a className here, since it might be effed up, if we receive the call as a result of a decon
+  // 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()) && classIter.value()[obj->objectName()] == obj) {
+      classIter->remove(obj->objectName());
+      break;
+    }
+    classIter++;
+  }
 }
 
-void SignalProxy::call(const QByteArray &funcName, const QVariantList &params) {
+void SignalProxy::dispatchSignal(QIODevice *receiver, const RequestType &requestType, const QVariantList &params) {
   QVariantList packedFunc;
-  packedFunc << funcName;
+  packedFunc << (qint16)requestType;
+  packedFunc << params;
+  writeDataToDevice(receiver, QVariant(packedFunc));
+}
+
+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 << (qint16)requestType;
   packedFunc << params;
   foreach(QIODevice* dev, _peerByteCount.keys())
     writeDataToDevice(dev, QVariant(packedFunc));
 }
 
-void SignalProxy::receivePeerSignal(const QVariant &packedFunc) {
+void SignalProxy::receivePeerSignal(QIODevice *sender, const QVariant &packedFunc) {
   QVariantList params(packedFunc.toList());
-  QByteArray funcName = params.takeFirst().toByteArray();
-  int numParams, methodId;
-  QObject* receiver;
 
+  if(params.isEmpty()) {
+    qWarning() << "SignalProxy::receivePeerSignal(): received incompatible Data:" << packedFunc;
+    return;
+  }
+  
+  int callType = params.takeFirst().value<int>();
+
+  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() << "SignalProxy::receivePeerSignal(): received undefined CallType" << callType << params;
+    return;
+  }
+}
+
+void SignalProxy::handleSync(QVariantList params) {
+  if(params.count() < 3) {
+    qWarning() << "received invalid Sync call" << params;
+    return;
+  }
+  
+  QByteArray className = params.takeFirst().toByteArray();
+  QString objectName = params.takeFirst().toString();
+  QByteArray signal = params.takeFirst().toByteArray();
+
+  if(!_syncSlave.contains(className) || !_syncSlave[className].contains(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: %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)) {
+    qWarning("SignalProxy::handleSync(): invokeMethod for \"%s\" failed ", methodName(receiver, slotId).constData());
+    return;
+  }
+  invokeSlot(receiver, updatedRemotelyId(receiver));
+}
+
+void SignalProxy::handleInitRequest(QIODevice *sender, const QVariantList &params) {
+  if(params.count() != 2) {
+    qWarning() << "SignalProxy::handleInitRequest() received initRequest with invalid param Count:"
+	       << params;
+    return;
+  }
+  
+  QByteArray className(params[0].toByteArray());
+  QString objectName(params[1].toString());
+  
+  if(!_syncSlave.contains(className)) {
+    qWarning() << "SignalProxy::handleInitRequest() received initRequest for unregistered Class:"
+	       << className;
+    return;
+  }
+
+  if(!_syncSlave[className].contains(objectName)) {
+    qWarning() << "SignalProxy::handleInitRequest() received initRequest for unregistered Object:"
+	       << className << objectName;
+    return;
+  }
+  
+  SyncableObject *obj = _syncSlave[className][objectName];
+
+  QVariantList params_;
+  params_ << obj->metaObject()->className()
+	  << obj->objectName()
+	  << initData(obj);
+
+  dispatchSignal(sender, InitData, params_);
+}
+
+void SignalProxy::handleInitData(QIODevice *sender, const QVariantList &params) {
+  Q_UNUSED(sender)
+  if(params.count() != 3) {
+    qWarning() << "SignalProxy::handleInitData() received initData with invalid param Count:"
+	       << params;
+    return;
+  }
+  
+  QByteArray className(params[0].toByteArray());
+  QString objectName(params[1].toString());
+  QVariantMap propertyMap(params[2].toMap());
+
+  if(!_syncSlave.contains(className)) {
+    qWarning() << "SignalProxy::handleInitData() received initData for unregistered Class:"
+	       << className;
+    return;
+  }
+
+  if(!_syncSlave[className].contains(objectName)) {
+    qWarning() << "SignalProxy::handleInitData() received initData for unregistered Object:"
+	       << className << objectName;
+    return;
+  }
+
+  SyncableObject *obj = _syncSlave[className][objectName];
+  setInitData(obj, propertyMap);
+}
+
+void SignalProxy::handleSignal(const QByteArray &funcName, const QVariantList &params) {
+  QObject* receiver;
+  int methodId;
   SlotHash::const_iterator slot = _attachedSlots.constFind(funcName);
   while(slot != _attachedSlots.constEnd() && slot.key() == funcName) {
     receiver = (*slot).first;
     methodId = (*slot).second;
-    numParams = argTypes(receiver, methodId).count();
-    QGenericArgument args[9];
-    for(int i = 0; i < numParams; i++)
-      args[i] = QGenericArgument(params[i].typeName(), params[i].constData());
-    if(!QMetaObject::invokeMethod(receiver, methodName(receiver, methodId),
-				  args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8])) {
-      qWarning("SignalProxy::receivePeerSignal(): invokeMethod for \"%s\" failed ", methodName(receiver, methodId).constData());
-    }
+    if(!invokeSlot(receiver, methodId, params))
+      qWarning("SignalProxy::handleSignal(): invokeMethod for \"%s\" failed ", methodName(receiver, methodId).constData());
     slot++;
   }
 }
 
+bool SignalProxy::invokeSlot(QObject *receiver, int methodId, const QVariantList &params) {
+  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() {
   // yet again. it's a private slot. no need for checks.
   QIODevice* ioDev = qobject_cast<QIODevice* >(sender());
   QVariant var;
   while(readDataFromDevice(ioDev, _peerByteCount[ioDev], var))
-    receivePeerSignal(var);
+    receivePeerSignal(ioDev, var);
 }
 
 void SignalProxy::writeDataToDevice(QIODevice *dev, const QVariant &item) {
@@ -440,6 +811,57 @@ bool SignalProxy::readDataFromDevice(QIODevice *dev, quint32 &blockSize, QVarian
   return true;
 }
 
+bool SignalProxy::methodsMatch(const QMetaMethod &signal, const QMetaMethod &slot) const {
+  // if we don't even have the same basename it's a sure NO
+  if(methodBaseName(signal) != methodBaseName(slot))
+    return false;
+
+  // are the signatures compatible?
+  if(!QObject::staticMetaObject.checkConnectArgs(signal.signature(), slot.signature()))
+    return false;
+
+  // we take an educated guess if the signals and slots match
+  QString signalsuffix = ::methodName(signal).mid(QString(::methodName(signal)).lastIndexOf(QRegExp("[A-Z]"))).toLower();
+  QString slotprefix = ::methodName(slot).left(QString(::methodName(slot)).indexOf(QRegExp("[A-Z]"))).toLower();
+
+  uint sizediff = qAbs(slotprefix.size() - signalsuffix.size());
+  int ratio = editingDistance(slotprefix, signalsuffix) - sizediff;
+  return (ratio < 2);
+}
+
+QString SignalProxy::methodBaseName(const QMetaMethod &method) {
+  QString methodname = QString(method.signature()).section("(", 0, 0);
+
+  // determine where we have to chop:
+  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]")));
+  } else {
+    // and if it's a signal we discard everything from the last uppercase char
+    methodname = methodname.left(methodname.lastIndexOf(QRegExp("[A-Z]")));
+  }
+
+  methodname[0] = methodname[0].toUpper();
+
+  return methodname;
+}
+
+QVariantMap SignalProxy::initData(SyncableObject *obj) const {
+  return obj->toVariantMap();
+}
+
+void SignalProxy::setInitData(SyncableObject *obj, const QVariantMap &properties) {
+  if(isInitialized(obj))
+    return;
+  obj->fromVariantMap(properties);
+  setInitialized(obj);
+  invokeSlot(obj, updatedRemotelyId(obj));
+}
+
+void SignalProxy::sendHeartBeat() {
+  dispatchSignal(SignalProxy::HeartBeat, QVariantList());
+}
+
 void SignalProxy::dumpProxyStats() {
   QString mode;
   if(proxyMode() == Server)
@@ -451,10 +873,33 @@ void SignalProxy::dumpProxyStats() {
   foreach(SignalRelay *relay, _relayHash.values())
     sigCount += relay->sigCount();
 
+  int slaveCount = 0;
+  foreach(ObjectId oid, _syncSlave.values())
+    slaveCount += oid.count();
+  
   qDebug() << this;
   qDebug() << "              Proxy Mode:" << mode;
   qDebug() << "attached sending Objects:" << _relayHash.count();
-  qDebug() << "       Number of Signals:" << sigCount;
+  qDebug() << "       number of Signals:" << sigCount;
   qDebug() << "          attached Slots:" << _attachedSlots.count();
+  qDebug() << " number of synced Slaves:" << slaveCount;
   qDebug() << "number of Classes cached:" << _classInfo.count();
 }
+
+void SignalProxy::dumpSyncMap(SyncableObject *object) {
+  const QMetaObject *meta = object->metaObject();
+  qDebug() << "SignalProxy: SyncMap for Class" << meta->className();
+
+  QHash<QByteArray, int> syncMap_ = syncMap(object);
+  QHash<QByteArray, int>::const_iterator iter = syncMap_.constBegin();
+  while(iter != syncMap_.constEnd()) {
+    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++;
+//   }
+}