X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.h;h=ebc4ae76e92fb70ea9263b3cd7ccb8a610fe9ee2;hb=97d674034551438238c568e8b42efb08e1ba7354;hp=2b8f4d87865032d2a6379a742f058b07e691b16a;hpb=43886a14775d3e71af2d7e0ee2f3b2dace33ea7a;p=quassel.git

diff --git a/src/common/signalproxy.h b/src/common/signalproxy.h
index 2b8f4d87..ebc4ae76 100644
--- a/src/common/signalproxy.h
+++ b/src/common/signalproxy.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by The Quassel IRC Development Team             *
+ *   Copyright (C) 2005-07 by the Quassel IRC Team                         *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -16,73 +16,116 @@
  *   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.          *
  ***************************************************************************/
 
-#ifndef _RPCPEER_H_
-#define _RPCPEER_H_
+#ifndef _SIGNALPROXY_H_
+#define _SIGNALPROXY_H_
+
+#include <QList>
+#include <QHash>
+#include <QVariant>
+#include <QPair>
+#include <QString>
+#include <QByteArray>
 
-#include "qxtrpcpeer.h"
-#include <QtCore>
+class SignalRelay;
 
 class SignalProxy : public QObject {
   Q_OBJECT
 
-  public:
-
-    enum ProxyType { Client, Server };
+public:
+  enum ProxyMode {
+    Server,
+    Client
+  };
 
-    SignalProxy(ProxyType type, QIODevice *device = 0, QObject *parent = 0);
-    ~SignalProxy();
+  SignalProxy(QObject* parent);
+  SignalProxy(ProxyMode mode, QObject* parent);
+  SignalProxy(ProxyMode mode, QIODevice* device, QObject* parent);
+  virtual ~SignalProxy();
 
-    void attachSignal(QObject* sender, const char* signal, const QByteArray& rpcFunction = QByteArray());
-    void attachSlot(const QByteArray& rpcFunction, QObject* recv, const char* slot);
+  void setProxyMode(ProxyMode mode);
+  ProxyMode proxyMode() const;
 
-  public slots:
-    void addPeer(QIODevice *device);
-    void detachObject(QObject* obj);
-  
-    void sendSignal(const char *signal, QVariant p1 = QVariant(), QVariant p2 = QVariant(), QVariant p3 = QVariant(), QVariant p4 = QVariant(),
-              QVariant p5 = QVariant(), QVariant p6 = QVariant(), QVariant p7 = QVariant(), QVariant p8 = QVariant(), QVariant p9 = QVariant());
-
-    void detachObject(QObject* obj);
+  bool addPeer(QIODevice *iodev);
+  void removePeer(QIODevice *iodev = 0);
 
-    //void detachSender();
+  bool attachSignal(QObject* sender, const char* signal, const QByteArray& sigName = QByteArray());
+  bool attachSlot(const QByteArray& sigName, QObject* recv, const char* slot);
 
-  signals:
-    void peerDisconnected();
+  void detachObject(QObject *obj);
+  void detachSignals(QObject *sender);
+  void detachSlots(QObject *receiver);
+  
+  void call(const char *signal , QVariant p1, QVariant p2, QVariant p3, QVariant p4,
+	    QVariant p5, QVariant p6, QVariant p7, QVariant p8, QVariant p9);
+  void call(const QByteArray &funcName, const QVariantList &params);
 
-  private slots:
-    void socketDisconnected();
+  static void writeDataToDevice(QIODevice *dev, const QVariant &item);
+  static bool readDataFromDevice(QIODevice *dev, quint32 &blockSize, QVariant &item);
+  
+  const QList<int> &argTypes(QObject* obj, int methodId);
+  const QByteArray &methodName(QObject* obj, int methodId);
+  
+  typedef QHash<int, QList<int> > ArgHash;
+  typedef QHash<int, QByteArray> MethodNameHash;
+  struct ClassInfo {
+    ArgHash argTypes;
+    MethodNameHash methodNames;
+    // QHash<int, int> syncMap
+  };
+
+  void dumpProxyStats();
+  
+private slots:
+  void dataAvailable();
+  void detachSender();
+  void removePeerBySender();
+
+signals:
+  void peerRemoved(QIODevice* obj);
+  void connected();
+  void disconnected();
+  
+private:
+  void createClassInfo(QObject *obj);
+  void setArgTypes(QObject* obj, int methodId);
+  void setMethodName(QObject* obj, int methodId);
 
-  private:
-    struct Connection {
-      QPointer<QxtRPCPeer> peer;
-      QPointer<QIODevice> device;
-    };
+  void receivePeerSignal(const QVariant &packedFunc);
 
-    struct SignalDesc {
-      QObject *sender;
-      const char *signal;
-      QByteArray rpcFunction;
+  void _detachSignals(QObject *sender);
+  void _detachSlots(QObject *receiver);
 
-      SignalDesc(QObject *sndr, const char *sig, const QByteArray &func) : sender(sndr), signal(sig), rpcFunction(func) {}
-    };
+  // containg a list of argtypes for fast access
+  QHash<QByteArray, ClassInfo*> _classInfo;
 
-    struct SlotDesc {
-      QByteArray rpcFunction;
-      QObject *recv;
-      const char *slot;
+  // we use one SignalRelay per QObject
+  QHash<QObject*, SignalRelay *> _relayHash;
 
-      SlotDesc(const QByteArray& func, QObject* r, const char* s) : rpcFunction(func), recv(r), slot(s) {}
-    };
+  // RPC function -> (object, slot ID)
+  typedef QPair<QObject*, int> MethodId;
+  typedef QMultiHash<QByteArray, MethodId> SlotHash;
+  SlotHash _attachedSlots;
+  
 
-    ProxyType type;
-    QList<Connection> peers;
-    QList<SignalDesc> attachedSignals;
-    QList<SlotDesc> attachedSlots;
+  // Hash of used QIODevices
+  QHash<QIODevice*, quint32> _peerByteCount;
 
+  ProxyMode _proxyMode;
 };
 
 
 
+
 #endif