X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.h;h=e5bd0f6c13326a1b6707abd1f876628529efd264;hp=1a8dfac96dfa3248cacf4acd152adb296c96db31;hb=287674ebe59cf8129645722693391f4b4ad8d240;hpb=b797e5f581b10a517c30f78cb53f813af741e261

diff --git a/src/common/signalproxy.h b/src/common/signalproxy.h
index 1a8dfac9..e5bd0f6c 100644
--- a/src/common/signalproxy.h
+++ b/src/common/signalproxy.h
@@ -28,8 +28,7 @@
 #include <QPair>
 #include <QString>
 #include <QByteArray>
-
-#include <QMutex>
+#include <QTimer>
 
 class SignalRelay;
 class SyncableObject;
@@ -45,9 +44,11 @@ public:
   };
 
   enum RequestType {
-    Sync = 0,
+    Sync = 1,
+    RpcCall,
     InitRequest,
-    InitData
+    InitData,
+    HeartBeat
   };
 
   SignalProxy(QObject *parent);
@@ -67,7 +68,7 @@ public:
   void synchronize(SyncableObject *obj);
 
   void setInitialized(SyncableObject *obj);
-  bool initialized(SyncableObject *obj);
+  bool isInitialized(SyncableObject *obj) const;
   void requestInit(SyncableObject *obj);
 
   void detachObject(QObject *obj);
@@ -89,19 +90,21 @@ public:
   static bool readDataFromDevice(QIODevice *dev, quint32 &blockSize, QVariant &item);
 
   static QString methodBaseName(const QMetaMethod &method);
-  
+
   const QList<int> &argTypes(QObject *obj, int methodId);
-  bool hasUpdateSignal(QObject *obj);
+  const int &minArgCount(QObject *obj, int methodId);
   const QByteArray &methodName(QObject *obj, int methodId);
   const QHash<QByteArray, int> &syncMap(SyncableObject *obj);
+  int updatedRemotelyId(SyncableObject *obj);
 
   typedef QHash<int, QList<int> > ArgHash;
   typedef QHash<int, QByteArray> MethodNameHash;
   struct ClassInfo {
     ArgHash argTypes;
+    QHash<int, int> minArgCount;
     MethodNameHash methodNames;
+    int updatedRemotelyId; // id of the updatedRemotely() signal - makes things faster
     QHash<QByteArray, int> syncMap;
-    bool hasUpdateSignal;
   };
 
   void dumpProxyStats();
@@ -112,11 +115,13 @@ private slots:
   void removePeerBySender();
   void objectRenamed(QString oldname, QString newname);
   void objectRenamed(QByteArray classname, QString oldname, QString newname);
+  void sendHeartBeat();
 
 signals:
   void peerRemoved(QIODevice *obj);
   void connected();
   void disconnected();
+  void objectInitialized(SyncableObject *);
   
 private:
   void initServer();
@@ -124,13 +129,15 @@ private:
   
   void createClassInfo(QObject *obj);
   void setArgTypes(QObject *obj, int methodId);
+  void setMinArgCount(QObject *obj, int methodId);
   void setMethodName(QObject *obj, int methodId);
   void setSyncMap(SyncableObject *obj);
+  void setUpdatedRemotelyId(QObject *obj);
 
   bool methodsMatch(const QMetaMethod &signal, const QMetaMethod &slot) const;
 
-  void dispatchSignal(QIODevice *receiver, const QVariant &identifier, const QVariantList &params);
-  void dispatchSignal(const QVariant &identifier, const QVariantList &params);
+  void dispatchSignal(QIODevice *receiver, const RequestType &requestType, const QVariantList &params);
+  void dispatchSignal(const RequestType &requestType, const QVariantList &params);
   
   void receivePeerSignal(QIODevice *sender, const QVariant &packedFunc);
   void handleSync(QVariantList params);
@@ -138,17 +145,15 @@ private:
   void handleInitData(QIODevice *sender, const QVariantList &params);
   void handleSignal(const QByteArray &funcName, const QVariantList &params);
 
-  bool invokeSlot(QObject *receiver, int methodId, const QVariantList &params);
+  bool invokeSlot(QObject *receiver, int methodId, const QVariantList &params = QVariantList());
 
   QVariantMap initData(SyncableObject *obj) const;
   void setInitData(SyncableObject *obj, const QVariantMap &properties);
 
-  void _detachSignals(QObject *sender);
-  void _detachSlots(QObject *receiver);
-  void _stopSync(SyncableObject *obj);
-
+public:
   void dumpSyncMap(SyncableObject *object);
-
+  
+private:
   // Hash of used QIODevices
   QHash<QIODevice*, quint32> _peerByteCount;
 
@@ -169,11 +174,7 @@ private:
 
 
   ProxyMode _proxyMode;
-  
-  // the slaveMutex protects both containers:
-  //  - _syncSlaves for sync and init calls
-  //  - _attachedSlots
-  QMutex slaveMutex;
+  QTimer _heartBeatTimer;
   
   friend class SignalRelay;
 };