X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.h;h=0dc33325c124785abda22df9ea8282cbed7a78c8;hp=d9871a2301d43cda1faa3b54eef5f2ee911bced3;hb=f24b79010368ac773923d29187c15c33aea69bc9;hpb=d1b6499b0b848d4287efae89107576548533502c diff --git a/src/common/signalproxy.h b/src/common/signalproxy.h index d9871a23..0dc33325 100644 --- a/src/common/signalproxy.h +++ b/src/common/signalproxy.h @@ -18,8 +18,8 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifndef _SIGNALPROXY_H_ -#define _SIGNALPROXY_H_ +#ifndef SIGNALPROXY_H +#define SIGNALPROXY_H #include #include @@ -28,16 +28,18 @@ #include #include #include - -#include +#include class SignalRelay; class SyncableObject; -class QMetaObject; +struct QMetaObject; class SignalProxy : public QObject { Q_OBJECT + class AbstractPeer; + class IODevicePeer; + public: enum ProxyMode { Server, @@ -45,9 +47,12 @@ public: }; enum RequestType { - Sync = 0, + Sync = 1, + RpcCall, InitRequest, - InitData + InitData, + HeartBeat, + HeartBeatReply }; SignalProxy(QObject *parent); @@ -56,18 +61,21 @@ public: virtual ~SignalProxy(); void setProxyMode(ProxyMode mode); - ProxyMode proxyMode() const; + inline ProxyMode proxyMode() const { return _proxyMode; } bool addPeer(QIODevice *iodev); - void removePeer(QIODevice *iodev = 0); - + void removePeer(QIODevice *iodev); + bool addPeer(SignalProxy *proxy); + void removePeer(SignalProxy *proxy); + void removeAllPeers(); + bool attachSignal(QObject *sender, const char *signal, const QByteArray& sigName = QByteArray()); bool attachSlot(const QByteArray& sigName, QObject *recv, const char *slot); void synchronize(SyncableObject *obj); - void setInitialized(SyncableObject *obj); - bool isInitialized(SyncableObject *obj) const; +// void setInitialized(SyncableObject *obj); +// bool isInitialized(SyncableObject *obj) const; void requestInit(SyncableObject *obj); void detachObject(QObject *obj); @@ -80,26 +88,34 @@ public: * 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); + 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); + static bool readDataFromDevice(QIODevice *dev, quint32 &blockSize, QVariant &item, bool compressed = false); static QString methodBaseName(const QMetaMethod &method); const QList &argTypes(QObject *obj, int methodId); + const int &returnType(QObject *obj, int methodId); + const int &minArgCount(QObject *obj, int methodId); const QByteArray &methodName(QObject *obj, int methodId); const QHash &syncMap(SyncableObject *obj); + const QHash &receiveMap(SyncableObject *obj); + int updatedRemotelyId(SyncableObject *obj); typedef QHash > ArgHash; typedef QHash MethodNameHash; struct ClassInfo { ArgHash argTypes; + QHash returnType; + QHash minArgCount; MethodNameHash methodNames; + int updatedRemotelyId; // id of the updatedRemotely() signal - makes things faster QHash syncMap; + QHash receiveMap; }; void dumpProxyStats(); @@ -108,50 +124,114 @@ private slots: void dataAvailable(); void detachSender(); void removePeerBySender(); - void objectRenamed(QString oldname, QString newname); - void objectRenamed(QByteArray classname, QString oldname, QString newname); - + void objectRenamed(const QString &newname, const QString &oldname); + 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); + signals: - void peerRemoved(QIODevice *obj); + void peerRemoved(QIODevice *dev); void connected(); void disconnected(); void objectInitialized(SyncableObject *); + void lagUpdated(int lag); private: + void init(); void initServer(); void initClient(); + const QMetaObject *metaObject(QObject *obj); void createClassInfo(QObject *obj); void setArgTypes(QObject *obj, int methodId); + void setReturnType(QObject *obj, int methodId); + void setMinArgCount(QObject *obj, int methodId); void setMethodName(QObject *obj, int methodId); void setSyncMap(SyncableObject *obj); + void setReceiveMap(SyncableObject *obj); + void setUpdatedRemotelyId(SyncableObject *obj); bool methodsMatch(const QMetaMethod &signal, const QMetaMethod &slot) const; - void dispatchSignal(QIODevice *receiver, const QVariant &identifier, const QVariantList ¶ms); - void dispatchSignal(const QVariant &identifier, const QVariantList ¶ms); - - void receivePeerSignal(QIODevice *sender, const QVariant &packedFunc); - void handleSync(QVariantList params); - void handleInitRequest(QIODevice *sender, const QVariantList ¶ms); - void handleInitData(QIODevice *sender, const QVariantList ¶ms); - void handleSignal(const QByteArray &funcName, const QVariantList ¶ms); + void dispatchSignal(QIODevice *receiver, const RequestType &requestType, const QVariantList ¶ms); + void dispatchSignal(const RequestType &requestType, const QVariantList ¶ms); - bool invokeSlot(QObject *receiver, int methodId, const QVariantList ¶ms); + void receivePackedFunc(AbstractPeer *sender, const QVariant &packedFunc); + void receivePeerSignal(AbstractPeer *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); + + bool invokeSlot(QObject *receiver, int methodId, const QVariantList ¶ms, QVariant &returnValue); + bool invokeSlot(QObject *receiver, int methodId, const QVariantList ¶ms = 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); + void updateLag(IODevicePeer *peer, int lag); - public: +public: void dumpSyncMap(SyncableObject *object); + inline int peerCount() const { return _peers.size(); } + +private: + class 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; private: + PeerType _type; + }; + + class IODevicePeer : public 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); + inline void dispatchPackedFunc(const QVariant &packedFunc) { SignalProxy::writeDataToDevice(_device, packedFunc, usesCompression); } + inline QIODevice *device() const { return _device; } + inline bool isOpen() const { return _device->isOpen(); } + inline bool readData(QVariant &item) { return SignalProxy::readDataFromDevice(_device, byteCount, item, usesCompression); } + private: + QIODevice *_device; + quint32 byteCount; + bool usesCompression; + public: + int sentHeartBeats; + int lag; + }; - // Hash of used QIODevices - QHash _peerByteCount; + class SignalProxyPeer : public AbstractPeer { + public: + SignalProxyPeer(SignalProxy *proxy) : AbstractPeer(AbstractPeer::SignalProxyPeer), proxy(proxy) {} + virtual void dispatchSignal(const RequestType &requestType, const QVariantList ¶ms); + private: + SignalProxy *proxy; + }; + + // 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; + +// // Hash of used QIODevices +// struct peerInfo { +// quint32 byteCount; +// bool usesCompression; +// int sentHeartBeats; +// int lag; +// peerInfo() : byteCount(0), usesCompression(false), sentHeartBeats(0) {} +// }; +// QHash _peers; // containg a list of argtypes for fast access QHash _classInfo; @@ -170,11 +250,7 @@ private: ProxyMode _proxyMode; - - // the slaveMutex protects both containers: - // - _syncSlaves for sync and init calls - // - _attachedSlots - QMutex slaveMutex; + QTimer _heartBeatTimer; friend class SignalRelay; };