AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make QDBusConnectionPrivate::getNameOwnerNoCache work in our thread

Browse Source 
In two commits, we will attempt to call this function from the manager
thread, so we need to be sure this function works from there. Right now,
it would deadlock in QDBusPendingCallPrivate::waitForFinished(), inside
QDBusConnectionPrivate::sendWithReply().

The solution is simple: expand sendWithReply to the sendWithReplyAsync
function it calls anyway, but tell the internal DBusPendingCall to
finish before we call waitForFinished().

Change-Id: Iee8cbc07c4434ce9b560ffff13d0749013d771ab
Reviewed-by: Albert Astals Cid <aacid@kde.org>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
This commit is contained in:
Thiago Macieira 2015-03-30 19:34:03 -07:00
parent d8148edb23
commit cc5ab92cd9
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/dbus/qdbusintegrator.cpp
View File

@ -2362,9 +2362,21 @@ QString QDBusConnectionPrivate::getNameOwnerNoCache(const QString &serviceName)
QStringLiteral("GetNameOwner")); QStringLiteral("GetNameOwner"));
QDBusMessagePrivate::setParametersValidated(msg, true); QDBusMessagePrivate::setParametersValidated(msg, true);
msg << serviceName; msg << serviceName;
QDBusMessage reply = sendWithReply(msg, QDBus::Block);
if (reply.type() == QDBusMessage::ReplyMessage) QDBusPendingCallPrivate *pcall = sendWithReplyAsync(msg, Q_NULLPTR, Q_NULLPTR, Q_NULLPTR);
return reply.arguments().at(0).toString(); if (thread() == QThread::currentThread()) {
// this function may be called in our own thread and
// QDBusPendingCallPrivate::waitForFinished() would deadlock there
q_dbus_pending_call_block(pcall->pending);
}
pcall->waitForFinished();
msg = pcall->replyMessage;
if (!pcall->ref.deref())
delete pcall;
if (msg.type() == QDBusMessage::ReplyMessage)
return msg.arguments().at(0).toString();
return QString(); return QString();
} }