X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.h;h=7ffb73bbe07394ce4f1db9e6be1c3e9600a64448;hp=4e59e809c010db7cff4a611b24ae427a43b9c67a;hb=018d1d001bf3c051b55525f523d933a8d694e071;hpb=924e2c01204da172a071d34485936b379372e497 diff --git a/src/common/signalproxy.h b/src/common/signalproxy.h index 4e59e809..7ffb73bb 100644 --- a/src/common/signalproxy.h +++ b/src/common/signalproxy.h @@ -1,11 +1,11 @@ /*************************************************************************** - * Copyright (C) 2005-07 by the Quassel IRC Team * + * Copyright (C) 2005-08 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * + * (at your option) version 3. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * @@ -28,9 +28,11 @@ #include #include #include +#include class SignalRelay; -class QMetaObject; +class SyncableObject; +struct QMetaObject; class SignalProxy : public QObject { Q_OBJECT @@ -42,9 +44,11 @@ public: }; enum RequestType { - Sync = 0, + Sync = 1, + RpcCall, InitRequest, - InitData + InitData, + HeartBeat }; SignalProxy(QObject *parent); @@ -61,33 +65,50 @@ public: bool attachSignal(QObject *sender, const char *signal, const QByteArray& sigName = QByteArray()); bool attachSlot(const QByteArray& sigName, QObject *recv, const char *slot); - void synchronize(QObject *obj); - void synchronizeAsMaster(QObject *obj); - void synchronizeAsSlave(QObject *obj); + void synchronize(SyncableObject *obj); + + void setInitialized(SyncableObject *obj); + bool isInitialized(SyncableObject *obj) const; + void requestInit(SyncableObject *obj); - void setInitialized(QObject *obj); - bool initialized(QObject *obj); - void requestInit(QObject *obj); - void detachObject(QObject *obj); void detachSignals(QObject *sender); void detachSlots(QObject *receiver); - - static void writeDataToDevice(QIODevice *dev, const QVariant &item); - static bool readDataFromDevice(QIODevice *dev, quint32 &blockSize, QVariant &item); + void stopSync(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); 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(QObject *obj); + 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; - QHash syncMap; + int updatedRemotelyId; // id of the updatedRemotely() signal - makes things faster + QHash syncMap; + QHash receiveMap; }; void dumpProxyStats(); @@ -96,42 +117,59 @@ 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(); signals: void peerRemoved(QIODevice *obj); void connected(); void disconnected(); + void objectInitialized(SyncableObject *); private: 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(QObject *obj); + 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 dispatchSignal(QIODevice *receiver, const RequestType &requestType, const QVariantList ¶ms); + void dispatchSignal(const RequestType &requestType, const QVariantList ¶ms); void receivePeerSignal(QIODevice *sender, const QVariant &packedFunc); - void handleSync(QVariantList params); + void handleSync(QIODevice *sender, QVariantList params); void handleInitRequest(QIODevice *sender, const QVariantList ¶ms); void handleInitData(QIODevice *sender, const QVariantList ¶ms); void handleSignal(const QByteArray &funcName, const QVariantList ¶ms); - bool invokeSlot(QObject *receiver, int methodId, const QVariantList ¶ms); + bool invokeSlot(QObject *receiver, int methodId, const QVariantList ¶ms, QVariant &returnValue); + bool invokeSlot(QObject *receiver, int methodId, const QVariantList ¶ms = QVariantList()); - QVariantMap initData(QObject *obj) const; - void setInitData(QObject *obj, const QVariantMap &properties); - bool setInitValue(QObject *obj, const QString &property, const QVariant &value); + QVariantMap initData(SyncableObject *obj) const; + void setInitData(SyncableObject *obj, const QVariantMap &properties); - void _detachSignals(QObject *sender); - void _detachSlots(QObject *receiver); +public: + void dumpSyncMap(SyncableObject *object); + +private: + // Hash of used QIODevices + struct peerInfo { + quint32 byteCount; + bool usesCompression; + peerInfo() : byteCount(0), usesCompression(false) {}; + }; + //QHash _peerByteCount; + QHash _peers; // containg a list of argtypes for fast access QHash _classInfo; @@ -145,14 +183,13 @@ private: SlotHash _attachedSlots; // slaves for sync - typedef QHash ObjectId; + typedef QHash ObjectId; QHash _syncSlave; - // Hash of used QIODevices - QHash _peerByteCount; ProxyMode _proxyMode; - + QTimer _heartBeatTimer; + friend class SignalRelay; };