whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QtDBus: Encapsulate hooks addition and invocation into QDBusSpyHookList 

This makes the rest of the code slightly cleaner.

Change-Id: I67606b369f00d54fc24f7d6f41c004a728d37b5f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Ievgenii Meshcheriakov 2023-08-08 15:25:19 +02:00
parent 50aba545ff
commit 52a464bad0
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/dbus/qdbusintegrator.cpp
View File

@ -101,8 +101,30 @@ void qdbusDefaultThreadDebug(int action, int condition, QDBusConnectionPrivate *
qdbusThreadDebugFunc qdbusThreadDebug = nullptr;
#endif
struct QDBusSpyHookList
class QDBusSpyHookList
{
public:
void add(QDBusSpyCallEvent::Hook hook)
{
const auto locker = qt_scoped_lock(lock);
list.append(hook);
}
void invoke(const QDBusMessage &msg)
{
// Create a copy of the hook list here, so that the hooks can be called
// without holding the lock.
QList<QDBusSpyCallEvent::Hook> hookListCopy;
{
const auto locker = qt_scoped_lock(lock);
hookListCopy = list;
}
for (auto hook : std::as_const(hookListCopy))
hook(msg);
}
private:
QBasicMutex lock;
QList<QDBusSpyCallEvent::Hook> list;
};
@ -464,8 +486,7 @@ void qDBusAddSpyHook(QDBusSpyCallEvent::Hook hook)
if (!hooks)
return;
const auto locker = qt_scoped_lock(hooks->lock);
hooks->list.append(hook);
hooks->add(hook);
}
QDBusSpyCallEvent::~QDBusSpyCallEvent()
@ -488,17 +509,7 @@ inline void QDBusSpyCallEvent::invokeSpyHooks(const QDBusMessage &msg)
if (!qDBusSpyHookList.exists())
return;
// Create a copy of the hook list here, so that the hooks can be called
// without holding the lock.
QList<Hook> hookListCopy;
{
auto *hooks = qDBusSpyHookList();
const auto locker = qt_scoped_lock(hooks->lock);
hookListCopy = hooks->list;
}
for (auto hook : std::as_const(hookListCopy))
hook(msg);
qDBusSpyHookList->invoke(msg);
}
extern "C" {