X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.h;h=cca2ccb5fcb9ce77845526dbe9a177faec9c2926;hp=0b51125e3d8884a36980cfd3a6ea9fe79427001d;hb=8ec76e512d20ce5d1dc76de556bb98a06b75d695;hpb=8f6eddce9d6375240c60860752e952aa1b2e3a84 diff --git a/src/common/signalproxy.h b/src/common/signalproxy.h index 0b51125e..cca2ccb5 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 * @@ -16,16 +16,6 @@ * along with this program; if not, write to the * * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - *************************************************************************** - * SignalProxy has been inspired by QxtRPCPeer, part of libqxt, * - * the Qt eXTension Library . We would like to * - * thank Arvid "aep" Picciani and Adam "ahigerd" Higerd for providing * - * QxtRPCPeer, valuable input and the genius idea to (ab)use Qt's * - * Meta Object System for transmitting signals over the network. * - * * - * To make contribution back into libqxt possible, redistribution and * - * modification of this file is additionally allowed under the terms of * - * the Common Public License, version 1.0, as published by IBM. * ***************************************************************************/ #ifndef _SIGNALPROXY_H_ @@ -34,11 +24,15 @@ #include #include #include +#include #include #include #include +#include class SignalRelay; +class SyncableObject; +class QMetaObject; class SignalProxy : public QObject { Q_OBJECT @@ -49,66 +43,130 @@ public: Client }; - SignalProxy(QObject* parent); - SignalProxy(ProxyMode mode, QObject* parent); - SignalProxy(ProxyMode mode, QIODevice* device, QObject* parent); + enum RequestType { + Sync = 1, + RpcCall, + InitRequest, + InitData, + HeartBeat + }; + + SignalProxy(QObject *parent); + SignalProxy(ProxyMode mode, QObject *parent); + SignalProxy(ProxyMode mode, QIODevice *device, QObject *parent); virtual ~SignalProxy(); void setProxyMode(ProxyMode mode); ProxyMode proxyMode() const; - bool maxPeersReached(); - bool addPeer(QIODevice *iodev); void removePeer(QIODevice *iodev = 0); - 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 setInitialized(SyncableObject *obj); + bool isInitialized(SyncableObject *obj) const; + void requestInit(SyncableObject *obj); void detachObject(QObject *obj); void detachSignals(QObject *sender); void detachSlots(QObject *receiver); - - void call(const char *signal , QVariant p1, QVariant p2, QVariant p3, QVariant p4, - QVariant p5, QVariant p6, QVariant p7, QVariant p8, QVariant p9); - void call(const QByteArray &funcName, const QVariantList ¶ms); + 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); + + //! 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); - - const QList &argTypes(QObject* obj, int methodId); - const QByteArray &methodName(QObject* obj, int methodId); - + + 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; - // QHash syncMap + int updatedRemotelyId; // id of the updatedRemotely() signal - makes things faster + QHash syncMap; + QHash receiveMap; }; + + void dumpProxyStats(); private slots: void dataAvailable(); void detachSender(); void removePeerBySender(); + 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 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 setMethodName(QObject* obj, int methodId); + 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 RequestType &requestType, const QVariantList ¶ms); + void dispatchSignal(const RequestType &requestType, const QVariantList ¶ms); + + void receivePeerSignal(QIODevice *sender, const QVariant &packedFunc); + 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, QVariant &returnValue); + bool invokeSlot(QObject *receiver, int methodId, const QVariantList ¶ms = QVariantList()); - void receivePeerSignal(const QVariant &packedFunc); + 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 + QHash _peerByteCount; // containg a list of argtypes for fast access - QHash _classInfo; + QHash _classInfo; // we use one SignalRelay per QObject QHash _relayHash; @@ -117,16 +175,16 @@ private: typedef QPair MethodId; typedef QMultiHash SlotHash; SlotHash _attachedSlots; - - // Hash of used QIODevices - QHash _peerByteCount; + // slaves for sync + typedef QHash ObjectId; + QHash _syncSlave; + ProxyMode _proxyMode; - int _maxClients; + QTimer _heartBeatTimer; + + friend class SignalRelay; }; - - - #endif