X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.h;h=410d48ccd95a1545b86392e615cce42240217088;hp=83b2f4a371f9191990beafd13b71420d034b43e0;hb=f44459818f34b556df8ff2f400098c50b78501eb;hpb=5b686746c880e5cda6d5de3e08180ea4332ff222 diff --git a/src/common/signalproxy.h b/src/common/signalproxy.h index 83b2f4a3..410d48cc 100644 --- a/src/common/signalproxy.h +++ b/src/common/signalproxy.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2012 by the Quassel Project * + * Copyright (C) 2005-2013 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -22,26 +22,19 @@ #define SIGNALPROXY_H #include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include "protocol.h" -class SyncableObject; struct QMetaObject; +class Peer; +class SyncableObject; + class SignalProxy : public QObject { Q_OBJECT - class AbstractPeer; - class IODevicePeer; - class SignalProxyPeer; - class SignalRelay; public: @@ -50,28 +43,12 @@ public: Client }; - enum RequestType { - Sync = 1, - RpcCall, - InitRequest, - InitData, - HeartBeat, - HeartBeatReply - }; - - enum ClientConnectionType { - SignalProxyConnection, - IODeviceConnection - }; - - 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); @@ -82,10 +59,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(Peer *peer); bool attachSignal(QObject *sender, const char *signal, const QByteArray &sigName = QByteArray()); bool attachSlot(const QByteArray &sigName, QObject *recv, const char *slot); @@ -93,19 +67,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); @@ -114,6 +75,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); @@ -126,62 +89,55 @@ 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(Peer *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(Peer *peer); + void removeAllPeers(); + + template + void dispatch(const T &protoMessage); + void dispatch(Peer *peer, const Protocol::RpcCall &rpcCall); + + void handle(Peer *peer, const Protocol::SyncMessage &syncMessage); + void handle(Peer *peer, const Protocol::RpcCall &rpcCall); + void handle(Peer *peer, const Protocol::InitRequest &initRequest); + void handle(Peer *peer, const Protocol::InitData &initData); - 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); + template + void handle(Peer *, T) { Q_ASSERT(0); } - bool invokeSlot(QObject *receiver, int methodId, const QVariantList ¶ms, QVariant &returnValue); - bool invokeSlot(QObject *receiver, int methodId, const QVariantList ¶ms = QVariantList()); + bool invokeSlot(QObject *receiver, int methodId, const QVariantList ¶ms, QVariant &returnValue, Peer *peer = 0); + bool invokeSlot(QObject *receiver, int methodId, const QVariantList ¶ms = QVariantList(), Peer *peer = 0); void requestInit(SyncableObject *obj); 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; @@ -199,7 +155,6 @@ private: QHash _syncSlave; ProxyMode _proxyMode; - QTimer _heartBeatTimer; int _heartBeatInterval; int _maxHeartBeatCount; @@ -207,6 +162,7 @@ private: friend class SignalRelay; friend class SyncableObject; + friend class Peer; }; @@ -217,7 +173,7 @@ class SignalProxy::ExtendedMetaObject { class MethodDescriptor { -public: + public: MethodDescriptor(const QMetaMethod &method); MethodDescriptor() : _returnType(-1), _minArgCount(-1), _receiverMode(SignalProxy::Client) {} @@ -227,7 +183,7 @@ public: inline int minArgCount() const { return _minArgCount; } inline SignalProxy::ProxyMode receiverMode() const { return _receiverMode; } -private: + private: QByteArray _methodName; QList _argTypes; int _returnType; @@ -268,60 +224,4 @@ private: QHash _receiveMap; // if slot x is called then hand over the result to slot y }; - -// ================================================== -// Peers -// ================================================== -class SignalProxy::AbstractPeer -{ -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; - virtual bool isSecure() const = 0; -private: - PeerType _type; -}; - - -class SignalProxy::IODevicePeer : public SignalProxy::AbstractPeer -{ -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); } -private: - QIODevice *_device; - quint32 byteCount; - bool usesCompression; -public: - int sentHeartBeats; - int lag; -}; - - -class SignalProxy::SignalProxyPeer : public SignalProxy::AbstractPeer -{ -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; } -private: - SignalProxy *sender; - SignalProxy *receiver; -}; - - #endif