projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Extended NetworkInfo again to prepare for even more sophisticated encoding stuff.
[quassel.git]
/
src
/
common
/
signalproxy.cpp
diff --git
a/src/common/signalproxy.cpp
b/src/common/signalproxy.cpp
index
5c2f20e
..
f0c7d0b
100644
(file)
--- a/
src/common/signalproxy.cpp
+++ b/
src/common/signalproxy.cpp
@@
-90,7
+90,7
@@
int SignalRelay::qt_metacall(QMetaObject::Call _c, int _id, void **_a) {
}
QMultiHash<int, QByteArray>::const_iterator funcIter = sigNames.constFind(_id);
while(funcIter != sigNames.constEnd() && funcIter.key() == _id) {
}
QMultiHash<int, QByteArray>::const_iterator funcIter = sigNames.constFind(_id);
while(funcIter != sigNames.constEnd() && funcIter.key() == _id) {
- proxy->dispatchSignal(
funcIter.value(),
params);
+ proxy->dispatchSignal(
SignalProxy::RpcCall, QVariantList() << funcIter.value() <<
params);
funcIter++;
}
funcIter++;
}
@@
-106,7
+106,7
@@
int SignalRelay::qt_metacall(QMetaObject::Call _c, int _id, void **_a) {
params.prepend(signature);
params.prepend(caller->objectName());
params.prepend(caller->metaObject()->className());
params.prepend(signature);
params.prepend(caller->objectName());
params.prepend(caller->metaObject()->className());
- proxy->dispatchSignal(
(int)
SignalProxy::Sync, params);
+ proxy->dispatchSignal(SignalProxy::Sync, params);
}
}
_id -= QObject::staticMetaObject.methodCount();
}
}
_id -= QObject::staticMetaObject.methodCount();
@@
-221,10
+221,15
@@
SignalProxy::ProxyMode SignalProxy::proxyMode() const {
}
void SignalProxy::initServer() {
}
void SignalProxy::initServer() {
+ disconnect(&_heartBeatTimer, 0, this, 0);
+ _heartBeatTimer.stop();
}
void SignalProxy::initClient() {
attachSlot("__objectRenamed__", this, SLOT(objectRenamed(QByteArray, QString, QString)));
}
void SignalProxy::initClient() {
attachSlot("__objectRenamed__", this, SLOT(objectRenamed(QByteArray, QString, QString)));
+ connect(&_heartBeatTimer, SIGNAL(timeout()),
+ this, SLOT(sendHeartBeat()));
+ _heartBeatTimer.start(60 * 1000); // msecs: one beep per minute
}
bool SignalProxy::addPeer(QIODevice* iodev) {
}
bool SignalProxy::addPeer(QIODevice* iodev) {
@@
-274,8
+279,8
@@
void SignalProxy::objectRenamed(QString oldname, QString newname) {
return;
QVariantList params;
return;
QVariantList params;
- params << className << oldname << newname;
- dispatchSignal(
"__objectRenamed__"
, params);
+ params <<
"__objectRenamed__" <<
className << oldname << newname;
+ dispatchSignal(
RpcCall
, params);
}
void SignalProxy::objectRenamed(QByteArray classname, QString oldname, QString newname) {
}
void SignalProxy::objectRenamed(QByteArray classname, QString oldname, QString newname) {
@@
-518,7
+523,7
@@
void SignalProxy::requestInit(SyncableObject *obj) {
QVariantList params;
params << obj->metaObject()->className()
<< obj->objectName();
QVariantList params;
params << obj->metaObject()->className()
<< obj->objectName();
- dispatchSignal(
(int)
InitRequest, params);
+ dispatchSignal(InitRequest, params);
}
void SignalProxy::detachSender() {
}
void SignalProxy::detachSender() {
@@
-555,7
+560,7
@@
void SignalProxy::stopSync(SyncableObject* obj) {
// gladly the objectName() is still valid. So we have only to iterate over the classes not each instance! *sigh*
QHash<QByteArray, ObjectId>::iterator classIter = _syncSlave.begin();
while(classIter != _syncSlave.end()) {
// gladly the objectName() is still valid. So we have only to iterate over the classes not each instance! *sigh*
QHash<QByteArray, ObjectId>::iterator classIter = _syncSlave.begin();
while(classIter != _syncSlave.end()) {
- if(classIter->contains(obj->objectName())) {
+ if(classIter->contains(obj->objectName())
&& classIter.value()[obj->objectName()] == obj
) {
classIter->remove(obj->objectName());
break;
}
classIter->remove(obj->objectName());
break;
}
@@
-563,17
+568,17
@@
void SignalProxy::stopSync(SyncableObject* obj) {
}
}
}
}
-void SignalProxy::dispatchSignal(QIODevice *receiver, const
QVariant &identifier
, const QVariantList ¶ms) {
+void SignalProxy::dispatchSignal(QIODevice *receiver, const
RequestType &requestType
, const QVariantList ¶ms) {
QVariantList packedFunc;
QVariantList packedFunc;
- packedFunc <<
identifier
;
+ packedFunc <<
(qint16)requestType
;
packedFunc << params;
writeDataToDevice(receiver, QVariant(packedFunc));
}
packedFunc << params;
writeDataToDevice(receiver, QVariant(packedFunc));
}
-void SignalProxy::dispatchSignal(const
QVariant &identifier
, const QVariantList ¶ms) {
+void SignalProxy::dispatchSignal(const
RequestType &requestType
, const QVariantList ¶ms) {
// yes I know we have a little code duplication here... it's for the sake of performance
QVariantList packedFunc;
// yes I know we have a little code duplication here... it's for the sake of performance
QVariantList packedFunc;
- packedFunc <<
identifier
;
+ packedFunc <<
(qint16)requestType
;
packedFunc << params;
foreach(QIODevice* dev, _peerByteCount.keys())
writeDataToDevice(dev, QVariant(packedFunc));
packedFunc << params;
foreach(QIODevice* dev, _peerByteCount.keys())
writeDataToDevice(dev, QVariant(packedFunc));
@@
-582,19
+587,26
@@
void SignalProxy::dispatchSignal(const QVariant &identifier, const QVariantList
void SignalProxy::receivePeerSignal(QIODevice *sender, const QVariant &packedFunc) {
QVariantList params(packedFunc.toList());
void SignalProxy::receivePeerSignal(QIODevice *sender, const QVariant &packedFunc) {
QVariantList params(packedFunc.toList());
- QVariant call = params.takeFirst();
- if(call.type() != QVariant::Int)
- return handleSignal(call.toByteArray(), params);
+ int callType = params.takeFirst().value<int>();
- switch(call.toInt()) {
+ switch(callType) {
+ case RpcCall:
+ if(params.empty()) {
+ qWarning() << "SignalProxy::receivePeerSignal(): received empty RPC-Call";
+ return;
+ } else {
+ return handleSignal(params.takeFirst().toByteArray(), params);
+ }
case Sync:
return handleSync(params);
case InitRequest:
return handleInitRequest(sender, params);
case InitData:
return handleInitData(sender, params);
case Sync:
return handleSync(params);
case InitRequest:
return handleInitRequest(sender, params);
case InitData:
return handleInitData(sender, params);
+ case HeartBeat:
+ return;
default:
default:
- qWarning() << "
received undefined CallType" << call.toInt()
;
+ qWarning() << "
SignalProxy::receivePeerSignal(): received undefined CallType" << callType << params
;
return;
}
}
return;
}
}
@@
-610,14
+622,14
@@
void SignalProxy::handleSync(QVariantList params) {
QByteArray signal = params.takeFirst().toByteArray();
if(!_syncSlave.contains(className) || !_syncSlave[className].contains(objectName)) {
QByteArray signal = params.takeFirst().toByteArray();
if(!_syncSlave.contains(className) || !_syncSlave[className].contains(objectName)) {
- qWarning() << QString("no registered receiver for sync call: %
s::%s (objectName=\"%s
\"). Params are:").arg(QString(className)).arg(QString(signal)).arg(objectName)
+ qWarning() << QString("no registered receiver for sync call: %
1::%2 (objectName=\"%3
\"). Params are:").arg(QString(className)).arg(QString(signal)).arg(objectName)
<< params;
return;
}
SyncableObject *receiver = _syncSlave[className][objectName];
if(!syncMap(receiver).contains(signal)) {
<< params;
return;
}
SyncableObject *receiver = _syncSlave[className][objectName];
if(!syncMap(receiver).contains(signal)) {
- qWarning() << QString("no matching slot for sync call: %
s::%s (objectName=\"%s
\"). Params are:").arg(QString(className)).arg(QString(signal)).arg(objectName)
+ qWarning() << QString("no matching slot for sync call: %
1::%2 (objectName=\"%3
\"). Params are:").arg(QString(className)).arg(QString(signal)).arg(objectName)
<< params;
return;
}
<< params;
return;
}
@@
-659,7
+671,7
@@
void SignalProxy::handleInitRequest(QIODevice *sender, const QVariantList ¶m
<< obj->objectName()
<< initData(obj);
<< obj->objectName()
<< initData(obj);
- dispatchSignal(sender,
(int)
InitData, params_);
+ dispatchSignal(sender, InitData, params_);
}
void SignalProxy::handleInitData(QIODevice *sender, const QVariantList ¶ms) {
}
void SignalProxy::handleInitData(QIODevice *sender, const QVariantList ¶ms) {
@@
-832,6
+844,10
@@
void SignalProxy::setInitData(SyncableObject *obj, const QVariantMap &properties
invokeSlot(obj, updatedRemotelyId(obj));
}
invokeSlot(obj, updatedRemotelyId(obj));
}
+void SignalProxy::sendHeartBeat() {
+ dispatchSignal(SignalProxy::HeartBeat, QVariantList());
+}
+
void SignalProxy::dumpProxyStats() {
QString mode;
if(proxyMode() == Server)
void SignalProxy::dumpProxyStats() {
QString mode;
if(proxyMode() == Server)