X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.h;h=49033cdf6e4c465dc278fd78e30033564d7b1c86;hp=6cab74aeb666b29c7109828fac9bebfcec252fa4;hb=c1cf157116de7fc3da96203aa6f03c38c7ebb650;hpb=30b159cb876a9495de42e9a3e70ca050516f0805 diff --git a/src/common/signalproxy.h b/src/common/signalproxy.h index 6cab74ae..49033cdf 100644 --- a/src/common/signalproxy.h +++ b/src/common/signalproxy.h @@ -22,12 +22,12 @@ #include "common-export.h" -#include -#include - #include #include +#include +#include + #include "protocol.h" struct QMetaObject; @@ -43,17 +43,19 @@ class COMMON_EXPORT SignalProxy : public QObject class SignalRelay; public: - enum ProxyMode { + enum ProxyMode + { Server, Client }; - enum EventType { + enum EventType + { RemovePeerEvent = QEvent::User }; - SignalProxy(QObject *parent); - SignalProxy(ProxyMode mode, QObject *parent); + SignalProxy(QObject* parent); + SignalProxy(ProxyMode mode, QObject* parent); ~SignalProxy() override; void setProxyMode(ProxyMode mode); @@ -64,25 +66,28 @@ public: void setMaxHeartBeatCount(int max); inline int maxHeartBeatCount() const { return _maxHeartBeatCount; } - bool addPeer(Peer *peer); + 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); + 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 stopSynchronize(SyncableObject *obj); + void synchronize(SyncableObject* obj); + void stopSynchronize(SyncableObject* obj); class ExtendedMetaObject; - ExtendedMetaObject *extendedMetaObject(const QMetaObject *meta) const; - ExtendedMetaObject *createExtendedMetaObject(const QMetaObject *meta, bool checkConflicts = false); - inline ExtendedMetaObject *extendedMetaObject(const QObject *obj) const { return extendedMetaObject(metaObject(obj)); } - inline ExtendedMetaObject *createExtendedMetaObject(const QObject *obj, bool checkConflicts = false) { return createExtendedMetaObject(metaObject(obj), checkConflicts); } + ExtendedMetaObject* extendedMetaObject(const QMetaObject* meta) const; + ExtendedMetaObject* createExtendedMetaObject(const QMetaObject* meta, bool checkConflicts = false); + inline ExtendedMetaObject* extendedMetaObject(const QObject* obj) const { return extendedMetaObject(metaObject(obj)); } + inline ExtendedMetaObject* createExtendedMetaObject(const QObject* obj, bool checkConflicts = false) + { + return createExtendedMetaObject(metaObject(obj), checkConflicts); + } bool isSecure() const { return _secure; } void dumpProxyStats(); - void dumpSyncMap(SyncableObject *object); + void dumpSyncMap(SyncableObject* object); - static SignalProxy *current(); + static SignalProxy* current(); /**@{*/ /** @@ -91,15 +96,17 @@ public: * @param closure Code you want to execute within of that restricted environment */ void restrictTargetPeers(QSet peers, std::function closure); - void restrictTargetPeers(Peer *peer, std::function closure) { + void restrictTargetPeers(Peer* peer, std::function closure) + { QSet set; set.insert(peer); restrictTargetPeers(set, std::move(closure)); } - //A better version, but only implemented on Qt5 if Initializer Lists exist + // A better version, but only implemented on Qt5 if Initializer Lists exist #ifdef Q_COMPILER_INITIALIZER_LISTS - void restrictTargetPeers(std::initializer_list peers, std::function closure) { + void restrictTargetPeers(std::initializer_list peers, std::function closure) + { restrictTargetPeers(QSet(peers), std::move(closure)); } #endif @@ -108,40 +115,40 @@ public: inline int peerCount() const { return _peerMap.size(); } QVariantList peerData(); - Peer *peerById(int peerId); + Peer* peerById(int peerId); /** * @return If handling a signal, the Peer from which the current signal originates */ - Peer *sourcePeer(); - void setSourcePeer(Peer *sourcePeer); + Peer* sourcePeer(); + void setSourcePeer(Peer* sourcePeer); /** * @return If sending a signal, the Peer to which the current signal is directed */ - Peer *targetPeer(); - void setTargetPeer(Peer *targetPeer); + Peer* targetPeer(); + void setTargetPeer(Peer* targetPeer); public slots: - void detachObject(QObject *obj); - void detachSignals(QObject *sender); - void detachSlots(QObject *receiver); + void detachObject(QObject* obj); + void detachSignals(QObject* sender); + void detachSlots(QObject* receiver); protected: - void customEvent(QEvent *event) override; - void sync_call__(const SyncableObject *obj, ProxyMode modeType, const char *funcname, va_list ap); - void renameObject(const SyncableObject *obj, const QString &newname, const QString &oldname); + void customEvent(QEvent* event) override; + void sync_call__(const SyncableObject* obj, ProxyMode modeType, const char* funcname, va_list ap); + void renameObject(const SyncableObject* obj, const QString& newname, const QString& oldname); private slots: void removePeerBySender(); - void objectRenamed(const QByteArray &classname, const QString &newname, const QString &oldname); + void objectRenamed(const QByteArray& classname, const QString& newname, const QString& oldname); void updateSecureState(); signals: - void peerRemoved(Peer *peer); + void peerRemoved(Peer* peer); void connected(); void disconnected(); - void objectInitialized(SyncableObject *); + void objectInitialized(SyncableObject*); void heartBeatIntervalChanged(int secs); void maxHeartBeatCountChanged(int max); void lagUpdated(int lag); @@ -155,74 +162,74 @@ private: void initServer(); void initClient(); - static const QMetaObject *metaObject(const QObject *obj); + static const QMetaObject* metaObject(const QObject* obj); - void removePeer(Peer *peer); + void removePeer(Peer* peer); void removeAllPeers(); - int nextPeerId() { - return _lastPeerId++; - } + int nextPeerId() { return _lastPeerId++; } template - void dispatch(const T &protoMessage); + void dispatch(const T& protoMessage); template - void dispatch(Peer *peer, const T &protoMessage); + void dispatch(Peer* peer, const T& protoMessage); - 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 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); template - void handle(Peer *, T) { Q_ASSERT(0); } + void handle(Peer*, T) + { + Q_ASSERT(0); + } - bool invokeSlot(QObject *receiver, int methodId, const QVariantList ¶ms, QVariant &returnValue, Peer *peer = nullptr); - bool invokeSlot(QObject *receiver, int methodId, const QVariantList ¶ms = QVariantList(), Peer *peer = nullptr); + bool invokeSlot(QObject* receiver, int methodId, const QVariantList& params, QVariant& returnValue, Peer* peer = nullptr); + bool invokeSlot(QObject* receiver, int methodId, const QVariantList& params = QVariantList(), Peer* peer = nullptr); - void requestInit(SyncableObject *obj); - QVariantMap initData(SyncableObject *obj) const; - void setInitData(SyncableObject *obj, const QVariantMap &properties); + void requestInit(SyncableObject* obj); + QVariantMap initData(SyncableObject* obj) const; + void setInitData(SyncableObject* obj, const QVariantMap& properties); - static void disconnectDevice(QIODevice *dev, const QString &reason = QString()); + static void disconnectDevice(QIODevice* dev, const QString& reason = QString()); QHash _peerMap; // containg a list of argtypes for fast access - QHash _extendedMetaObjects; + QHash _extendedMetaObjects; // SignalRelay for all manually attached signals - SignalRelay *_signalRelay; + SignalRelay* _signalRelay; // RPC function -> (object, slot ID) - using MethodId = QPair; + using MethodId = QPair; using SlotHash = QMultiHash; SlotHash _attachedSlots; // slaves for sync - using ObjectId = QHash; + using ObjectId = QHash; QHash _syncSlave; ProxyMode _proxyMode; int _heartBeatInterval; int _maxHeartBeatCount; - bool _secure; // determines if all connections are in a secured state (using ssl or internal connections) + bool _secure; // determines if all connections are in a secured state (using ssl or internal connections) int _lastPeerId = 0; - QSet _restrictedTargets; + QSet _restrictedTargets; bool _restrictMessageTarget = false; - Peer *_sourcePeer = nullptr; - Peer *_targetPeer = nullptr; + Peer* _sourcePeer = nullptr; + Peer* _targetPeer = nullptr; friend class SignalRelay; friend class SyncableObject; friend class Peer; }; - // ================================================== // ExtendedMetaObject // ================================================== @@ -231,11 +238,11 @@ class SignalProxy::ExtendedMetaObject class MethodDescriptor { public: - MethodDescriptor(const QMetaMethod &method); + MethodDescriptor(const QMetaMethod& method); MethodDescriptor() = default; - inline const QByteArray &methodName() const { return _methodName; } - inline const QList &argTypes() const { return _argTypes; } + inline const QByteArray& methodName() const { return _methodName; } + inline const QList& argTypes() const { return _argTypes; } inline int returnType() const { return _returnType; } inline int minArgCount() const { return _minArgCount; } inline SignalProxy::ProxyMode receiverMode() const { return _receiverMode; } @@ -245,38 +252,38 @@ class SignalProxy::ExtendedMetaObject QList _argTypes; int _returnType{-1}; int _minArgCount{-1}; - SignalProxy::ProxyMode _receiverMode{SignalProxy::Client}; // Only acceptable as a Sync Call if the receiving SignalProxy is in this mode. + SignalProxy::ProxyMode _receiverMode{ + SignalProxy::Client}; // Only acceptable as a Sync Call if the receiving SignalProxy is in this mode. }; - public: - ExtendedMetaObject(const QMetaObject *meta, bool checkConflicts); + ExtendedMetaObject(const QMetaObject* meta, bool checkConflicts); - inline const QByteArray &methodName(int methodId) { return methodDescriptor(methodId).methodName(); } - inline const QList &argTypes(int methodId) { return methodDescriptor(methodId).argTypes(); } + inline const QByteArray& methodName(int methodId) { return methodDescriptor(methodId).methodName(); } + inline const QList& argTypes(int methodId) { return methodDescriptor(methodId).argTypes(); } inline int returnType(int methodId) { return methodDescriptor(methodId).returnType(); } inline int minArgCount(int methodId) { return methodDescriptor(methodId).minArgCount(); } inline SignalProxy::ProxyMode receiverMode(int methodId) { return methodDescriptor(methodId).receiverMode(); } - inline int methodId(const QByteArray &methodName) { return _methodIds.contains(methodName) ? _methodIds[methodName] : -1; } + inline int methodId(const QByteArray& methodName) { return _methodIds.contains(methodName) ? _methodIds[methodName] : -1; } inline int updatedRemotelyId() { return _updatedRemotelyId; } - inline const QHash &slotMap() { return _methodIds; } - const QHash &receiveMap(); + inline const QHash& slotMap() { return _methodIds; } + const QHash& receiveMap(); - const QMetaObject *metaObject() const { return _meta; } + const QMetaObject* metaObject() const { return _meta; } - static QByteArray methodName(const QMetaMethod &method); - static QString methodBaseName(const QMetaMethod &method); + static QByteArray methodName(const QMetaMethod& method); + static QString methodBaseName(const QMetaMethod& method); private: - const MethodDescriptor &methodDescriptor(int methodId); + const MethodDescriptor& methodDescriptor(int methodId); - const QMetaObject *_meta; - int _updatedRemotelyId; // id of the updatedRemotely() signal - makes things faster + const QMetaObject* _meta; + int _updatedRemotelyId; // id of the updatedRemotely() signal - makes things faster QHash _methods; QHash _methodIds; - QHash _receiveMap; // if slot x is called then hand over the result to slot y + QHash _receiveMap; // if slot x is called then hand over the result to slot y };