From: Marcus Eggenberger Date: Fri, 14 Aug 2009 10:21:35 +0000 (+0200) Subject: Goodbye SyncRelay, you will live on in our hearts... X-Git-Tag: 0.5-rc1~39 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=57e1cccf5a990b83bc8bde7959e85dec99db50a7 Goodbye SyncRelay, you will live on in our hearts... --- diff --git a/src/client/bufferviewoverlay.cpp b/src/client/bufferviewoverlay.cpp index 3b49ff91..dc439dc9 100644 --- a/src/client/bufferviewoverlay.cpp +++ b/src/client/bufferviewoverlay.cpp @@ -56,7 +56,9 @@ void BufferViewOverlay::addView(int viewId) { viewInitialized(config); } else { disconnect(config, SIGNAL(initDone()), this, SLOT(viewInitialized())); - connect(config, SIGNAL(initDone()), this, SLOT(viewInitialized())); + // we use a queued connection here since manipulating the connection list of a sending object + // doesn't seem to be such a good idea while executing a connected slots. + connect(config, SIGNAL(initDone()), this, SLOT(viewInitialized()), Qt::QueuedConnection); } } diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp index 764223e5..9a7b7731 100644 --- a/src/common/signalproxy.cpp +++ b/src/common/signalproxy.cpp @@ -61,42 +61,17 @@ public: }; // ================================================== -// Relays +// SignalRelay // ================================================== -class SignalProxy::Relay : public QObject { +class SignalProxy::SignalRelay : public QObject { /* Q_OBJECT is not necessary or even allowed, because we implement qt_metacall ourselves (and don't use any other features of the meta object system) */ public: - Relay(SignalProxy *parent) : QObject(parent), _proxy(parent) {} - + SignalRelay(SignalProxy *parent) : QObject(parent), _proxy(parent) {} inline SignalProxy *proxy() const { return _proxy; } -private: - SignalProxy *_proxy; -}; - -class SignalProxy::SyncRelay : public SignalProxy::Relay { -public: - SyncRelay(SignalProxy::ExtendedMetaObject *eMeta, SignalProxy *parent); - - int qt_metacall(QMetaObject::Call _c, int _id, void **_a); - - void synchronize(SyncableObject *object); - - int signalCount() const { return _signalCount; } - -private: - ExtendedMetaObject *_eMeta; - QSet _signalIds; - int _signalCount; -}; - -class SignalProxy::SignalRelay : public SignalProxy::Relay { -public: - SignalRelay(SignalProxy *parent) : Relay(parent) {} - int qt_metacall(QMetaObject::Call _c, int _id, void **_a); void attachSignal(QObject *sender, int signalId, const QByteArray &funcName); @@ -111,75 +86,10 @@ private: Signal() : sender(0), signalId(-1) {} }; + SignalProxy *_proxy; QHash _slots; }; -SignalProxy::SyncRelay::SyncRelay(SignalProxy::ExtendedMetaObject *eMeta, SignalProxy *parent) - : Relay(parent), - _eMeta(eMeta) -{ - QByteArray signature; - for(int i = 0; i < eMeta->metaObject()->methodCount(); i++ ) { - signature = eMeta->metaObject()->method(i).signature(); - if(!eMeta->syncMap().contains(signature)) - continue; - - if((proxy()->proxyMode() == SignalProxy::Server && !signature.contains("Requested")) || - (proxy()->proxyMode() == SignalProxy::Client && signature.contains("Requested"))) { - _signalIds << i; - } - } - _signalCount = _signalIds.count(); -} - -void SignalProxy::SyncRelay::synchronize(SyncableObject *object) { - if(object->syncMetaObject() != _eMeta->metaObject()) { - qWarning() << Q_FUNC_INFO << "can't use SyncRelay of class" << _eMeta->metaObject()->className() - << "for SyncableObject" << object << "with syncMetaObject of class" << object->syncMetaObject()->className(); - return; - } - - QSet::const_iterator sigIter = _signalIds.constBegin(); - while(sigIter != _signalIds.constEnd()) { - QMetaObject::connect(object, *sigIter, this, QObject::staticMetaObject.methodCount() + *sigIter); - sigIter++; - } -} - -int SignalProxy::SyncRelay::qt_metacall(QMetaObject::Call _c, int _id, void **_a) { - _id = QObject::qt_metacall(_c, _id, _a); - if(_id < 0) - return _id; - - if(_c == QMetaObject::InvokeMetaMethod) { - if(!_signalIds.contains(_id)) { - qWarning() << Q_FUNC_INFO << "_id" << _id << "is not a valid SyncMethod!"; - return _id; - } - - QVariantList params; - - params << _eMeta->metaObject()->className() - << sender()->objectName() - << _eMeta->metaObject()->method(_id).signature(); - - const QList &argTypes = _eMeta->argTypes(_id); - for(int i = 0; i < argTypes.size(); i++) { - if(argTypes[i] == 0) { - qWarning() << Q_FUNC_INFO << "received invalid data for argument number" << i << "of signal" << QString("%1::%2").arg(_eMeta->metaObject()->className()).arg(_eMeta->metaObject()->method(_id).signature()); - qWarning() << " - make sure all your data types are known by the Qt MetaSystem"; - return _id; - } - params << QVariant(argTypes[i], _a[i+1]); - } - - proxy()->dispatchSignal(SignalProxy::Sync, params); - } - _id -= _signalCount; - return _id; -} - - void SignalProxy::SignalRelay::attachSignal(QObject *sender, int signalId, const QByteArray &funcName) { // we ride without safetybelts here... all checking for valid method etc pp has to be done by the caller // all connected methodIds are offset by the standard methodCount of QObject @@ -557,15 +467,7 @@ bool SignalProxy::attachSlot(const QByteArray& sigName, QObject* recv, const cha } void SignalProxy::synchronize(SyncableObject *obj) { - ExtendedMetaObject *eMeta = createExtendedMetaObject(obj); - - SyncRelay *relay; - if(!_syncRelays.contains(obj->syncMetaObject())) { - _syncRelays[obj->syncMetaObject()] = new SyncRelay(eMeta, this); - } - relay = _syncRelays[obj->syncMetaObject()]; - - relay->synchronize(obj); + createExtendedMetaObject(obj); // attaching as slave to receive sync Calls QByteArray className(obj->syncMetaObject()->className()); @@ -608,11 +510,6 @@ void SignalProxy::detachSlots(QObject* receiver) { } void SignalProxy::stopSync(QObject *obj) { - SyncableObject *syncableObject = qobject_cast(obj); - if(syncableObject && _syncRelays.contains(syncableObject->syncMetaObject())) { - QObject::disconnect(syncableObject, 0, _syncRelays[syncableObject->syncMetaObject()], 0); - } - // we can't use a className here, since it might be effed up, if we receive the call as a result of a decon // gladly the objectName() is still valid. So we have only to iterate over the classes not each instance! *sigh* QHash::iterator classIter = _syncSlave.begin(); @@ -1130,18 +1027,12 @@ void SignalProxy::dumpProxyStats() { else mode = "Client"; - int sigCount = 0; - foreach(SyncRelay *relay, _syncRelays.values()) - sigCount += relay->signalCount(); - int slaveCount = 0; foreach(ObjectId oid, _syncSlave.values()) slaveCount += oid.count(); qDebug() << this; qDebug() << " Proxy Mode:" << mode; - // qDebug() << "attached sending Objects:" << _relayHash.count(); - qDebug() << " number of Signals:" << sigCount; qDebug() << " attached Slots:" << _attachedSlots.count(); qDebug() << " number of synced Slaves:" << slaveCount; qDebug() << "number of Classes cached:" << _extendedMetaObjects.count(); diff --git a/src/common/signalproxy.h b/src/common/signalproxy.h index b630fe47..a76a3520 100644 --- a/src/common/signalproxy.h +++ b/src/common/signalproxy.h @@ -41,9 +41,7 @@ class SignalProxy : public QObject { class IODevicePeer; class SignalProxyPeer; - class Relay; class SignalRelay; - class SyncRelay; public: enum ProxyMode { @@ -184,8 +182,6 @@ private: // SignalRelay for all manually attached signals SignalRelay *_signalRelay; - // one SyncRelay per class - QHash _syncRelays; // RPC function -> (object, slot ID) typedef QPair MethodId; diff --git a/src/common/syncableobject.cpp b/src/common/syncableobject.cpp index aab2857c..41ac4a52 100644 --- a/src/common/syncableobject.cpp +++ b/src/common/syncableobject.cpp @@ -58,12 +58,6 @@ SyncableObject &SyncableObject::operator=(const SyncableObject &other) { return *this; } -void SyncableObject::synchronize(SignalProxy *proxy) { - if(_signalProxies.contains(proxy)) - return; - _signalProxies << proxy; -} - bool SyncableObject::isInitialized() const { return _initialized; } @@ -171,3 +165,9 @@ void SyncableObject::sync_call__(SignalProxy::ProxyMode modeType, const char *fu va_end(ap); } } + +void SyncableObject::synchronize(SignalProxy *proxy) { + if(_signalProxies.contains(proxy)) + return; + _signalProxies << proxy; +} diff --git a/src/uisupport/bufferviewfilter.cpp b/src/uisupport/bufferviewfilter.cpp index 0b9f80a2..57a6661b 100644 --- a/src/uisupport/bufferviewfilter.cpp +++ b/src/uisupport/bufferviewfilter.cpp @@ -83,7 +83,9 @@ void BufferViewFilter::setConfig(BufferViewConfig *config) { if(config->isInitialized()) { configInitialized(); } else { - connect(config, SIGNAL(initDone()), this, SLOT(configInitialized())); + // we use a queued connection here since manipulating the connection list of a sending object + // doesn't seem to be such a good idea while executing a connected slots. + connect(config, SIGNAL(initDone()), this, SLOT(configInitialized()), Qt::QueuedConnection); invalidate(); } }