tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NetworkPacket: Optimize serialization/deserialization

Browse source 
We don't need to convert the data to an intermediate QVariantMap just to
make JSON out of it. This siginificantly improves performance.
The measurements were done with 3000000 iterations each:

Before serialization: 0.0045009 msecs
Before deserialization: 0.002293 msecs

After serialization: 0.0034216 msecs (32% faster)
After deserialization: 0.001776 msecs (29% faster)
This commit is contained in:
Alexander Lohnau 2024-09-08 16:21:28 +02:00 committed by Albert Vaca Cintora
parent d0dff8aff4
commit 0b4d0757dc
1 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
core/networkpacket.cpp
View file

@ -43,26 +43,20 @@ NetworkPacket::NetworkPacket(const QString &type, const QVariantMap &body)
QByteArray NetworkPacket::serialize() const QByteArray NetworkPacket::serialize() const
{ {
// Object -> QVariant QJsonObject obj;
QVariantMap variant; obj.insert(QLatin1String("id"), m_id);
variant.insert(QStringLiteral("id"), m_id); obj.insert(QLatin1String("type"), m_type);
variant.insert(QStringLiteral("type"), m_type); obj.insert(QLatin1String("body"), QJsonObject::fromVariantMap(m_body));
variant.insert(QStringLiteral("body"), m_body);
if (hasPayload()) { if (hasPayload()) {
variant.insert(QStringLiteral("payloadSize"), m_payloadSize); obj.insert(QLatin1String("payloadSize"), m_payloadSize);
variant.insert(QStringLiteral("payloadTransferInfo"), m_payloadTransferInfo); obj.insert(QLatin1String("payloadTransferInfo"), QJsonObject::fromVariantMap(m_payloadTransferInfo));
} }
// QVariant -> json QByteArray json = QJsonDocument(obj).toJson(QJsonDocument::Compact);
auto jsonDocument = QJsonDocument::fromVariant(variant);
QByteArray json = jsonDocument.toJson(QJsonDocument::Compact);
if (json.isEmpty()) { if (json.isEmpty()) {
qCDebug(KDECONNECT_CORE) << "Serialization error:"; qCDebug(KDECONNECT_CORE) << "Serialization error:";
} else { } else {
/*if (!isEncrypted()) {
//qCDebug(KDECONNECT_CORE) << "Serialized packet:" << json;
}*/
json.append('\n'); json.append('\n');
} }
@ -70,9 +64,9 @@ QByteArray NetworkPacket::serialize() const
} }
template<class T> template<class T>
void qvariant2qobject(const QVariantMap &variant, T *object) void qjsonobject2qobject(const QJsonObject &obj, T *object)
{ {
for (QVariantMap::const_iterator iter = variant.begin(); iter != variant.end(); ++iter) { for (auto iter = obj.begin(); iter != obj.end(); ++iter) {
const int propertyIndex = T::staticMetaObject.indexOfProperty(iter.key().toLatin1().data()); const int propertyIndex = T::staticMetaObject.indexOfProperty(iter.key().toLatin1().data());
if (propertyIndex < 0) { if (propertyIndex < 0) {
qCWarning(KDECONNECT_CORE) << "missing property" << object << iter.key(); qCWarning(KDECONNECT_CORE) << "missing property" << object << iter.key();
@ -80,7 +74,7 @@ void qvariant2qobject(const QVariantMap &variant, T *object)
} }
QMetaProperty property = T::staticMetaObject.property(propertyIndex); QMetaProperty property = T::staticMetaObject.property(propertyIndex);
bool ret = property.writeOnGadget(object, *iter); bool ret = property.writeOnGadget(object, iter.value().toVariant());
if (!ret) { if (!ret) {
qCWarning(KDECONNECT_CORE) << "couldn't set" << object << "->" << property.name() << '=' << *iter; qCWarning(KDECONNECT_CORE) << "couldn't set" << object << "->" << property.name() << '=' << *iter;
} }
@ -97,10 +91,12 @@ bool NetworkPacket::unserialize(const QByteArray &a, NetworkPacket *np)
return false; return false;
} }
auto variant = parser.toVariant().toMap(); const QJsonObject obj = parser.object();
qvariant2qobject(variant, np);
np->m_payloadTransferInfo = variant[QStringLiteral("payloadTransferInfo")].toMap(); // Will return an empty qvariantmap if was not present, which is ok qjsonobject2qobject(obj, np);
// Will return an empty qvariantmap if was not present, which is ok
np->m_payloadTransferInfo = obj.value(QLatin1String("payloadTransferInfo")).toVariant().toMap();
// Ids containing characters that are not allowed as dbus paths would make app crash // Ids containing characters that are not allowed as dbus paths would make app crash
if (np->m_body.contains(QStringLiteral("deviceId"))) { if (np->m_body.contains(QStringLiteral("deviceId"))) {