path: root/src/dbus/qdbusmisc.cpp
diff options
authorMarc Mutz <>2012-08-24 12:06:03 +0200
committerThe Qt Project <>2012-09-22 19:19:37 +0200
commit373a7277db0583fbbb8ed61f9f61d6f77ed95da4 (patch)
treef530a3e205770802a2580789e8e5eb487065fedb /src/dbus/qdbusmisc.cpp
parentf799e57151dbd236f30d4ffb20d6c331b6e1a388 (diff)
QDBusMetaTypeId: don't cache the result of qMetaTypeId<>() in static ints
There's not much point in caching the result of qMetaTypeId<>, because it's already internally memoised. In addition, the code that initialised the static int caches wasn't protected against concurrent access under the assumption that the operations performed were thread-safe. That is true for most of them, but not for the stores to the static ints, which race against each other: // Thread A // Thread B r1 = initialized /*=false*/ r1 = initialized /*=false*/ r2 = qMetaTypeId<...>(); r2 = qMetaTypeId<...>(); message = r2; message = r2; // race, ditto for all other ints To fix, turn the ints into inline functions that just call the respective qMetaTypeId<>() function. Change-Id: I5aa80c624872c3867232abc26ffdcde70cd54022 Reviewed-by: Thiago Macieira <>
Diffstat (limited to 'src/dbus/qdbusmisc.cpp')
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dbus/qdbusmisc.cpp b/src/dbus/qdbusmisc.cpp
index d92349b35c..3c8e906cab 100644
--- a/src/dbus/qdbusmisc.cpp
+++ b/src/dbus/qdbusmisc.cpp
@@ -186,7 +186,7 @@ int qDBusParametersForMethod(const QList<QByteArray> &parameterTypes, QVector<in
return -1;
- if (id == QDBusMetaTypeId::message)
+ if (id == QDBusMetaTypeId::message())
seenMessage = true;
else if (QDBusMetaType::typeToSignature(id) == 0)
return -1;