1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QEventLoopLocker: inline Private into public class

Browse Source 
The Private class consists of just one quintptr member now, so it fits
into the ex-d_ptr member of the public class.

Since no allocations take place anymore, and we widened the contract
to allow for nullptr arguments, mark the constructors as noexcept.

[ChangeLog][QtCore][QEventLoopLocker] No longer allocates; all
operations are noexcept now.

Fixes: QTBUG-114793
Change-Id: I89699e331711f517d0502392dba106a47ccc9a0f
Reviewed-by: David Faure <david.faure@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit d8a8a3a5dc035c36756c1deb1a9cfe0da9796818)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2023-07-03 07:54:18 +02:00 committed by Qt Cherry-pick Bot
parent a81d214463
commit 3cc1885370
2 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/corelib/kernel/qeventloop.cpp
View File

@ -294,20 +294,6 @@ void QEventLoop::quit()
{ exit(0); } { exit(0); }
class QEventLoopLockerPrivate
{
public:
using Type = QEventLoopLocker::Type;
QEventLoopPrivate *loop() const { return static_cast<QEventLoopPrivate *>(pointer()); }
QThreadPrivate *thread() const { return static_cast<QThreadPrivate *>(pointer()); }
QCoreApplicationPrivate *app() const { return static_cast<QCoreApplicationPrivate *>(pointer()); }
explicit QEventLoopLockerPrivate(void *ptr, Type t) noexcept
: p{quintptr(ptr) | quintptr(t)} {}
quintptr p;
static constexpr quintptr TypeMask = 0x3;
Type type() const { return Type(p & TypeMask); }
void *pointer() const { return reinterpret_cast<void *>(p & ~TypeMask); }
};
namespace { namespace {
// If any of these trigger, the Type bits will interfere with the pointer values: // If any of these trigger, the Type bits will interfere with the pointer values:
static_assert(alignof(QEventLoopPrivate) >= 4); static_assert(alignof(QEventLoopPrivate) >= 4);
@ -348,7 +334,7 @@ Private *o2p(QObject *o)
\sa QCoreApplication::quit(), QCoreApplication::isQuitLockEnabled() \sa QCoreApplication::quit(), QCoreApplication::isQuitLockEnabled()
*/ */
QEventLoopLocker::QEventLoopLocker() QEventLoopLocker::QEventLoopLocker() noexcept
: QEventLoopLocker{o2p<QCoreApplicationPrivate>(QCoreApplication::instance()), : QEventLoopLocker{o2p<QCoreApplicationPrivate>(QCoreApplication::instance()),
Type::Application} Type::Application}
{ {
@ -362,7 +348,7 @@ QEventLoopLocker::QEventLoopLocker()
\sa QEventLoop::quit() \sa QEventLoop::quit()
*/ */
QEventLoopLocker::QEventLoopLocker(QEventLoop *loop) QEventLoopLocker::QEventLoopLocker(QEventLoop *loop) noexcept
: QEventLoopLocker{o2p<QEventLoopPrivate>(loop), Type::EventLoop} : QEventLoopLocker{o2p<QEventLoopPrivate>(loop), Type::EventLoop}
{ {
@ -375,7 +361,7 @@ QEventLoopLocker::QEventLoopLocker(QEventLoop *loop)
\sa QThread::quit() \sa QThread::quit()
*/ */
QEventLoopLocker::QEventLoopLocker(QThread *thread) QEventLoopLocker::QEventLoopLocker(QThread *thread) noexcept
: QEventLoopLocker{o2p<QThreadPrivate>(thread), Type::Thread} : QEventLoopLocker{o2p<QThreadPrivate>(thread), Type::Thread}
{ {
@ -387,14 +373,13 @@ QEventLoopLocker::QEventLoopLocker(QThread *thread)
QEventLoopLocker::~QEventLoopLocker() QEventLoopLocker::~QEventLoopLocker()
{ {
visit([](auto p) { p->deref(); }); visit([](auto p) { p->deref(); });
delete d_ptr;
} }
/*! /*!
\internal \internal
*/ */
QEventLoopLocker::QEventLoopLocker(void *ptr, Type t) noexcept QEventLoopLocker::QEventLoopLocker(void *ptr, Type t) noexcept
: d_ptr(new QEventLoopLockerPrivate{ptr, t}) : p{quintptr(ptr) | quintptr(t)}
{ {
visit([](auto p) { p->ref(); }); visit([](auto p) { p->ref(); });
} }
@ -405,11 +390,10 @@ QEventLoopLocker::QEventLoopLocker(void *ptr, Type t) noexcept
template <typename Func> template <typename Func>
void QEventLoopLocker::visit(Func f) const void QEventLoopLocker::visit(Func f) const
{ {
using Type = QEventLoopLockerPrivate::Type; const auto ptr = pointer();
const auto ptr = d_ptr->pointer();
if (!ptr) if (!ptr)
return; return;
switch (d_ptr->type()) { switch (type()) {
case Type::EventLoop: return f(static_cast<QEventLoopPrivate *>(ptr)); case Type::EventLoop: return f(static_cast<QEventLoopPrivate *>(ptr));
case Type::Thread: return f(static_cast<QThreadPrivate *>(ptr)); case Type::Thread: return f(static_cast<QThreadPrivate *>(ptr));
case Type::Application: return f(static_cast<QCoreApplicationPrivate *>(ptr)); case Type::Application: return f(static_cast<QCoreApplicationPrivate *>(ptr));

11
src/corelib/kernel/qeventloop.h
View File

@ -54,9 +54,9 @@ class QEventLoopLockerPrivate;
class QEventLoopLocker class QEventLoopLocker
{ {
public: public:
Q_NODISCARD_CTOR Q_CORE_EXPORT QEventLoopLocker(); Q_NODISCARD_CTOR Q_CORE_EXPORT QEventLoopLocker() noexcept;
Q_NODISCARD_CTOR Q_CORE_EXPORT explicit QEventLoopLocker(QEventLoop *loop); Q_NODISCARD_CTOR Q_CORE_EXPORT explicit QEventLoopLocker(QEventLoop *loop) noexcept;
Q_NODISCARD_CTOR Q_CORE_EXPORT explicit QEventLoopLocker(QThread *thread); Q_NODISCARD_CTOR Q_CORE_EXPORT explicit QEventLoopLocker(QThread *thread) noexcept;
Q_CORE_EXPORT ~QEventLoopLocker(); Q_CORE_EXPORT ~QEventLoopLocker();
private: private:
@ -73,7 +73,10 @@ private:
Application, Application,
}; };
explicit QEventLoopLocker(void *ptr, Type t) noexcept; explicit QEventLoopLocker(void *ptr, Type t) noexcept;
QEventLoopLockerPrivate *d_ptr; quintptr p;
static constexpr quintptr TypeMask = 0x3;
Type type() const { return Type(p & TypeMask); }
void *pointer() const { return reinterpret_cast<void *>(p & ~TypeMask); }
template <typename Func> template <typename Func>
void visit(Func func) const; void visit(Func func) const;
}; };