X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.h;h=645157ef84b6a8778f8bf1161bbd32e17b229d3a;hp=69a8a9f46d45158bb05364f69d3d0971308637ce;hb=0e1b154f362e13c2c9009f842e3fd6d8e7c346fc;hpb=c9e3e41c9446e58073225db379d28e1a08e15cd8 diff --git a/src/common/signalproxy.h b/src/common/signalproxy.h index 69a8a9f4..645157ef 100644 --- a/src/common/signalproxy.h +++ b/src/common/signalproxy.h @@ -21,12 +21,14 @@ #ifndef SIGNALPROXY_H #define SIGNALPROXY_H +#include #include #include #include #include #include #include +#include #include #include #include @@ -38,35 +40,27 @@ class SignalProxy : public QObject { Q_OBJECT - class AbstractPeer; - class IODevicePeer; - class SignalProxyPeer; - class SignalRelay; public: + class AbstractPeer; + + class SyncMessage; + class RpcCall; + class InitRequest; + class InitData; + enum ProxyMode { Server, Client }; - enum RequestType { - Sync = 1, - RpcCall, - InitRequest, - InitData, - HeartBeat, - HeartBeatReply - }; - - enum CustomEvents { - PeerSignal = QEvent::User, - RemovePeer + enum EventType { + RemovePeerEvent = QEvent::User }; SignalProxy(QObject *parent); SignalProxy(ProxyMode mode, QObject *parent); - SignalProxy(ProxyMode mode, QIODevice *device, QObject *parent); virtual ~SignalProxy(); void setProxyMode(ProxyMode mode); @@ -77,10 +71,7 @@ public: void setMaxHeartBeatCount(int max); inline int maxHeartBeatCount() const { return _maxHeartBeatCount; } - bool addPeer(QIODevice *iodev); - bool addPeer(SignalProxy *proxy); - void removePeer(QObject *peer); - void removeAllPeers(); + bool addPeer(AbstractPeer *peer); bool attachSignal(QObject *sender, const char *signal, const QByteArray &sigName = QByteArray()); bool attachSlot(const QByteArray &sigName, QObject *recv, const char *slot); @@ -88,19 +79,6 @@ public: void synchronize(SyncableObject *obj); void stopSynchronize(SyncableObject *obj); - //! Writes a QVariant to a device. - /** The data item is prefixed with the resulting blocksize, - * so the corresponding function readDataFromDevice() can check if enough data is available - * at the device to reread the item. - */ - static void writeDataToDevice(QIODevice *dev, const QVariant &item, bool compressed = false); - - //! Reads a data item from a device that has been written by writeDataToDevice(). - /** If not enough data bytes are available, the function returns false and the QVariant reference - * remains untouched. - */ - static bool readDataFromDevice(QIODevice *dev, quint32 &blockSize, QVariant &item, bool compressed = false); - class ExtendedMetaObject; ExtendedMetaObject *extendedMetaObject(const QMetaObject *meta) const; ExtendedMetaObject *createExtendedMetaObject(const QMetaObject *meta, bool checkConflicts = false); @@ -109,6 +87,8 @@ public: bool isSecure() const { return _secure; } void dumpProxyStats(); + void dumpSyncMap(SyncableObject *object); + inline int peerCount() const { return _peers.size(); } public slots: void detachObject(QObject *obj); @@ -121,41 +101,40 @@ protected: void renameObject(const SyncableObject *obj, const QString &newname, const QString &oldname); private slots: - void dataAvailable(); void removePeerBySender(); void objectRenamed(const QByteArray &classname, const QString &newname, const QString &oldname); - void sendHeartBeat(); - void receiveHeartBeat(AbstractPeer *peer, const QVariantList ¶ms); - void receiveHeartBeatReply(AbstractPeer *peer, const QVariantList ¶ms); - void updateSecureState(); signals: - void peerRemoved(QIODevice *dev); + void peerRemoved(SignalProxy::AbstractPeer *peer); void connected(); void disconnected(); void objectInitialized(SyncableObject *); + void heartBeatIntervalChanged(int secs); + void maxHeartBeatCountChanged(int max); void lagUpdated(int lag); - void securityChanged(bool); void secureStateChanged(bool); private: + template + class PeerMessageEvent; + void init(); void initServer(); void initClient(); static const QMetaObject *metaObject(const QObject *obj); - void dispatchSignal(QIODevice *receiver, const RequestType &requestType, const QVariantList ¶ms); - void dispatchSignal(const RequestType &requestType, const QVariantList ¶ms); + void removePeer(AbstractPeer *peer); + void removeAllPeers(); + + template + void dispatch(const T &protoMessage); - void receivePackedFunc(AbstractPeer *sender, const QVariant &packedFunc); - void receivePeerSignal(AbstractPeer *sender, const RequestType &requestType, const QVariantList ¶ms); - void receivePeerSignal(SignalProxy *sender, const RequestType &requestType, const QVariantList ¶ms); - void handleSync(AbstractPeer *sender, QVariantList params); - void handleInitRequest(AbstractPeer *sender, const QVariantList ¶ms); - void handleInitData(AbstractPeer *sender, const QVariantList ¶ms); - void handleSignal(const QVariantList &data); + void handle(AbstractPeer *peer, const SyncMessage &syncMessage); + void handle(AbstractPeer *peer, const RpcCall &rpcCall); + void handle(AbstractPeer *peer, const InitRequest &initRequest); + void handle(AbstractPeer *peer, const InitData &initData); bool invokeSlot(QObject *receiver, int methodId, const QVariantList ¶ms, QVariant &returnValue); bool invokeSlot(QObject *receiver, int methodId, const QVariantList ¶ms = QVariantList()); @@ -164,19 +143,9 @@ private: QVariantMap initData(SyncableObject *obj) const; void setInitData(SyncableObject *obj, const QVariantMap &properties); - void updateLag(IODevicePeer *peer, int lag); - -public: - void dumpSyncMap(SyncableObject *object); - inline int peerCount() const { return _peers.size(); } - -private: static void disconnectDevice(QIODevice *dev, const QString &reason = QString()); - // a Hash of the actual used communication object to it's corresponding peer - // currently a communication object can either be an arbitrary QIODevice or another SignalProxy - typedef QHash PeerHash; - PeerHash _peers; + QSet _peers; // containg a list of argtypes for fast access QHash _extendedMetaObjects; @@ -194,7 +163,6 @@ private: QHash _syncSlave; ProxyMode _proxyMode; - QTimer _heartBeatTimer; int _heartBeatInterval; int _maxHeartBeatCount; @@ -202,6 +170,8 @@ private: friend class SignalRelay; friend class SyncableObject; + friend class InternalConnection; + friend class RemoteConnection; }; @@ -265,58 +235,111 @@ private: // ================================================== -// Peers +// AbstractPeer // ================================================== -class SignalProxy::AbstractPeer +class SignalProxy::AbstractPeer : public QObject { + Q_OBJECT + public: - enum PeerType { - NotAPeer = 0, - IODevicePeer = 1, - SignalProxyPeer = 2 - }; - AbstractPeer() : _type(NotAPeer) {} - AbstractPeer(PeerType type) : _type(type) {} - virtual ~AbstractPeer() {} - inline PeerType type() const { return _type; } - virtual void dispatchSignal(const RequestType &requestType, const QVariantList ¶ms) = 0; + AbstractPeer(QObject *parent = 0) : QObject(parent) {} + + virtual QString description() const = 0; + + virtual void setSignalProxy(SignalProxy *proxy) = 0; + + virtual bool isOpen() const = 0; virtual bool isSecure() const = 0; -private: - PeerType _type; + virtual bool isLocal() const = 0; + + virtual QString errorString() const { return QString(); } + + virtual int lag() const = 0; + +public slots: + virtual void dispatch(const SyncMessage &msg) = 0; + virtual void dispatch(const RpcCall &msg) = 0; + virtual void dispatch(const InitRequest &msg) = 0; + virtual void dispatch(const InitData &msg) = 0; + + virtual void close(const QString &reason = QString()) = 0; + +signals: + void disconnected(); + void error(QAbstractSocket::SocketError); + void secureStateChanged(bool secure = true); + void lagUpdated(int msecs); }; -class SignalProxy::IODevicePeer : public SignalProxy::AbstractPeer +// ================================================== +// Protocol Messages +// ================================================== +class SignalProxy::SyncMessage { public: - IODevicePeer(QIODevice *device, bool compress) : AbstractPeer(AbstractPeer::IODevicePeer), _device(device), byteCount(0), usesCompression(compress), sentHeartBeats(0), lag(0) {} - virtual void dispatchSignal(const RequestType &requestType, const QVariantList ¶ms); - virtual bool isSecure() const; - inline void dispatchPackedFunc(const QVariant &packedFunc) { SignalProxy::writeDataToDevice(_device, packedFunc, usesCompression); } - QString address() const; - inline bool isOpen() const { return _device->isOpen(); } - inline void close() const { _device->close(); } - inline bool readData(QVariant &item) { return SignalProxy::readDataFromDevice(_device, byteCount, item, usesCompression); } + inline SyncMessage(const QByteArray &className, const QString &objectName, const QByteArray &slotName, const QVariantList ¶ms) + : _className(className), _objectName(objectName), _slotName(slotName), _params(params) {} + + inline QByteArray className() const { return _className; } + inline QString objectName() const { return _objectName; } + inline QByteArray slotName() const { return _slotName; } + + inline QVariantList params() const { return _params; } + private: - QIODevice *_device; - quint32 byteCount; - bool usesCompression; + QByteArray _className; + QString _objectName; + QByteArray _slotName; + QVariantList _params; +}; + + +class SignalProxy::RpcCall +{ public: - int sentHeartBeats; - int lag; + inline RpcCall(const QByteArray &slotName, const QVariantList ¶ms) + : _slotName(slotName), _params(params) {} + + inline QByteArray slotName() const { return _slotName; } + inline QVariantList params() const { return _params; } + +private: + QByteArray _slotName; + QVariantList _params; }; -class SignalProxy::SignalProxyPeer : public SignalProxy::AbstractPeer +class SignalProxy::InitRequest { public: - SignalProxyPeer(SignalProxy *sender, SignalProxy *receiver) : AbstractPeer(AbstractPeer::SignalProxyPeer), sender(sender), receiver(receiver) {} - virtual void dispatchSignal(const RequestType &requestType, const QVariantList ¶ms); - virtual inline bool isSecure() const { return true; } + inline InitRequest(const QByteArray &className, const QString &objectName) + : _className(className), _objectName(objectName) {} + + inline QByteArray className() const { return _className; } + inline QString objectName() const { return _objectName; } + private: - SignalProxy *sender; - SignalProxy *receiver; + QByteArray _className; + QString _objectName; }; +class SignalProxy::InitData +{ +public: + inline InitData(const QByteArray &className, const QString &objectName, const QVariantMap &initData) + : _className(className), _objectName(objectName), _initData(initData) {} + + inline QByteArray className() const { return _className; } + inline QString objectName() const { return _objectName; } + + inline QVariantMap initData() const { return _initData; } + +private: + QByteArray _className; + QString _objectName; + QVariantMap _initData; +}; + #endif